From c7022e88eb8e5bf9ec0055f27ff0e67758e245bb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 27 Oct 2010 07:49:36 -0600
Subject: [PATCH] CS: Use local copy of donate button image

---
 resources/content_server/browse/browse.html |   2 +-
 resources/content_server/button-donate.png  | Bin 0 -> 1657 bytes
 src/calibre/ebooks/metadata/amazon.py       |   3 +++
 src/calibre/manual/faq.rst                  |   4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 resources/content_server/button-donate.png

diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
index 4acc15f3ea..e216b68ba8 100644
--- a/resources/content_server/browse/browse.html
+++ b/resources/content_server/browse/browse.html
@@ -58,7 +58,7 @@
                     <input type="hidden" name="cmd" value="_s-xclick"></input>
                     <input type="hidden" name="hosted_button_id" value="3028915"></input>
                     <input type="image"
-                        src="http://calibre-ebook.com/site_media//img/button-donate.png"
+                        src="/static/button-donate.png"
                         name="submit"></input>
                     <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
                         width="1" height="1"></img>
diff --git a/resources/content_server/button-donate.png b/resources/content_server/button-donate.png
new file mode 100644
index 0000000000000000000000000000000000000000..25ccf3f514d627e3db478ce9acaa9481fb40754e
GIT binary patch
literal 1657
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
Dy2u~E

literal 0
HcmV?d00001

diff --git a/src/calibre/ebooks/metadata/amazon.py b/src/calibre/ebooks/metadata/amazon.py
index 1713d044f5..f5586c8396 100644
--- a/src/calibre/ebooks/metadata/amazon.py
+++ b/src/calibre/ebooks/metadata/amazon.py
@@ -37,6 +37,7 @@ def get_social_metadata(title, authors, publisher, isbn):
     if isbn:
         br = browser()
         response_xml = br.open('http://status.calibre-ebook.com/aws/metadata/'+isbn).read()
+        print 1111111, response_xml
         root = etree.fromstring(response_xml)
         try:
             check_for_errors(root, isbn)
@@ -63,6 +64,8 @@ def get_social_metadata(title, authors, publisher, isbn):
             if num_of_reviews > 4 and rating > 0 and rating < 5:
                 mi.rating = rating
         except:
+            import traceback
+            traceback.print_exc()
             pass
         tags = [x.text for x in root.findall('.//%s/%s'%(AWS('Subjects'),
             AWS('Subject')))]
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index ae740947b7..687c8480be 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -463,5 +463,7 @@ Finally, you can add downloaded news to the |app| library with::
 
    /opt/calibre/calibredb add --with-library /path/to/library outfile.epub
 
-Remember to read the command line documentatation section of the |app| User Manual to learn more about these, and other commands.
+Remember to read the command line documentation section of the |app| User Manual to learn more about these, and other commands.
+
+.. note:: Some parts of calibre require a X server. If you're lucky, nothing you do will fall into this category, if not, you will have to look into using xvfb.