Bug 12478: paging is fixed now too

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>

diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
index a30f5e1..62d0814 100644 (file)
--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
@@ -279,10 +279,10 @@ warn "Search is " . Dumper $search;
             # left and right truncation, otherwise an exact phrase
             push @query_parts, { match_phrase => { $wh => $val }};
         } elsif ($op eq 'start') {
+            # startswith search
             push @query_parts, { wildcard => { "$wh.phrase" => lc "$val*" }};
         } else {
             # regular wordlist stuff
-            # TODO truncation
             push @query_parts, { match => { $wh => $val }};
         }
     }

diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl
index e90e349..1cc6cd5 100755 (executable)
--- a/opac/opac-authorities-home.pl
+++ b/opac/opac-authorities-home.pl
@@ -68,9 +68,9 @@ if ( $op eq "do_search" ) {
 #    die Dumper(\@marclist, \@and_or,
 #        \@excluding, \@operator, \@value, $authtypecode, $orderby, $query);
     # The searchengine API expects pages to start at page 1
-    $startfrom = defined($startfrom) ? $startfrom+1 : undef;
+    $startfrom = $startfrom // 0;
     my ( $results, $total ) =
-      $searcher->search_auth_compat( $search_query, $startfrom, $resultsperpage );
+      $searcher->search_auth_compat( $search_query, $startfrom+1, $resultsperpage );
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name   => "opac-authoritiessearchresultlist.tt",