From 76fb5592f577a967f5d59657d3676ba551a3b092 Mon Sep 17 00:00:00 2001
From: Rich Abdill <richard.abdill@gmail.com>
Date: Thu, 20 Sep 2018 20:53:22 -0500
Subject: [PATCH] Pagination of results

---
 api/main.py                               | 18 ++++++++++++++++--
 api/views/components/results_standard.tpl |  7 +++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/api/main.py b/api/main.py
index 5044598..d9ab8c8 100644
--- a/api/main.py
+++ b/api/main.py
@@ -3,8 +3,10 @@
 This is the entrypoint for the application, the script called
 when the server is started and the router for all user requests.
 """
+import re
 
 import bottle
+
 import db
 import helpers
 import endpoints
@@ -29,6 +31,7 @@ def index():
   metric = bottle.request.query.metric
   view = bottle.request.query.view # which format to display results
   entity = bottle.request.query.entity
+  page = bottle.request.query.page
 
   # set defaults, throw out bogus values
   if entity not in ["papers", "authors"]:
@@ -67,6 +70,10 @@ def index():
   # Get rid of a category filter that's just one empty parameter:
   if len(category_filter) == 1 and category_filter[0] == "":
     category_filter = []
+  if page == "":
+    page = 0
+  else:
+    page = int(page)
 
   category_list = endpoints.get_categories(connection) # list of all article categories
   stats = models.SiteStats(connection) # site-wide metrics (paper count, etc)
@@ -81,17 +88,24 @@ def index():
         results = endpoints.table_results(connection, query)
         print("Prepping table view \n\n\n")
       else:
-        results = endpoints.most_popular(connection, query, category_filter, timeframe, metric)
+        results = endpoints.most_popular(connection, query, category_filter, timeframe, metric, page)
   except Exception as e:
     print(e)
     error = "There was a problem with the submitted query."
     bottle.response.status = 500
 
+  if "page=" in bottle.request.query_string:
+    next_page_link = re.sub(r"page=\d*", "page={}".format(page + 1), bottle.request.query_string)
+  else:
+    next_page_link = "{}&page={}".format(bottle.request.query_string, page + 1)
+  next_page_link = "/?{}".format(next_page_link)
+
   return bottle.template('index', results=results,
     query=query, category_filter=category_filter, title=title,
     error=error, stats=stats, category_list=category_list,
     timeframe=timeframe, metric=metric, querystring=bottle.request.query_string,
-    view=view, entity=entity, google_tag=config.google_tag)
+    view=view, entity=entity, google_tag=config.google_tag, page=page,
+    page_size=config.page_size, next_page_link=next_page_link)
 
 # ---- full display thing
 @bottle.get('/table')
diff --git a/api/views/components/results_standard.tpl b/api/views/components/results_standard.tpl
index a4336a9..bb008e0 100644
--- a/api/views/components/results_standard.tpl
+++ b/api/views/components/results_standard.tpl
@@ -2,7 +2,7 @@
   % for i, result in enumerate(results):
     <div class="card">
       <div class="card-header context" id="heading{{result.id}}"  data-toggle="collapse" data-target="#collapse{{result.id}}" aria-expanded="true" aria-controls="collapse{{result.id}}">
-        <strong>{{i+1}}:</strong>
+        <strong>{{i+1 + (page * page_size)}}:</strong>
         % if metric == "altmetric" and result.downloads > 80:
           <i class="fab fa-hotjar text-danger" style="font-size: 2em;"></i>
         % end
@@ -39,4 +39,7 @@
       </div>
     </div>
   % end
-</div>
\ No newline at end of file
+</div>
+% if len(results) == page_size:
+  <a href="{{ next_page_link }}" class="btn btn-altcolor">Next {{ page_size }}</a>
+% end