Paginated search and advanced search

Wraparound on books list deactivated

cps/db.py

@@ -648,9 +648,10 @@ class CalibreDB():
     # read search results from calibre-database and return it (function is used for feed and simple search
     def get_search_results(self, term, offset=None, order=None, limit=None):
         order = order or [Books.sort]
+        pagination = None
         if offset != None and limit != None:
             offset = int(offset)
-            limit = offset + int(limit)
+            limit_all = offset + int(limit)
         term.strip().lower()
         self.session.connection().connection.connection.create_function("lower", 1, lcase)
         q = list()
@@ -665,7 +666,9 @@ class CalibreDB():
                 func.lower(Books.title).ilike("%" + term + "%")
                 )).order_by(*order).all()
         result_count = len(result)
-        return result[offset:limit], result_count
+        if offset != None and limit != None:
+            pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
+        return result[offset:limit_all], result_count, pagination
 
     # Creates for all stored languages a translated speaking name in the array for the UI
     def speaking_language(self, languages=None):

cps/jinjia.py

@@ -44,6 +44,8 @@ log = logger.create()
 def url_for_other_page(page):
     args = request.view_args.copy()
     args['page'] = page
+    for get, val in request.args.items():
+        args[get] = val
     return url_for(request.endpoint, **args)
 
 

cps/static/js/table.js

