Merge branch 'master' of https://github.com/gutenbergtools/autocat3

BaseSearcher.py

@@ -561,8 +561,7 @@ class OpenSearch(object):
         self.desktop_url = self.url_carry(host = self.desktop_host, format = None)
 
         self.osd_url = self.qualify('/catalog/osd-books.xml')
-        if self.end_index==1000:
-            self.end_index='1000 (max)'
+
         s = cherrypy.session
         # write this late so pages can change it
         s['search_terms'] = self.search_terms
@@ -888,7 +887,7 @@ class SQLSearcher(object):
 
         sql.sort_order = os.sort_order
         sql.start_index = os.start_index
-        #sql.items_per_page = os.items_per_page
+        sql.items_per_page = os.items_per_page
         query, params = sql.build()
         query += ' -- ' + os.ip
 

templates/results.html

@@ -56,10 +56,6 @@ which contains *all* Project Gutenberg metadata in one RDF/XML file.
 	  rel="next"
 	  title="Next Page"
 	  href="${os.url ('search', start_index = os.next_page_index)}" />
-	<link py:if="os.show_next_page_link"
-	  rel="last"
-	  title="Last Page"
-	  href="${os.url ('search', start_index = os.last_page_index)}" />
 
     <meta name="totalResults" content="${os.total_results}" />
     <meta name="startIndex"   content="${os.start_index}" />

templates/site-layout.html

@@ -137,7 +137,9 @@
       <a title="Go to the first page of results."
 	 accesskey="a"
 	 href="${os.url_carry (start_index = 1)}">First</a>
+      </py:if>
 
+      <py:if test="os.show_prev_page_link">|
       <a title="Go to the previous page of results."
 	 accesskey="-"
 	 href="${os.url_carry (start_index = os.prev_page_index)}">Previous</a>
@@ -147,10 +149,6 @@
       <a title="Go to the next page of results."
 	 accesskey="+"
 	 href="${os.url_carry (start_index = os.next_page_index)}">Next</a>
-
-      <a title="Go to the last page of results."
-	 accesskey="+"
-	 href="${os.url_carry (start_index = os.last_page_index)}">Last</a>
       </py:if>
     </span>
   </py:def>