Merge lp:~lifanxi/calibre/douban-metadata-plugin into lp:calibre

[Li Fanxi]

Bug fix for Douban metadata plugin. Error in constructing the API request URL when adding the API key to the URL.

=== modified file 'src/calibre/ebooks/metadata/sources/douban.py'
--- src/calibre/ebooks/metadata/sources/douban.py	2011-05-12 23:12:59 +0000
+++ src/calibre/ebooks/metadata/sources/douban.py	2011-05-25 16:37:39 +0000
@@ -211,7 +211,10 @@
                     'q': q,
                     })
         if self.DOUBAN_API_KEY and self.DOUBAN_API_KEY != '':
-            url = url + "?apikey=" + self.DOUBAN_API_KEY
+            if t == "isbn" or t == "subject":
+                url = url + "?apikey=" + self.DOUBAN_API_KEY
+            else:
+                url = url + "&apikey=" + self.DOUBAN_API_KEY
         return url
     # }}}