Merge pull request internetarchive#766 from internetarchive/765/hotfix/remove-lending-stats

765/hotfix/remove lending stats

Author: mekarpeles

openlibrary/core/lending.py

@@ -167,7 +167,7 @@ def compose_ia_url(limit=None, page=1, subject=None, query=None, work_id=None,
 def get_random_available_ia_edition():
     """uses archive advancedsearch to raise a random book"""
     try:
-        url="http://%s/advancedsearch.php?q=_exists_:openlibrary_work+AND+loans__status__status:AVAILABLE&fl=identifier,openlibrary_edition,loans__status__status&output=json&rows=1&sort[]=random" % (config_bookreader_host)
+        url="https://%s/advancedsearch.php?q=_exists_:openlibrary_work+AND+loans__status__status:AVAILABLE&fl=identifier,openlibrary_edition,loans__status__status&output=json&rows=1&sort[]=random" % (config_bookreader_host)
         content = urllib2.urlopen(url=url, timeout=config_http_request_timeout).read()
         items = simplejson.loads(content).get('response', {}).get('docs', [])
         return items[0]["openlibrary_edition"]

openlibrary/plugins/openlibrary/home.py

@@ -21,6 +21,12 @@
 
 logger = logging.getLogger("openlibrary.home")
 
+CAROUSELS_PRESETS = {
+    'preset:thrillers': '(creator:"Clancy, Tom" OR creator:"King, Stephen" OR creator:"Clive Cussler" OR creator:("Cussler, Clive") OR creator:("Dean Koontz") OR creator:("Koontz, Dean") OR creator:("Higgins, Jack")) AND !publisher:"Pleasantville, N.Y. : Reader\'s Digest Association" AND languageSorter:"English"',
+    'preset:children': '(creator:("parish, Peggy") OR creator:("avi") OR title:("goosebumps") OR creator:("Dahl, Roald") OR creator:("ahlberg, allan") OR creator:("Seuss, Dr") OR creator:("Carle, Eric") OR creator:("Pilkey, Dav"))',
+    'preset:comics': '(subject:"comics" OR creator:("Gary Larson") OR creator:("Larson, Gary") OR creator:("Charles M Schulz") OR creator:("Schulz, Charles M") OR creator:("Jim Davis") OR creator:("Davis, Jim") OR creator:("Bill Watterson") OR creator:("Watterson, Bill") OR creator:("Lee, Stan"))'
+}
+
 class home(delegate.page):
     path = "/"
 
@@ -44,7 +50,7 @@ def GET(self):
         page.v2 = True
         return page
 
-class random(delegate.page):
+class random_book(delegate.page):
     path = "/random"
 
     def GET(self):
@@ -54,12 +60,6 @@ def GET(self):
         raise web.seeother("/")
 
 
-CAROUSELS_PRESETS = {
-    'preset:thrillers': '(creator:"Clancy, Tom" OR creator:"King, Stephen" OR creator:"Clive Cussler" OR creator:("Cussler, Clive") OR creator:("Dean Koontz") OR creator:("Koontz, Dean") OR creator:("Higgins, Jack")) AND !publisher:"Pleasantville, N.Y. : Reader\'s Digest Association" AND languageSorter:"English"',
-    'preset:children': '(creator:("parish, Peggy") OR creator:("avi") OR title:("goosebumps") OR creator:("Dahl, Roald") OR creator:("ahlberg, allan") OR creator:("Seuss, Dr") OR creator:("Carle, Eric") OR creator:("Pilkey, Dav"))',
-    'preset:comics': '(subject:"comics" OR creator:("Gary Larson") OR creator:("Larson, Gary") OR creator:("Charles M Schulz") OR creator:("Schulz, Charles M") OR creator:("Jim Davis") OR creator:("Davis, Jim") OR creator:("Bill Watterson") OR creator:("Watterson, Bill") OR creator:("Lee, Stan"))'
-}
-
 def get_ia_carousel_books(query=None, subject=None, work_id=None, sorts=None,
                           _type=None, limit=None):
     if 'env' not in web.ctx: