}
use C4::Output;
-use C4::Auth qw(:DEFAULT get_session);
+use C4::Auth qw(:DEFAULT get_session ParseSearchHistoryCookie);
use C4::Languages qw(getAllLanguages);
use C4::Search;
use C4::Biblio; # GetBiblioData
use POSIX qw(ceil floor strftime);
use URI::Escape;
-use Storable qw(thaw freeze);
+use JSON qw/decode_json encode_json/;
use Business::ISBN;
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
use CGI qw('-no_undef_params');
my $cgi = new CGI;
+my $branch_group_limit = $cgi->param("branch_group_limit");
+if ( $branch_group_limit ) {
+ if ( $branch_group_limit =~ /^multibranchlimit-/ ) {
+ # For search groups we are going to convert this branch_group_limit CGI
+ # parameter into a multibranchlimit CGI parameter for the purposes of
+ # actually performing the query
+ $cgi->param(
+ -name => 'multibranchlimit',
+ -values => substr($branch_group_limit, 17)
+ );
+ } else {
+ $cgi->append(
+ -name => 'limit',
+ -values => [ $branch_group_limit ]
+ );
+ }
+}
+
BEGIN {
if (C4::Context->preference('BakerTaylorEnabled')) {
require C4::External::BakerTaylor;
}
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 $format = $cgi->param("format") || '';
my $build_grouped_results = C4::Context->preference('OPACGroupResults');
if ($format =~ /(rss|atom|opensearchdescription)/) {
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(undef,'searchdomain'),
+ searchdomainloop => GetBranchCategories('searchdomain'),
);
# load the language limits (for search)
-my $languages_limit_loop = getAllLanguages();
+my $languages_limit_loop = getAllLanguages($lang);
$template->param(search_languages_loop => $languages_limit_loop,);
# load the Type stuff
}
$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.)
$template->param( expanded_options => $cgi->param('expanded_options'));
}
}
+
+ if (C4::Context->preference('OPACNumbersPreferPhrase')) {
+ $template->param('numbersphr' => 1);
+ }
+
output_html_with_http_headers $cgi, $cookie, $template->output;
exit;
}
my $pasarParams = '';
my $j = 0;
for (keys %$params) {
- my @pasarParam = split("\0", $params->{$_});
+ my @pasarParam = $cgi->param($_);
for my $paramValue(@pasarParam) {
$pasarParams .= '&' if ($j > 0);
$pasarParams .= $_ . '=' . $paramValue;
}
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 = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
+@sort_by = $cgi->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 ) {
$template->param('sort_by' => $sort_by[0]);
# Use the servers defined, or just search our local catalog(default)
-my @servers;
-@servers = split("\0",$params->{'server'}) if $params->{'server'};
+my @servers = $cgi->param('server');
unless (@servers) {
#FIXME: this should be handled using Context.pm
@servers = ("biblioserver");
# operators include boolean and proximity operators and are used
# to evaluate multiple operands
-my @operators;
-@operators = split("\0",$params->{'op'}) if $params->{'op'};
+my @operators = $cgi->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;
-@indexes = split("\0",$params->{'idx'}) if $params->{'idx'};
+my @indexes = $cgi->param('idx');
+@indexes = map { uri_unescape($_) } @indexes;
# 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);
}
# an operand can be a single term, a phrase, or a complete ccl query
-my @operands;
-@operands = split("\0",$params->{'q'}) if $params->{'q'};
+my @operands = $cgi->param('q');
+@operands = map { uri_unescape($_) } @operands;
+
+$template->{VARS}->{querystring} = join(' ', @operands);
# if a simple search, display the value in the search box
if ($operands[0] && !$operands[1]) {
- $template->param(ms_value => $operands[0]);
+ my $ms_query = $operands[0];
+ $ms_query =~ s/ #\S+//;
+ $template->param(ms_value => $ms_query);
}
# limits are use to limit to results to a pre-defined category such as branch or language
-my @limits;
-@limits = split("\0",$params->{'limit'}) if $params->{'limit'};
+my @limits = $cgi->param('limit');
+@limits = map { uri_unescape($_) } @limits;
if($params->{'multibranchlimit'}) {
- push @limits, '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
+ my $multibranch = '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
+ push @limits, $multibranch if ($multibranch ne '()');
}
my $available;
my @results;
## I. BUILD THE QUERY
-my $lang = C4::Templates::getlanguage($cgi, 'opac');
( $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);
sub _input_cgi_parse {
#
# add OPAC suppression - requires at least one item indexed with Suppress
if (C4::Context->preference('OpacSuppression')) {
- $query = "($query) not Suppress=1";
+ # 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 );
$results_hashref->{biblioserver}->{RECORDS} = \@marclist;
# FIXME: tag search and standard search should work together, not exclusively
# FIXME: No facets for tags search.
-}
-elsif (C4::Context->preference('NoZebra')) {
- eval {
- ($error, $results_hashref, $facets) = NZgetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
- };
} 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);
$pasarParams .= '&simple_query=' . $simple_query;
$pasarParams .= '&query_type=' . $query_type if ($query_type);
eval {
- ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan);
+ ($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
$results_hashref->{$server}->{"RECORDS"});
}
- # must define a value for size if not present in DB
- # in order to avoid problems generated by the default size value in TT
- foreach my $line (@newresults) {
- if ( not exists $line->{'size'} ) { $line->{'size'} = "" }
+ foreach my $res (@newresults) {
+
+ # must define a value for size if not present in DB
+ # in order to avoid problems generated by the default size value in TT
+ if ( not exists $res->{'size'} ) { $res->{'size'} = "" }
# while we're checking each line, see if item is in the cart
- if ( grep {$_ eq $line->{'biblionumber'}} @cart_list) {
- $line->{'incart'} = 1;
+ if ( grep {$_ eq $res->{'biblionumber'}} @cart_list) {
+ $res->{'incart'} = 1;
}
- }
-
- my $tag_quantity;
- if (C4::Context->preference('TagsEnabled') and
- $tag_quantity = C4::Context->preference('TagsShowOnList')) {
- foreach (@newresults) {
- my $bibnum = $_->{biblionumber} or next;
- $_->{itemsissued} = CountItemsIssued( $bibnum );
- $_ ->{'TagLoop'} = get_tags({biblionumber=>$bibnum, approved=>1, 'sort'=>'-weight',
- limit=>$tag_quantity });
+ if (C4::Context->preference('COinSinOPACResults')) {
+ my $record = GetMarcBiblio($res->{'biblionumber'});
+ $res->{coins} = GetCOinSBiblio($record);
}
- }
-
- if (C4::Context->preference('COinSinOPACResults')) {
- foreach (@newresults) {
- my $record = GetMarcBiblio($_->{'biblionumber'});
- $_->{coins} = GetCOinSBiblio($record);
- if ( C4::Context->preference( "Babeltheque" ) and $_->{normalized_isbn} ) {
- my $isbn = Business::ISBN->new( $_->{normalized_isbn} );
- next if not $isbn;
+ if ( C4::Context->preference( "Babeltheque" ) and $res->{normalized_isbn} ) {
+ if( my $isbn = Business::ISBN->new( $res->{normalized_isbn} ) ) {
$isbn = $isbn->as_isbn13->as_string;
$isbn =~ s/-//g;
my $social_datas = C4::SocialData::get_data( $isbn );
- next if not $social_datas;
- for my $key ( keys %$social_datas ) {
- $_->{$key} = $$social_datas{$key};
- if ( $key eq 'score_avg' ){
- $_->{score_int} = sprintf("%.0f", $$social_datas{score_avg} );
+ if ( $social_datas ) {
+ for my $key ( keys %$social_datas ) {
+ $res->{$key} = $$social_datas{$key};
+ if ( $key eq 'score_avg' ){
+ $res->{score_int} = sprintf("%.0f", $$social_datas{score_avg} );
+ }
}
}
}
}
- }
+ if (C4::Context->preference('TagsEnabled') and
+ C4::Context->preference('TagsShowOnList')) {
+ if ( my $bibnum = $res->{biblionumber} ) {
+ $res->{itemsissued} = CountItemsIssued( $bibnum );
+ $res->{'TagLoop'} = get_tags({
+ biblionumber => $bibnum,
+ approved => 1,
+ sort => '-weight',
+ limit => C4::Context->preference('TagsShowOnList')
+ });
+ }
+ }
- if ( C4::Context->preference('OpacStarRatings') eq 'all' ) {
- foreach my $res (@newresults) {
+ 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'};
# 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 (thaw($searchcookie)) {
- @recentSearches = @{thaw($searchcookie)};
- }
- }
+ my @recentSearches = ParseSearchHistoryCookie($cgi);
# Adding the new search if needed
my $path_info = $cgi->url(-path_info=>1);
if (!$borrowernumber || $borrowernumber eq '') {
# To a cookie (the user is not logged in)
- if (($params->{'offset'}||'') eq '') {
+ if (!$offset) {
push @recentSearches, {
- "query_desc" => $query_desc_history || "unknown",
- "query_cgi" => $query_cgi_history || "unknown",
+ "query_desc" => Encode::decode_utf8($query_desc_history) || "unknown",
+ "query_cgi" => Encode::decode_utf8($query_cgi_history) || "unknown",
"time" => time(),
"total" => $total
};
# Pushing the cookie back
$newsearchcookie = $cgi->cookie(
-name => 'KohaOpacRecentSearches',
- # We uri_escape the whole freezed structure so we're sure we won't have any encoding problems
- -value => uri_escape(freeze(\@recentSearches)),
+ # 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 (($params->{'offset'}||'') eq '') {
+ if (!$offset) {
AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc_history, $query_cgi_history, $total);
$template->param(ShowOpacRecentSearchLink => 1);
}
exit;
}
if ($hits) {
- if (!C4::Context->preference('NoZebra') && !$build_grouped_results) {
+ 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;
$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 $branchname;
+ if ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) {
+ $branchname = $branches->{$branch}->{'branchname'};
+ }
+ elsif ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) {
+ $branchname = $branches->{ $ENV{'BRANCHCODE'} }->{'branchname'};
+ }
+
+ foreach my $res ( @newresults ) {
+ my @new_loop;
+ my @top_loop;
+ my @old_loop = @{$res->{'available_items_loop'}};
+ foreach my $item ( @old_loop ) {
+ if ( $item->{'branchname'} eq $branchname ) {
+ $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;
+ }
+ }
+ }
+
$template->param(
SEARCH_RESULTS => \@newresults,
- OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay") eq "itemdetails"?1:0),
+ OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay")),
suppress_result_number => $hide,
);
if (C4::Context->preference("OPACLocalCoverImages")){
}
# no hits
else {
+ my $nohits = C4::Context->preference('OPACNoResultsFound');
+ 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;
+ $template->param('OPACNoResultsFound' =>$nohits);
+ }
$template->param(
searchdesc => 1,
query_desc => $query_desc,
$template->param('GoogleIndicTransliteration' => 1);
}
+$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');
+
$template->param( borrowernumber => $borrowernumber);
output_with_http_headers $cgi, $cookie, $template->output, $content_type;
projects / koha.git / blobdiff