X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-search.pl;h=c0f7ca5d8c2b913f57e07a88cb28367893554721;hb=e9c256c0e37b734e59cbf429d0084a781724ade5;hp=5601b9c0a59bc0e7d580dc7ed1418584a5689d8a;hpb=d99d32d033935f09b7c361177ac4b43f08b8c14a;p=koha-ffzg.git diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 5601b9c0a5..c0f7ca5d8c 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -29,6 +29,8 @@ use Modern::Perl; ## load Koha modules use C4::Context; use List::MoreUtils q/any/; +use Try::Tiny; +use Encode; use Data::Dumper; # TODO remove @@ -41,23 +43,26 @@ my ($builder, $searcher); $builder = Koha::SearchEngine::QueryBuilder->new({index => 'biblios'}); $searcher = Koha::SearchEngine::Search->new({index => 'biblios'}); -use C4::Output; -use C4::Auth qw(:DEFAULT get_session); -use C4::Languages qw(getLanguages); -use C4::Search; +use C4::Output qw( output_html_with_http_headers pagination_bar output_with_http_headers ); +use C4::Auth qw( get_template_and_user get_session ); +use C4::Languages qw( getlanguage getLanguages ); +use C4::Search qw( searchResults ); use C4::Search::History; -use C4::Biblio; # Unused here? -use C4::Koha; -use C4::Tags qw(get_tags); +use C4::Biblio qw( GetXmlBiblio CountItemsIssued ); +use C4::Koha qw( GetItemTypesCategorized getitemtypeimagelocation GetAuthorisedValues ); +use C4::Tags qw( get_tags get_tag ); use C4::SocialData; use C4::External::OverDrive; +use C4::External::BakerTaylor qw( image_url link_url ); +use Koha::CirculationRules; use Koha::Libraries; use Koha::ItemTypes; use Koha::Ratings; use Koha::Virtualshelves; use Koha::Library::Groups; use Koha::Patrons; +use Koha::Plugins; use Koha::SearchFields; use POSIX qw(ceil floor strftime); @@ -69,17 +74,18 @@ my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold"); # create a new CGI object # FIXME: no_undef_params needs to be tested use CGI qw('-no_undef_params' -utf8); -my $cgi = new CGI; +my $cgi = CGI->new; my $branch_group_limit = $cgi->param("branch_group_limit"); if ( $branch_group_limit ) { if ( $branch_group_limit =~ /^multibranchlimit-/ ) { + # branch_group_limit is deprecated, it should no longer be used # For search groups we are going to convert this branch_group_limit CGI - # parameter into a multibranchlimit CGI parameter for the purposes of + # parameter into a multibranchlimit limit CGI parameter for the purposes of # actually performing the query $cgi->param( - -name => 'multibranchlimit', - -values => substr($branch_group_limit, 17) + -name => 'limit', + -values => 'multibranchlimit:' . substr($branch_group_limit, 17) ); } else { $cgi->append( @@ -89,13 +95,6 @@ if ( $branch_group_limit ) { } } -BEGIN { - if (C4::Context->preference('BakerTaylorEnabled')) { - require C4::External::BakerTaylor; - import C4::External::BakerTaylor qw(&image_url &link_url); - } -} - my ($template,$borrowernumber,$cookie); # decide which template to use my $template_name; @@ -104,20 +103,19 @@ my @params = $cgi->multi_param("limit"); my @searchCategories = $cgi->multi_param('searchcat'); my $format = $cgi->param("format") || ''; -my $build_grouped_results = C4::Context->preference('OPACGroupResults'); if ($format =~ /(rss|atom|opensearchdescription)/) { $template_name = 'opac-opensearch.tt'; } -elsif (@params && $build_grouped_results) { - $template_name = 'opac-results-grouped.tt'; -} -elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) || @searchCategories ) { +elsif ((@params>=1) || (defined $cgi->param("q") && $cgi->param("q") ne "") || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) || @searchCategories ) { $template_name = 'opac-results.tt'; } else { $template_name = 'opac-advsearch.tt'; $template_type = 'advsearch'; } + +$format = 'rss' if $format =~ /^rss2?$/; + # load the template ($template, $borrowernumber, $cookie) = get_template_and_user({ template_name => $template_name, @@ -142,7 +140,7 @@ if($cgi->cookie("bib_list")){ @cart_list = split(/\//, $cart_list); } -if ($format eq 'rss2' or $format eq 'opensearchdescription' or $format eq 'atom') { +if ($format eq 'rss' or $format eq 'opensearchdescription' or $format eq 'atom') { $template->param($format => 1); $template->param(timestamp => strftime("%Y-%m-%dT%H:%M:%S-00:00", gmtime)) if ($format eq 'atom'); # FIXME - the timestamp is a hack - the biblio update timestamp should be used for each @@ -207,10 +205,10 @@ if ($cgi->param("returntosearch")) { } if ($cgi->cookie("search_path_code")) { my $pathcode = $cgi->cookie("search_path_code"); - if ($pathcode eq '"ads"') { + if ($pathcode eq 'ads') { $template->param('ReturnPath' => '/cgi-bin/koha/opac-search.pl?returntosearch=1'); } - elsif ($pathcode eq '"exs"') { + elsif ($pathcode eq 'exs') { $template->param('ReturnPath' => '/cgi-bin/koha/opac-search.pl?expanded_options=1&returntosearch=1'); } else { @@ -218,7 +216,7 @@ if ($cgi->cookie("search_path_code")) { } } -my @search_groups = Koha::Library::Groups->get_search_groups(); +my @search_groups = Koha::Library::Groups->get_search_groups( { interface => 'opac' } )->as_list; $template->param( search_groups => \@search_groups ); # load the language limits (for search) @@ -241,20 +239,10 @@ foreach my $itemtype ( keys %{$itemtypes} ) { my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; my @advancedsearchesloop; my $cnt; -my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes") || "itemtypes"; +my $advanced_search_types = C4::Context->preference("OpacAdvancedSearchTypes") || "itemtypes"; my @advanced_search_types = split(/\|/, $advanced_search_types); -my $hidingrules = {}; -my $yaml = C4::Context->preference('OpacHiddenItems'); -if ( $yaml =~ /\S/ ) { - $yaml = "$yaml\n\n"; # YAML expects trailing newline. Surplus does not hurt. - eval { - $hidingrules = YAML::Load($yaml); - }; - if ($@) { - warn "Unable to parse OpacHiddenItems syspref : $@"; - } -} +my $hidingrules = C4::Context->yaml_preference('OpacHiddenItems') // {}; my @sorted_itemtypes = sort { $itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->{translated_description} } keys %$itemtypes; foreach my $advanced_srch_type (@advanced_search_types) { @@ -325,50 +313,12 @@ if ( $template_type && $template_type eq 'advsearch' ) { $template->param( sort_by => $default_sort_by ); } - # determine what to display next to the search boxes (ie, boolean option - # shouldn't appear on the first one, scan indexes should, adding a new - # box should only appear on the last, etc. - my @search_boxes_array; - my $search_boxes_count = 3; # begin with 3 boxes - $template->param( search_boxes_count => $search_boxes_count ); - - if ($cgi->cookie("num_paragraph")){ - $search_boxes_count = $cgi->cookie("num_paragraph"); - } - - for (my $i=1;$i<=$search_boxes_count;$i++) { - # if it's the first one, don't display boolean option, but show scan indexes - if ($i==1) { - push @search_boxes_array, - { - scan_index => 1, - }; - - } - # if it's the last one, show the 'add field' box - elsif ($i==$search_boxes_count) { - push @search_boxes_array, - { - boolean => 1, - add_field => 1, - }; - } - else { - push @search_boxes_array, - { - boolean => 1, - }; - } - - } - my @advsearch_limits = split /,/, C4::Context->preference('OpacAdvSearchOptions'); my @advsearch_more_limits = split /,/, C4::Context->preference('OpacAdvSearchMoreOptions'); $template->param( uc( C4::Context->preference("marcflavour") ) => 1, # we already did this for UNIMARC advsearch => 1, - search_boxes_loop => \@search_boxes_array, OpacAdvSearchOptions => \@advsearch_limits, OpacAdvSearchMoreOptions => \@advsearch_more_limits, ); @@ -431,7 +381,7 @@ my @allowed_sortby = qw /acqdate_asc acqdate_dsc author_az author_za call_number @sort_by = $cgi->multi_param('sort_by'); $sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by); foreach my $sort (@sort_by) { - if ( grep { /^$sort$/ } @allowed_sortby ) { + if ( grep { $_ eq $sort } @allowed_sortby ) { $template->param($sort => 1); } } @@ -457,7 +407,10 @@ my @indexes = $cgi->multi_param('idx'); # if a simple index (only one) display the index used in the top search box if ($indexes[0] && !$indexes[1]) { - $template->param("ms_".$indexes[0] => 1); + my $idx = "ms_".$indexes[0]; + $idx =~ s/\,/comma/g; # template toolkit doesn't like variables with a , in it + $idx =~ s/-/dash/g; # template toolkit doesn't like variables with a dash in it + $template->param($idx => 1); } # an operand can be a single term, a phrase, or a complete ccl query my @operands = $cgi->multi_param('q'); @@ -466,10 +419,12 @@ my @operands = $cgi->multi_param('q'); $template->{VARS}->{querystring} = join(' ', @operands); # if a simple search, display the value in the search box +my $basic_search = 0; if ($operands[0] && !$operands[1]) { my $ms_query = $operands[0]; $ms_query =~ s/ #\S+//; $template->param(ms_value => $ms_query); + $basic_search=1; } # limits are use to limit to results to a pre-defined category such as branch or language @@ -483,8 +438,7 @@ my %is_nolimit = map { $_ => 1 } @nolimits; if (@searchCategories > 0) { my @tabcat; foreach my $typecategory (@searchCategories) { - my @itemtypes = Koha::ItemTypes->search({ searchcategory => $typecategory }); - push @tabcat, $_->itemtype for @itemtypes; + push @tabcat, Koha::ItemTypes->search({ searchcategory => $typecategory })->get_column('itemtype'); } foreach my $itemtypeInCategory (@tabcat) { @@ -494,12 +448,6 @@ if (@searchCategories > 0) { @limits = map { uri_unescape($_) } @limits; -if($params->{'multibranchlimit'}) { - my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} ); - my @libraries = $search_group->all_libraries; - my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')'; - push @limits, $multibranch if ($multibranch ne '()'); -} my $available; foreach my $limit(@limits) { @@ -529,13 +477,11 @@ $offset = 0 if $offset < 0; my $page = $cgi->param('page') || 1; $offset = ($page-1)*$results_per_page if $page>1; my $hits; -my $expanded_facet = $params->{'expand'}; +my $weight_search = $cgi->param('advsearch') ? $cgi->param('weight_search') || 0 : 1; # Define some global variables my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$query_type); -my @results; - my $suppress = 0; if (C4::Context->preference('OpacSuppression')) { # OPAC suppression by IP address @@ -549,19 +495,24 @@ if (C4::Context->preference('OpacSuppression')) { } } -my $build_params = { - expanded_facet => $expanded_facet, - suppress => $suppress -}; - -unless ( $cgi->param('advsearch') ) { - $build_params->{weighted_fields} = 1; -} - ## I. BUILD THE QUERY ( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$query_type) - = $builder->build_query_compat( \@operators, \@operands, - \@indexes, \@limits, \@sort_by, 0, $lang, $build_params); + = $builder->build_query_compat( + \@operators, + \@operands, + \@indexes, + \@limits, + \@sort_by, + 0, + $lang, + { + suppress => $suppress, + is_opac => 1, + weighted_fields => $weight_search + } +); + +$template->param( search_query => $query ) if C4::Context->preference('DumpSearchQueryTemplate'); sub _input_cgi_parse { my @elements; @@ -599,39 +550,36 @@ $template->param ( OPACResultsSidebar => C4::Context->preference('OPACResultsSid ## II. DO THE SEARCH AND GET THE RESULTS my $total = 0; # the total results for the whole set my $facets; # this object stores the faceted results that display on the left-hand of the results page -my @results_array; my $results_hashref; -my @coins; if ($tag) { - $query_cgi = "tag=" .$tag . "&" . $query_cgi; + $query_cgi = "tag=" . uri_escape_utf8( $tag ) . "&" . $query_cgi; my $taglist = get_tags({term=>$tag, approved=>1}); $results_hashref->{biblioserver}->{hits} = scalar (@$taglist); my @marclist = map { C4::Biblio::GetXmlBiblio( $_->{biblionumber} ) } @$taglist; - $DEBUG and printf STDERR "taglist (%s biblionumber)\nmarclist (%s records)\n", scalar(@$taglist), scalar(@marclist); $results_hashref->{biblioserver}->{RECORDS} = \@marclist; # FIXME: tag search and standard search should work together, not exclusively # FIXME: Because search and standard search don't work together OpacHiddenItems # displays search results which should be hidden. # FIXME: No facets for tags search. -} elsif ($build_grouped_results) { - eval { - ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,undef,$query_type,$scan); - }; } else { - $pasarParams .= '&query=' . uri_escape_utf8($query); + my $json = JSON->new->utf8->allow_nonref(1); + $pasarParams .= '&query=' . uri_escape_utf8($json->encode($query)); $pasarParams .= '&count=' . uri_escape_utf8($results_per_page); $pasarParams .= '&simple_query=' . uri_escape_utf8($simple_query); $pasarParams .= '&query_type=' . uri_escape_utf8($query_type) if ($query_type); my $itemtypes_nocategory = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; eval { - ($error, $results_hashref, $facets) = $searcher->search_compat($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,undef,$itemtypes_nocategory,$query_type,$scan,1); + ($error, $results_hashref, $facets) = $searcher->search_compat($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,undef,$itemtypes_nocategory,$query_type,$scan,1); }; } # use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref); if (not $tag and ( $@ || $error)) { - $template->param(query_error => $error.$@); + my $query_error = q{}; + $query_error .= $error if $error; + $query_error .= $@ if $@; + $template->param(query_error => $query_error); output_html_with_http_headers $cgi, $cookie, $template->output; exit; } @@ -642,33 +590,63 @@ my @sup_results_array; my $search_context = {}; $search_context->{'interface'} = 'opac'; if (C4::Context->preference('OpacHiddenItemsExceptions')){ - $search_context->{'category'} = $patron ? $patron->categorycode : q{}; + $search_context->{patron} = $patron; +} + +my $variables = { anonymous_session => ($borrowernumber) ? 0 : 1 }; + +my @plugin_responses = Koha::Plugins->call( + 'opac_results_xslt_variables', + { + lang => $lang, + patron_id => $borrowernumber + } +); +for my $plugin_variables ( @plugin_responses ) { + $variables = { %$variables, %$plugin_variables }; } for (my $i=0;$i<@servers;$i++) { my $server = $servers[$i]; if ($server && $server =~/biblioserver/) { # this is the local bibliographic server $hits = $results_hashref->{$server}->{"hits"}; - my $page = $cgi->param('page') || 0; - my @newresults; - if ($build_grouped_results) { - foreach my $group (@{ $results_hashref->{$server}->{"GROUPS"} }) { - # because pazGetRecords handles retieving only the records - # we want as specified by $offset and $results_per_page, - # we need to set the offset parameter of searchResults to 0 - my @group_results = searchResults( $search_context, $query_desc, $group->{'group_count'},$results_per_page, 0, $scan, - $group->{"RECORDS"}); - push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results }; + if ( $hits == 0 && $basic_search ){ + $operands[0] = '"'.$operands[0].'"'; #quote it + ## I. BUILD THE QUERY + ( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$query_type) + = $builder->build_query_compat( + \@operators, + \@operands, + \@indexes, + \@limits, + \@sort_by, + 0, + $lang, + { + suppress => $suppress, + is_opac => 1, + weighted_fields => $weight_search + } + ); + my $quoted_results_hashref; + my $itemtypes_nocategory = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; + eval { + ($error, $quoted_results_hashref, $facets) = $searcher->search_compat($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,undef,$itemtypes_nocategory,$query_type,$scan,1); + }; + my $quoted_hits = $quoted_results_hashref->{$server}->{"hits"} // 0; + if ( $quoted_hits ){ + $results_hashref->{'biblioserver'} = $quoted_results_hashref->{'biblioserver'}; + $hits = $quoted_hits; } - } else { - @newresults = searchResults( $search_context, $query_desc, $hits, $results_per_page, $offset, $scan, - $results_hashref->{$server}->{"RECORDS"}); } + my $page = $cgi->param('page') || 0; + my @newresults = searchResults( $search_context, $query_desc, $hits, $results_per_page, $offset, $scan, + $results_hashref->{$server}->{"RECORDS"}, $variables); $hits = 0 unless @newresults; my $art_req_itypes; if( C4::Context->preference('ArticleRequests') ) { - $art_req_itypes = Koha::IssuingRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () }); + $art_req_itypes = Koha::CirculationRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () }); } foreach my $res (@newresults) { @@ -683,7 +661,8 @@ for (my $i=0;$i<@servers;$i++) { if (C4::Context->preference('COinSinOPACResults')) { my $biblio = Koha::Biblios->find( $res->{'biblionumber'} ); - $res->{coins} = $biblio->get_coins; + # Catch the exception as Koha::Biblio::Metadata->record can explode if the MARCXML is invalid + $res->{coins} = $biblio ? eval {$biblio->get_coins} : q{}; # FIXME This should be moved at the beginning of the @newresults loop } if ( C4::Context->preference( "Babeltheque" ) and $res->{normalized_isbn} ) { if( my $isbn = Business::ISBN->new( $res->{normalized_isbn} ) ) { @@ -768,7 +747,7 @@ for (my $i=0;$i<@servers;$i++) { } ## If there's just one result, redirect to the detail page - if ($total == 1 && $format ne 'rss2' + if ($total == 1 && $format ne 'rss' && $format ne 'opensearchdescription' && $format ne 'atom') { my $biblionumber=$newresults[0]->{biblionumber}; if (C4::Context->preference('BiblioDefaultView') eq 'isbd') { @@ -781,23 +760,20 @@ for (my $i=0;$i<@servers;$i++) { exit; } if ($hits) { - if ( !$build_grouped_results ) { - # We build the encrypted list of first OPACnumSearchResults biblios to pass with the search criteria for paging on opac-detail - $pasarParams .= '&listBiblios='; - my $j = 0; - foreach (@newresults) { - my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0; - $pasarParams .= uri_escape_utf8($bibnum) . ','; - $j++; - last if ($j == $results_per_page); - } - chop $pasarParams if ($pasarParams =~ /,$/); - $pasarParams .= '&total=' . uri_escape_utf8( int($total) ) if ($pasarParams !~ /total=(?:[0-9]+)?/); - if ($pasarParams) { - my $session = get_session($cgi->cookie("CGISESSID")); - $session->param('busc' => $pasarParams); - } - # + # We build the encrypted list of first OPACnumSearchResults biblios to pass with the search criteria for paging on opac-detail + $pasarParams .= '&listBiblios='; + my $j = 0; + foreach (@newresults) { + my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0; + $pasarParams .= uri_escape_utf8($bibnum) . ','; + $j++; + last if ($j == $results_per_page); + } + chop $pasarParams if ($pasarParams =~ /,$/); + $pasarParams .= '&total=' . uri_escape_utf8( int($total) ) if ($pasarParams !~ /total=(?:[0-9]+)?/); + if ($pasarParams) { + my $session = get_session($cgi->cookie("CGISESSID")); + $session->param('busc' => $pasarParams); } $template->param(total => $hits); my $limit_cgi_not_availablity = $limit_cgi; @@ -814,111 +790,29 @@ for (my $i=0;$i<@servers;$i++) { $template->param(searchdesc => 1); } $template->param(results_per_page => $results_per_page); - my $hide = C4::Context->preference('OpacHiddenItems'); - $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines - my $branch = ''; - if (C4::Context->userenv){ - $branch = C4::Context->userenv->{branch}; - } - if ( C4::Context->preference('HighlightOwnItemsOnOPAC') ) { - if ( - ( ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) && $branch ) - || - C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' - ) { - my $branchcode; - if ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) { - $branchcode = $branch; - } - elsif ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - $branchcode = $ENV{'BRANCHCODE'}; - } - - foreach my $res ( @newresults ) { - my @new_loop; - my @top_loop; - my @old_loop = @{$res->{'available_items_loop'}}; - foreach my $item ( @old_loop ) { - if ( $item->{'branchcode'} eq $branchcode ) { - $item->{'this_branch'} = 1; - push( @top_loop, $item ); - } else { - push( @new_loop, $item ); - } - } - my @complete_loop = ( @top_loop, @new_loop ); - $res->{'available_items_loop'} = \@complete_loop; - } - } - } + my $hide = keys %$hidingrules ? 1 : 0; $template->param( SEARCH_RESULTS => \@newresults, - OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay")), suppress_result_number => $hide, ); - if (C4::Context->preference("OPACLocalCoverImages")){ - $template->param(OPACLocalCoverImages => 1); - $template->param(OPACLocalCoverImagesPriority => C4::Context->preference("OPACLocalCoverImagesPriority")); - } - ## Build the page numbers on the bottom of the page - my @page_numbers; - my $max_result_window = $searcher->max_result_window; - my $hits_to_paginate = ($max_result_window && $max_result_window < $hits) ? $max_result_window : $hits; - $template->param( hits_to_paginate => $hits_to_paginate ); - # total number of pages there will be - my $pages = ceil($hits_to_paginate / $results_per_page); - my $last_page_offset = ( $pages - 1 ) * $results_per_page; - # default page number - my $current_page_number = 1; - if ($offset) { - $current_page_number = ( $offset / $results_per_page + 1 ); - } - my $previous_page_offset; - if ( $offset >= $results_per_page ) { - $previous_page_offset = $offset - $results_per_page; - } - my $next_page_offset = $offset + $results_per_page; - # If we're within the first 10 pages, keep it simple - #warn "current page:".$current_page_number; - if ($current_page_number < 10) { - # just show the first 10 pages - # Loop through the pages - my $pages_to_show = 10; - $pages_to_show = $pages if $pages<10; - for ($i=1; $i<=$pages_to_show;$i++) { - # the offset for this page - my $this_offset = (($i*$results_per_page)-$results_per_page); - # the page number for this page - my $this_page_number = $i; - # put it in the array - push @page_numbers, - { offset => $this_offset, - pg => $this_page_number, - highlight => $this_page_number == $current_page_number, - sort_by => join ' ', @sort_by - }; - - } - + if (C4::Context->preference("OPACLocalCoverImages")){ + $template->param(OPACLocalCoverImages => 1); + $template->param(OPACLocalCoverImagesPriority => C4::Context->preference("OPACLocalCoverImagesPriority")); } - # now, show twenty pages, with the current one smack in the middle - else { - for ($i=$current_page_number; $i<=($current_page_number + 20 );$i++) { - my $this_offset = ((($i-9)*$results_per_page)-$results_per_page); - my $this_page_number = $i-9; - if ( $this_page_number <= $pages ) { - push @page_numbers, - { offset => $this_offset, - pg => $this_page_number, - highlight => $this_page_number == $current_page_number, - sort_by => join ' ', @sort_by - }; + ## Build the page numbers on the bottom of the page + my ( $page_numbers, $hits_to_paginate, $pages, $current_page_number, $previous_page_offset, $next_page_offset, $last_page_offset ) = + Koha::SearchEngine::Search->pagination_bar( + { + hits => $hits, + max_result_window => $searcher->max_result_window, + results_per_page => $results_per_page, + offset => $offset, + sort_by => \@sort_by } - } - - } - $template->param( PAGE_NUMBERS => \@page_numbers, + ); + $template->param( hits_to_paginate => $hits_to_paginate ); + $template->param( PAGE_NUMBERS => $page_numbers, last_page_offset => $last_page_offset, previous_page_offset => $previous_page_offset) unless $pages < 2; $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number; @@ -929,7 +823,7 @@ for (my $i=0;$i<@servers;$i++) { if ($nohits and $nohits=~/{QUERY_KW}/){ # extracting keywords in case of relaunching search (my $query_kw=$query_desc)=~s/ and|or / /g; - my @query_kw=($query_kw=~ /([-\w]+\b)(?:[^,:]|$)/g); + my @query_kw=($query_kw=~ /([-\w]+\b)(?:[^:]|$)/g); $query_kw=join('+',@query_kw); $nohits=~s/{QUERY_KW}/$query_kw/g; $template->param('OPACNoResultsFound' =>$nohits); @@ -961,7 +855,6 @@ for (my $i=0;$i<@servers;$i++) { # FIXME: can add support for other targets as needed here $template->param( outer_sup_results_loop => \@sup_results_array); } #/end of the for loop -#$template->param(FEDERATED_RESULTS => \@results_array); for my $facet ( @$facets ) { for my $entry ( @{ $facet->{facets} } ) { @@ -991,14 +884,14 @@ my $some_private_shelves = Koha::Virtualshelves->get_some_shelves( { borrowernumber => $borrowernumber, add_allowed => 1, - category => 1, + public => 0, } ); my $some_public_shelves = Koha::Virtualshelves->get_some_shelves( { borrowernumber => $borrowernumber, add_allowed => 1, - category => 2, + public => 1, } ); @@ -1007,26 +900,14 @@ $template->param( add_to_some_public_shelves => $some_public_shelves, ); -my $content_type = ($format eq 'rss' or $format eq 'atom') ? $format : 'html'; - -# If GoogleIndicTransliteration system preference is On Set parameter to load Google's javascript in OPAC search screens -if (C4::Context->preference('GoogleIndicTransliteration')) { - $template->param('GoogleIndicTransliteration' => 1); -} +my $content_type = ($format eq 'rss' or $format eq 'atom' or $format eq 'opensearchdescription') ? $format : 'html'; $template->{VARS}->{DidYouMean} = ( defined C4::Context->preference('OPACdidyoumean') && C4::Context->preference('OPACdidyoumean') =~ m/enable/ ); -$template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksReviews'); -$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer'); -$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults'); if ($offset == 0) { - if (IsOverDriveEnabled()) { - $template->param(OverDriveEnabled => 1); - $template->param(OverDriveLibraryID => C4::Context->preference('OverDriveLibraryID')); - } - $template->param(RecordedBooksEnabled => C4::Context->preference( 'RecordedBooksClientSecret' ) && C4::Context->preference( 'RecordedBooksLibraryID' )); + $template->param(firstPage => 1); } $template->param( borrowernumber => $borrowernumber);