@@ -109,6 +109,7 @@ $(function() {
     $("#books-table").bootstrapTable({
         sidePagination: "server",
         pagination: true,
+        paginationLoop: false,
         paginationDetailHAlign: " hidden",
         paginationHAlign: "left",
         idField: "id",

cps/templates/book_table.html

@@ -2,13 +2,13 @@
 {% macro text_table_row(parameter, edit_text, show_text, validate) -%}
 <th data-field="{{ parameter }}" id="{{ parameter }}" data-sortable="true"
     data-visible = "{{visiblility.get(parameter)}}"
-    {% if g.user.role_edit() %}
+    {% if g.user.role_edit() %}
         data-editable-type="text"
         data-editable-url="{{ url_for('editbook.edit_list_book', param=parameter)}}"
         data-editable-title="{{ edit_text }}"
         data-edit="true"
-        {% if validate %}data-edit-validate="{{ _('This Field is Required') }}" {% endif %}
+        {% if validate %}data-edit-validate="{{ _('This Field is Required') }}" {% endif %}
-    {% endif %}
+    {% endif %}
 >{{ show_text }}</th>
 {%- endmacro %}
 
@@ -39,9 +39,9 @@
            data-url="{{url_for('web.list_books')}}">
       <thead>
         <tr>
-          {% if g.user.role_edit() %}
+          {% if g.user.role_edit() %}
             <th data-field="state" data-checkbox="true" data-sortable="true"></th>
-          {% endif %}
+          {% endif %}
             <th data-field="id" id="id" data-visible="false" data-switchable="false"></th>
             {{ text_table_row('title', _('Enter Title'),_('Title'), true) }}
             {{ text_table_row('sort', _('Enter Title Sort'),_('Title Sort'), false) }}
@@ -49,13 +49,13 @@
             {{ text_table_row('authors', _('Enter Authors'),_('Authors'), true) }}
             {{ text_table_row('tags', _('Enter Categories'),_('Categories'), false) }}
             {{ text_table_row('series', _('Enter Series'),_('Series'), false) }}
-            <th data-field="series_index" id="series_index" data-visible="{{visiblility.get('series_index')}}" data-edit-validate="{{ _('This Field is Required') }}" data-sortable="true" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-min="0" data-editable-url="{{ url_for('editbook.edit_list_book', param='series_index')}}" data-edit="true" data-editable-title="{{_('Enter title')}}"{% endif %}>{{_('Series Index')}}</th>
+            <th data-field="series_index" id="series_index" data-visible="{{visiblility.get('series_index')}}" data-edit-validate="{{ _('This Field is Required') }}" data-sortable="true" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-min="0" data-editable-url="{{ url_for('editbook.edit_list_book', param='series_index')}}" data-edit="true" data-editable-title="{{_('Enter title')}}"{% endif %}>{{_('Series Index')}}</th>
             {{ text_table_row('languages', _('Enter Languages'),_('Languages'), false) }}
             <!--th data-field="pubdate" data-type="date" data-visible="{{visiblility.get('pubdate')}}" data-viewformat="dd.mm.yyyy" id="pubdate" data-sortable="true">{{_('Publishing Date')}}</th-->
             {{ text_table_row('publishers', _('Enter Publishers'),_('Publishers'), false) }}
-          {% if g.user.role_edit() %}
+          {% if g.user.role_edit() %}
             <th data-align="right" data-formatter="EbookActions" data-switchable="false">{{_('Delete')}}</th>
-          {% endif %}
+          {% endif %}
         </tr>
       </thead>
     </table>

cps/web.py

@@ -35,6 +35,7 @@ from babel import Locale as LC
 from babel.core import UnknownLocaleError
 from flask import Blueprint, jsonify
 from flask import render_template, request, redirect, send_from_directory, make_response, g, flash, abort, url_for
+from flask import session as flask_session
 from flask_babel import gettext as _
 from flask_login import login_user, logout_user, login_required, current_user, confirm_login
 from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
@@ -669,9 +670,10 @@ def render_books_list(data, sort, book_id, page):
     elif data == "search":
         term = (request.args.get('query') or '')
         offset = int(int(config.config_books_per_page) * (page - 1))
-        if '&' not in term:
         return render_search_results(term, offset, order, config.config_books_per_page)
-        else:
+    elif data == "advsearch":
+        term = json.loads(flask_session['query'])
+        offset = int(int(config.config_books_per_page) * (page - 1))
         return render_adv_search_results(term, offset, order, config.config_books_per_page)
     else:
         website = data or "newest"
@@ -953,13 +955,14 @@ def render_prepare_search_form(cc):
 
 
 def render_search_results(term, offset=None, order=None, limit=None):
-    entries, result_count = calibre_db.get_search_results(term, offset, order, limit)
+    entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
     ids = list()
     for element in entries:
         ids.append(element.id)
     searched_ids[current_user.id] = ids
     return render_title_template('search.html',
                                  searchterm=term,
+                                 pagination=pagination,
                                  query=term,
                                  adv_searchterm=term,
                                  entries=entries,
@@ -967,6 +970,7 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                  title=_(u"Search"),
                                  page="search")
 
+
 # ################################### View Books list ##################################################################
 
 
@@ -1007,7 +1011,7 @@ def list_books():
     search = request.args.get("search")
     total_count = calibre_db.session.query(db.Books).count()
     if search:
-        entries, filtered_count = calibre_db.get_search_results(search, off, order, limit)
+        entries, filtered_count, pagination = calibre_db.get_search_results(search, off, order, limit)
     else:
         entries, __, __ = calibre_db.fill_indexpage((int(off) / (int(limit)) + 1), limit, db.Books, True, order)
         filtered_count = total_count
@@ -1227,7 +1231,7 @@ def reconnect():
 def search():
     term = request.args.get("query")
     if term:
-        return render_search_results(term)
+        return render_search_results(term, 0, None, config.config_books_per_page)
     else:
         return render_title_template('search.html',
                                      searchterm="",
@@ -1238,9 +1242,19 @@ def search():
 @web.route("/advanced_search", methods=['POST'])
 @login_required_if_no_ano
 def advanced_search():
+    term = request.form
+    return render_adv_search_results(term, 0, None, config.config_books_per_page)
+
+def render_adv_search_results(term, offset=None, order=None, limit=None):
+    order = order or [db.Books.sort]
+    pagination = None
+    if offset != None and limit != None:
+        offset = int(offset)
+        limit_all = offset + int(limit)
+
     cc = get_cc_columns(filter_config_custom_read=True)
     calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
-    q = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(True)).order_by(db.Books.sort)
+    q = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(True))
 
     include_tag_inputs = request.form.getlist('include_tag')
     exclude_tag_inputs = request.form.getlist('exclude_tag')
@@ -1251,14 +1265,14 @@ def advanced_search():
     include_extension_inputs = request.form.getlist('include_extension')
     exclude_extension_inputs = request.form.getlist('exclude_extension')
 
-    author_name = request.form.get("author_name")
+    author_name = term.get("author_name")
-    book_title = request.form.get("book_title")
+    book_title = term.get("book_title")
-    publisher = request.form.get("publisher")
+    publisher = term.get("publisher")
-    pub_start = request.form.get("Publishstart")
+    pub_start = term.get("Publishstart")
-    pub_end = request.form.get("Publishend")
+    pub_end = term.get("Publishend")
-    rating_low = request.form.get("ratinghigh")
+    rating_low = term.get("ratinghigh")
-    rating_high = request.form.get("ratinglow")
+    rating_high = term.get("ratinglow")
-    description = request.form.get("comment")
+    description = term.get("comment")
     if author_name:
         author_name = author_name.strip().lower().replace(',', '|')
     if book_title:
@@ -1367,17 +1381,25 @@ def advanced_search():
                 else:
                     q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
                         func.lower(db.cc_classes[c.id].value).ilike("%" + custom_query + "%")))
-        q = q.all()
+        q = q.order_by(*order).all()
+        flask_session['query'] = json.dumps(term)
+        # ToDo: Check saved ids mechanism ?
         ids = list()
         for element in q:
             ids.append(element.id)
         searched_ids[current_user.id] = ids
+        # entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
+        result_count = len(q)
+        if offset != None and limit != None:
+            pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
-                                     query=request.form,
+                                 pagination=pagination,
-                                     entries=q,
+                                 # query=request.form,
-                                     result_count=len(q),
+                                 entries=q[offset:limit_all],
-                                     title=_(u"search"), page="search")
+                                 result_count=result_count,
+                                 title=_(u"search"), page="advsearch")
+
 
 
 @web.route("/advanced_search", methods=['GET'])