X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-search.pl;h=1d7615bc5cffdd55b9e91499f12582c6e9624295;hb=4ec5a67c6f989635b14f048c3720bea7a8d86d38;hp=ced8ae48cda79d81ae6d93dac9292fe54991d0d4;hpb=488a3d6fed57b4e0d773157ee4a6ab7e4775e7a4;p=koha.git diff --git a/opac/opac-search.pl b/opac/opac-search.pl index ced8ae48cd..1d7615bc5c 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -6,18 +6,18 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . # Script to perform searching # Mostly copied from search.pl, see POD there @@ -28,29 +28,34 @@ use Modern::Perl; # to perform, etc. ## load Koha modules use C4::Context; +use List::MoreUtils q/any/; -my $searchengine = C4::Context->preference("SearchEngine"); -for ( $searchengine ) { - when ( /^Solr$/ ) { - warn "We use Solr"; - require 'opac/search.pl'; - exit; - } - when ( /^Zebra$/ ) { +use Data::Dumper; # TODO remove - } -} +use Koha::SearchEngine::Search; +use Koha::SearchEngine::QueryBuilder; + +my $searchengine = C4::Context->preference("SearchEngine"); +my ($builder, $searcher); +#$searchengine = 'Zebra'; # XXX +$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(getAllLanguages); +use C4::Languages qw(getLanguages); use C4::Search; -use C4::Biblio; # GetBiblioData +use C4::Search::History; +use C4::Biblio; # Unused here? use C4::Koha; use C4::Tags qw(get_tags); -use C4::Branch; # GetBranches use C4::SocialData; -use C4::Ratings; +use C4::External::OverDrive; + +use Koha::ItemTypes; +use Koha::Ratings; +use Koha::Virtualshelves; +use Koha::Library::Groups; use POSIX qw(ceil floor strftime); use URI::Escape; @@ -60,7 +65,7 @@ use Business::ISBN; 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'); +use CGI qw('-no_undef_params' -utf8); my $cgi = new CGI; my $branch_group_limit = $cgi->param("branch_group_limit"); @@ -89,26 +94,25 @@ BEGIN { } my ($template,$borrowernumber,$cookie); -my $lang = C4::Templates::getlanguage($cgi, 'opac'); # decide which template to use my $template_name; my $template_type = 'basic'; -my @params = $cgi->param("limit"); - +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.tmpl'; + $template_name = 'opac-opensearch.tt'; } elsif (@params && $build_grouped_results) { - $template_name = 'opac-results-grouped.tmpl'; + $template_name = 'opac-results-grouped.tt'; } -elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) ) { - $template_name = 'opac-results.tmpl'; +elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) || @searchCategories ) { + $template_name = 'opac-results.tt'; } else { - $template_name = 'opac-advsearch.tmpl'; + $template_name = 'opac-advsearch.tt'; $template_type = 'advsearch'; } # load the template @@ -119,7 +123,10 @@ else { authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), } ); -if ($template_name eq 'opac-results.tmpl') { + +my $lang = C4::Languages::getlanguage($cgi); + +if ($template_name eq 'opac-results.tt') { $template->param('COinSinOPACResults' => C4::Context->preference('COinSinOPACResults')); } @@ -143,7 +150,7 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) { elsif (C4::Context->preference("marcflavour") eq "MARC21" ) { $template->param('usmarc' => 1); } -$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') ); + $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') ); $template->param( @@ -191,17 +198,41 @@ if (C4::Context->preference('TagsEnabled')) { # load the branches -my $branches = GetBranches(); # used later in *getRecords, probably should be internalized by those functions after caching in C4::Branch is established -$template->param( - searchdomainloop => GetBranchCategories('searchdomain'), -); +if ($cgi->param("returntosearch")) { + $template->param('ReturnToSearch' => 1); +} +if ($cgi->cookie("search_path_code")) { + my $pathcode = $cgi->cookie("search_path_code"); + if ($pathcode eq '"ads"') { + $template->param('ReturnPath' => '/cgi-bin/koha/opac-search.pl?returntosearch=1'); + } + elsif ($pathcode eq '"exs"') { + $template->param('ReturnPath' => '/cgi-bin/koha/opac-search.pl?expanded_options=1&returntosearch=1'); + } + else { + warn "ReturnPath switch error"; + } +} + +my @search_groups = Koha::Library::Groups->get_search_groups(); +$template->param( search_groups => \@search_groups ); # load the language limits (for search) -my $languages_limit_loop = getAllLanguages($lang); +my $languages_limit_loop = getLanguages($lang, 1); $template->param(search_languages_loop => $languages_limit_loop,); # load the Type stuff -my $itemtypes = GetItemTypes; +my $itemtypes = GetItemTypesCategorized; +# add translated_description to itemtypes +foreach my $itemtype ( keys %{$itemtypes} ) { + # Itemtypes search categories don't have (yet) translated descriptions, they are auth values (and could still have no descriptions too BZ 18400) + # If 'iscat' (see ITEMTYPECAT) then there is no itemtype and the description is not translated + my $translated_description = $itemtypes->{$itemtype}->{iscat} + ? $itemtypes->{$itemtype}->{description} + : Koha::ItemTypes->find($itemtype)->translated_description; + $itemtypes->{$itemtype}->{translated_description} = $translated_description || $itemtypes->{$itemtype}->{description} || q{}; +} + # the index parameter is different for item-level itemtypes my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; my @advancedsearchesloop; @@ -209,32 +240,58 @@ my $cnt; my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes") || "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 @sorted_itemtypes = sort { $itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->{translated_description} } keys %$itemtypes; foreach my $advanced_srch_type (@advanced_search_types) { + $advanced_srch_type =~ s/^\s*//; + $advanced_srch_type =~ s/\s*$//; if ($advanced_srch_type eq 'itemtypes') { # itemtype is a special case, since it's not defined in authorized values my @itypesloop; - foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) { + foreach my $thisitemtype ( @sorted_itemtypes ) { + next if $hidingrules->{itype} && any { $_ eq $thisitemtype } @{$hidingrules->{itype}}; + next if $hidingrules->{itemtype} && any { $_ eq $thisitemtype } @{$hidingrules->{itemtype}}; my %row =( number=>$cnt++, ccl => "$itype_or_itemtype,phr", code => $thisitemtype, - description => $itemtypes->{$thisitemtype}->{'description'}, + description => $itemtypes->{$thisitemtype}->{translated_description}, imageurl=> getitemtypeimagelocation( 'opac', $itemtypes->{$thisitemtype}->{'imageurl'} ), + cat => $itemtypes->{$thisitemtype}->{'iscat'}, + hideinopac => $itemtypes->{$thisitemtype}->{'hideinopac'}, + searchcategory => $itemtypes->{$thisitemtype}->{'searchcategory'}, ); - push @itypesloop, \%row; + if ( !$itemtypes->{$thisitemtype}->{'hideinopac'} ) { + push @itypesloop, \%row; + } } my %search_code = ( advanced_search_type => $advanced_srch_type, code_loop => \@itypesloop ); push @advancedsearchesloop, \%search_code; } else { # covers all the other cases: non-itemtype authorized values - my $advsearchtypes = GetAuthorisedValues($advanced_srch_type, '', 'opac'); + my $advsearchtypes = GetAuthorisedValues($advanced_srch_type, 'opac'); my @authvalueloop; for my $thisitemtype (@$advsearchtypes) { + my $hiding_key = lc $thisitemtype->{category}; + $hiding_key = "location" if $hiding_key eq 'loc'; + next if $hidingrules->{$hiding_key} && any { $_ eq $thisitemtype->{authorised_value} } @{$hidingrules->{$hiding_key}}; my %row =( number=>$cnt++, ccl => $advanced_srch_type, code => $thisitemtype->{authorised_value}, description => $thisitemtype->{'lib_opac'} || $thisitemtype->{'lib'}, + searchcategory => $itemtypes->{$thisitemtype}->{'searchcategory'}, imageurl => getitemtypeimagelocation( 'opac', $thisitemtype->{'imageurl'} ), ); push @authvalueloop, \%row; @@ -246,10 +303,6 @@ foreach my $advanced_srch_type (@advanced_search_types) { } $template->param(advancedsearchesloop => \@advancedsearchesloop); -# # load the itypes (Called item types in the template -- just authorized values for searching) -# my ($itypecount,@itype_loop) = GetCcodes(); -# $template->param(itypeloop=>\@itype_loop,); - # The following should only be loaded if we're bringing up the advanced search template if ( $template_type && $template_type eq 'advsearch' ) { # load the servers (used for searching -- to do federated searching, etc.) @@ -273,6 +326,12 @@ if ( $template_type && $template_type eq 'advsearch' ) { # box should only appear on the last, etc. my @search_boxes_array; my $search_boxes_count = 3; # begin whith 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) { @@ -298,9 +357,17 @@ if ( $template_type && $template_type eq 'advsearch' ) { } } - $template->param(uc( C4::Context->preference("marcflavour")) => 1, # we already did this for UNIMARC - advsearch => 1, - search_boxes_loop => \@search_boxes_array); + + 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, + ); # use the global setting by default if ( C4::Context->preference("expandedSearchOption") == 1 ) { @@ -309,13 +376,10 @@ if ( $template_type && $template_type eq 'advsearch' ) { # but let the user override it if (defined $cgi->param('expanded_options')) { if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) { - $template->param( expanded_options => $cgi->param('expanded_options')); + $template->param( expanded_options => scalar $cgi->param('expanded_options')); } } - if (C4::Context->preference('OPACNumbersPreferPhrase')) { - $template->param('numbersphr' => 1); - } output_html_with_http_headers $cgi, $cookie, $template->output; exit; @@ -329,17 +393,20 @@ if ( $template_type && $template_type eq 'advsearch' ) { # * multivalued CGI paramaters are returned as a packaged string separated by "\0" (null) my $params = $cgi->Vars; my $tag; -$tag = $params->{tag} if $params->{tag}; - +if ( $params->{tag} ) { + $tag = $params->{tag}; + $template->param( tag => $tag ); +} # String with params with the search criteria for the paging in opac-detail +# param value is URI encoded and params separator is HTML encode (&) my $pasarParams = ''; my $j = 0; for (keys %$params) { - my @pasarParam = $cgi->param($_); + my @pasarParam = $cgi->multi_param($_); for my $paramValue(@pasarParam) { $pasarParams .= '&' if ($j > 0); - $pasarParams .= $_ . '=' . $paramValue; + $pasarParams .= $_ . '=' . uri_escape_utf8($paramValue); $j++; } } @@ -357,17 +424,17 @@ if ( C4::Context->preference('OPACdefaultSortField') } my @allowed_sortby = qw /acqdate_asc acqdate_dsc author_az author_za call_number_asc call_number_dsc popularity_asc popularity_dsc pubdate_asc pubdate_dsc relevance title_az title_za/; -@sort_by = $cgi->param('sort_by'); +@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 ( $sort ~~ @allowed_sortby ) { + if ( grep { /^$sort$/ } @allowed_sortby ) { $template->param($sort => 1); } } $template->param('sort_by' => $sort_by[0]); # Use the servers defined, or just search our local catalog(default) -my @servers = $cgi->param('server'); +my @servers = $cgi->multi_param('server'); unless (@servers) { #FIXME: this should be handled using Context.pm @servers = ("biblioserver"); @@ -376,12 +443,12 @@ unless (@servers) { # operators include boolean and proximity operators and are used # to evaluate multiple operands -my @operators = $cgi->param('op'); +my @operators = $cgi->multi_param('op'); @operators = map { uri_unescape($_) } @operators; # indexes are query qualifiers, like 'title', 'author', etc. They # can be single or multiple parameters separated by comma: kw,right-Truncation -my @indexes = $cgi->param('idx'); +my @indexes = $cgi->multi_param('idx'); @indexes = map { uri_unescape($_) } @indexes; # if a simple index (only one) display the index used in the top search box @@ -389,7 +456,7 @@ if ($indexes[0] && !$indexes[1]) { $template->param("ms_".$indexes[0] => 1); } # an operand can be a single term, a phrase, or a complete ccl query -my @operands = $cgi->param('q'); +my @operands = $cgi->multi_param('q'); @operands = map { uri_unescape($_) } @operands; $template->{VARS}->{querystring} = join(' ', @operands); @@ -402,11 +469,31 @@ if ($operands[0] && !$operands[1]) { } # limits are use to limit to results to a pre-defined category such as branch or language -my @limits = $cgi->param('limit'); +my @limits = $cgi->multi_param('limit'); +@limits = map { uri_unescape($_) } @limits; +my @nolimits = $cgi->multi_param('nolimit'); +@nolimits = map { uri_unescape($_) } @nolimits; +my %is_nolimit = map { $_ => 1 } @nolimits; +@limits = grep { not $is_nolimit{$_} } @limits; + +if (@searchCategories > 0) { + my @tabcat; + foreach my $typecategory (@searchCategories) { + my @itemtypes = Koha::ItemTypes->search({ searchcategory => $typecategory }); + push @tabcat, $_->itemtype for @itemtypes; + } + + foreach my $itemtypeInCategory (@tabcat) { + push (@limits, "mc-$itype_or_itemtype,phr:".$itemtypeInCategory); + } +} + @limits = map { uri_unescape($_) } @limits; if($params->{'multibranchlimit'}) { - my $multibranch = '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $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 '()'); } @@ -420,11 +507,7 @@ $template->param(available => $available); # append year limits if they exist if ($params->{'limit-yr'}) { - if ($params->{'limit-yr'} =~ /\d{4}-\d{4}/) { - my ($yr1,$yr2) = split(/-/, $params->{'limit-yr'}); - push @limits, "yr,st-numeric,ge=$yr1 and yr,st-numeric,le=$yr2"; - } - elsif ($params->{'limit-yr'} =~ /\d{4}/) { + if ($params->{'limit-yr'} =~ /\d{4}/) { push @limits, "yr,st-numeric=$params->{'limit-yr'}"; } else { @@ -438,25 +521,50 @@ my $count = C4::Context->preference('OPACnumSearchResults') || 20; my $countRSS = C4::Context->preference('numSearchRSSResults') || 50; my $results_per_page = $params->{'count'} || $count; my $offset = $params->{'offset'} || 0; +$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'}; # Define some global variables -my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type); +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 + if (C4::Context->preference('OpacSuppressionByIPRange')) { + my $IPAddress = $ENV{'REMOTE_ADDR'}; + my $IPRange = C4::Context->preference('OpacSuppressionByIPRange'); + $suppress = ($IPAddress !~ /^$IPRange/); + } + else { + $suppress = 1; + } +} + ## I. BUILD THE QUERY -( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang); +( $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, + { expanded_facet => $expanded_facet, suppress => $suppress } + ); sub _input_cgi_parse { my @elements; - for my $this_cgi ( split('&',shift) ) { + my $query_cgi = shift or return @elements; + for my $this_cgi ( split('&',$query_cgi) ) { next unless $this_cgi; $this_cgi =~ /(.*?)=(.*)/; - push @elements, { input_name => $1, input_value => $2 }; + push @elements, { input_name => $1, input_value => Encode::decode_utf8( uri_unescape($2) ) }; } return @elements; } @@ -468,27 +576,6 @@ $template->param ( QUERY_INPUTS => \@query_inputs ); ## parse the limit_cgi string and put it into a form suitable for s my @limit_inputs = $limit_cgi ? _input_cgi_parse($limit_cgi) : (); -# add OPAC 'hidelostitems' -#if (C4::Context->preference('hidelostitems') == 1) { -# # either lost ge 0 or no value in the lost register -# $query ="($query) and ( (lost,st-numeric <= 0) or ( allrecords,AlwaysMatches='' not lost,AlwaysMatches='') )"; -#} -# -# add OPAC suppression - requires at least one item indexed with Suppress -if (C4::Context->preference('OpacSuppression')) { - # OPAC suppression by IP address - if (C4::Context->preference('OpacSuppressionByIPRange')) { - my $IPAddress = $ENV{'REMOTE_ADDR'}; - my $IPRange = C4::Context->preference('OpacSuppressionByIPRange'); - if ($IPAddress !~ /^$IPRange/) { - $query = "($query) not Suppress=1"; - } - } - else { - $query = "($query) not Suppress=1"; - } -} - $template->param ( LIMIT_INPUTS => \@limit_inputs ); $template->param ( OPACResultsSidebar => C4::Context->preference('OPACResultsSidebar')); @@ -503,35 +590,28 @@ if ($tag) { $query_cgi = "tag=" .$tag . "&" . $query_cgi; my $taglist = get_tags({term=>$tag, approved=>1}); $results_hashref->{biblioserver}->{hits} = scalar (@$taglist); - my @biblist = (map {GetBiblioData($_->{biblionumber})} @$taglist); - my @marclist = (map {$_->{marc}} @biblist ); + 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: 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,$branches,$query_type,$scan); + ($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=' . $query; - $pasarParams .= '&count=' . $results_per_page; - $pasarParams .= '&simple_query=' . $simple_query; - $pasarParams .= '&query_type=' . $query_type if ($query_type); + $pasarParams .= '&query=' . uri_escape_utf8($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) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan,1); - }; -} -# This sorts the facets into alphabetical order -if ($facets) { - foreach my $f (@$facets) { - $f->{facets} = [ sort { uc($a->{facet_title_value}) cmp uc($b->{facet_title_value}) } @{ $f->{facets} } ]; - } - @$facets = sort {$a->{expand} cmp $b->{expand}} @$facets; + ($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); +}; } # use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref); -if ($@ || $error) { +if (not $tag and ( $@ || $error)) { $template->param(query_error => $error.$@); output_html_with_http_headers $cgi, $cookie, $template->output; exit; @@ -559,6 +639,7 @@ for (my $i=0;$i<@servers;$i++) { @newresults = searchResults('opac', $query_desc, $hits, $results_per_page, $offset, $scan, $results_hashref->{$server}->{"RECORDS"}); } + $hits = 0 unless @newresults; foreach my $res (@newresults) { @@ -571,7 +652,7 @@ for (my $i=0;$i<@servers;$i++) { } if (C4::Context->preference('COinSinOPACResults')) { - my $record = GetMarcBiblio($res->{'biblionumber'}); + my $record = GetMarcBiblio({ biblionumber => $res->{'biblionumber'} }); $res->{coins} = GetCOinSBiblio($record); } if ( C4::Context->preference( "Babeltheque" ) and $res->{normalized_isbn} ) { @@ -603,70 +684,56 @@ for (my $i=0;$i<@servers;$i++) { } } + $res->{shelves} = Koha::Virtualshelves->get_shelves_containing_record( + { + biblionumber => $res->{biblionumber}, + borrowernumber => $borrowernumber + } + ); + if ( C4::Context->preference('OpacStarRatings') eq 'all' ) { - my $rating = GetRating( $res->{'biblionumber'}, $borrowernumber ); - $res->{'rating_value'} = $rating->{'rating_value'}; - $res->{'rating_total'} = $rating->{'rating_total'}; - $res->{'rating_avg'} = $rating->{'rating_avg'}; - $res->{'rating_avg_int'} = $rating->{'rating_avg_int'}; + my $ratings = Koha::Ratings->search({ biblionumber => $res->{biblionumber} }); + $res->{ratings} = $ratings; + $res->{my_rating} = $borrowernumber ? $ratings->search({ borrowernumber => $borrowernumber })->next : undef; } } if ($results_hashref->{$server}->{"hits"}){ - $total = $total + $results_hashref->{$server}->{"hits"}; + $total = $total + $hits; } # Opac search history - my $newsearchcookie; if (C4::Context->preference('EnableOpacSearchHistory')) { - my @recentSearches; - - # Getting the (maybe) already sent cookie - my $searchcookie = $cgi->cookie('KohaOpacRecentSearches'); - if ($searchcookie){ - $searchcookie = uri_unescape($searchcookie); - if (decode_json($searchcookie)) { - @recentSearches = @{decode_json($searchcookie)}; - } - } - - # Adding the new search if needed - my $path_info = $cgi->url(-path_info=>1); - my $query_cgi_history = $cgi->url(-query=>1); - $query_cgi_history =~ s/^$path_info\?//; - $query_cgi_history =~ s/;/&/g; - my $query_desc_history = "$query_desc, $limit_desc"; - - if (!$borrowernumber || $borrowernumber eq '') { - # To a cookie (the user is not logged in) - if (!$offset) { - push @recentSearches, { - "query_desc" => Encode::decode_utf8($query_desc_history) || "unknown", - "query_cgi" => Encode::decode_utf8($query_cgi_history) || "unknown", - "time" => time(), - "total" => $total - }; - $template->param(ShowOpacRecentSearchLink => 1); - } - - shift @recentSearches if (@recentSearches > 15); - # Pushing the cookie back - $newsearchcookie = $cgi->cookie( - -name => 'KohaOpacRecentSearches', - # We uri_escape the whole serialized structure so we're sure we won't have any encoding problems - -value => uri_escape( encode_json(\@recentSearches) ), - -expires => '' - ); - $cookie = [$cookie, $newsearchcookie]; - } - else { - # To the session (the user is logged in) - if (!$offset) { - AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc_history, $query_cgi_history, $total); - $template->param(ShowOpacRecentSearchLink => 1); + unless ( $offset ) { + my $path_info = $cgi->url(-path_info=>1); + my $query_cgi_history = $cgi->url(-query=>1); + $query_cgi_history =~ s/^$path_info\?//; + $query_cgi_history =~ s/;/&/g; + my $query_desc_history = join ", ", grep { defined $_ } $query_desc, $limit_desc; + + unless ( $borrowernumber ) { + my $new_searches = C4::Search::History::add_to_session({ + cgi => $cgi, + query_desc => $query_desc_history, + query_cgi => $query_cgi_history, + total => $total, + type => "biblio", + }); + } else { + # To the session (the user is logged in) + C4::Search::History::add({ + userid => $borrowernumber, + sessionid => $cgi->cookie("CGISESSID"), + query_desc => $query_desc_history, + query_cgi => $query_cgi_history, + total => $total, + type => "biblio", + }); } } + $template->param( EnableOpacSearchHistory => 1 ); } + ## If there's just one result, redirect to the detail page if ($total == 1 && $format ne 'rss2' && $format ne 'opensearchdescription' && $format ne 'atom') { @@ -687,12 +754,12 @@ for (my $i=0;$i<@servers;$i++) { my $j = 0; foreach (@newresults) { my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0; - $pasarParams .= $bibnum . ','; + $pasarParams .= uri_escape_utf8($bibnum) . ','; $j++; last if ($j == $results_per_page); } chop $pasarParams if ($pasarParams =~ /,$/); - $pasarParams .= '&total=' . int($total) if ($pasarParams !~ /total=(?:[0-9]+)?/); + $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); @@ -713,7 +780,6 @@ for (my $i=0;$i<@servers;$i++) { if ($query_desc || $limit_desc) { $template->param(searchdesc => 1); } - $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; $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 @@ -727,12 +793,12 @@ for (my $i=0;$i<@servers;$i++) { || C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - my $branchname; + my $branchcode; if ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) { - $branchname = $branches->{$branch}->{'branchname'}; + $branchcode = $branch; } elsif ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - $branchname = $branches->{ $ENV{'BRANCHCODE'} }->{'branchname'}; + $branchcode = $ENV{'BRANCHCODE'}; } foreach my $res ( @newresults ) { @@ -740,7 +806,7 @@ for (my $i=0;$i<@servers;$i++) { my @top_loop; my @old_loop = @{$res->{'available_items_loop'}}; foreach my $item ( @old_loop ) { - if ( $item->{'branchname'} eq $branchname ) { + if ( $item->{'branchcode'} eq $branchcode ) { $item->{'this_branch'} = 1; push( @top_loop, $item ); } else { @@ -766,6 +832,7 @@ for (my $i=0;$i<@servers;$i++) { my @page_numbers; # total number of pages there will be my $pages = ceil($hits / $results_per_page); + my $last_page_offset = ( $pages - 1 ) * $results_per_page; # default page number my $current_page_number = 1; if ($offset) { @@ -816,6 +883,7 @@ for (my $i=0;$i<@servers;$i++) { } $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; } @@ -825,7 +893,6 @@ 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; - $query_kw = Encode::decode_utf8($query_kw); my @query_kw=($query_kw=~ /([-\w]+\b)(?:[^,:]|$)/g); $query_kw=join('+',@query_kw); $nohits=~s/{QUERY_KW}/$query_kw/g; @@ -860,6 +927,15 @@ for (my $i=0;$i<@servers;$i++) { } #/end of the for loop #$template->param(FEDERATED_RESULTS => \@results_array); +for my $facet ( @$facets ) { + for my $entry ( @{ $facet->{facets} } ) { + my $index = $entry->{type_link_value}; + my $value = $entry->{facet_link_value}; + $entry->{active} = grep { $_->{input_value} eq qq{$index:$value} } @limit_inputs; + } +} + + $template->param( #classlist => $classlist, total => $total, @@ -875,19 +951,29 @@ if ($query_desc || $limit_desc) { } # VI. BUILD THE TEMPLATE -# Build drop-down list for 'Add To:' menu... -my ($totalref, $pubshelves, $barshelves)= - C4::VirtualShelves::GetSomeShelfNames($borrowernumber,'COMBO',1); +my $some_private_shelves = Koha::Virtualshelves->get_some_shelves( + { + borrowernumber => $borrowernumber, + add_allowed => 1, + category => 1, + } +); +my $some_public_shelves = Koha::Virtualshelves->get_some_shelves( + { + borrowernumber => $borrowernumber, + add_allowed => 1, + category => 2, + } +); + $template->param( - addbarshelves => $totalref->{bartotal}, - addbarshelvesloop => $barshelves, - addpubshelves => $totalref->{pubtotal}, - addpubshelvesloop => $pubshelves, - ); + add_to_some_private_shelves => $some_private_shelves, + 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 paramter to load Google's javascript in OPAC search screens +# 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); } @@ -899,5 +985,10 @@ $template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksRe $template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer'); $template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults'); +if ($offset == 0 && IsOverDriveEnabled()) { + $template->param(OverDriveEnabled => 1); + $template->param(OverDriveLibraryID => C4::Context->preference('OverDriveLibraryID')); +} + $template->param( borrowernumber => $borrowernumber); output_with_http_headers $cgi, $cookie, $template->output, $content_type;