# 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.)
my $primary_servers_loop;# = displayPrimaryServers();
$template->param(outer_servers_loop => $primary_servers_loop,);
$template->param(outer_sup_servers_loop => $secondary_servers_loop,);
# set the default sorting
- my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder')
- if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
- $template->param($default_sort_by => 1);
+ if ( C4::Context->preference('OPACdefaultSortField')
+ && C4::Context->preference('OPACdefaultSortOrder') ) {
+ my $default_sort_by =
+ C4::Context->preference('OPACdefaultSortField') . '_'
+ . C4::Context->preference('OPACdefaultSortOrder');
+ $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 = C4::Context->preference("OPACAdvSearchInputCount") || 3;
+ my $search_boxes_count = 3; # begin whith 3 boxes
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) {
my $tag;
$tag = $params->{tag} if $params->{tag};
+
+# String with params with the search criteria for the paging in opac-detail
+my $pasarParams = '';
+my $j = 0;
+for (keys %$params) {
+ my @pasarParam = split("\0", $params->{$_});
+ for my $paramValue(@pasarParam) {
+ $pasarParams .= '&' if ($j > 0);
+ $pasarParams .= $_ . '=' . $paramValue;
+ $j++;
+ }
+}
+#
+
+
# Params that can have more than one value
# sort by is used to sort the query
# in theory can have more than one but generally there's just one
my @sort_by;
-my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder')
- if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
+my $default_sort_by;
+if ( C4::Context->preference('OPACdefaultSortField')
+ && C4::Context->preference('OPACdefaultSortOrder') ) {
+ $default_sort_by =
+ C4::Context->preference('OPACdefaultSortField') . '_'
+ . C4::Context->preference('OPACdefaultSortOrder');
+}
+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[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
foreach my $sort (@sort_by) {
- $template->param($sort => 1); # FIXME: security hole. can set any TMPL_VAR here
+ if ( $sort ~~ @allowed_sortby ) {
+ $template->param($sort => 1);
+ }
}
$template->param('sort_by' => $sort_by[0]);
my @results;
## I. BUILD THE QUERY
-my $lang = C4::Output::getlanguagecookie($cgi);
+my $lang = C4::Templates::getlanguagecookie($cgi);
( $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 ($) {
}
$template->param ( LIMIT_INPUTS => \@limit_inputs );
+$template->param ( OPACResultsSidebar => C4::Context->preference('OPACResultsSidebar'));
## II. DO THE SEARCH AND GET THE RESULTS
my $total = 0; # the total results for the whole set
($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$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);
eval {
($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
};
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;
}
# use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref);
}
if (C4::Context->preference('COinSinOPACResults')) {
foreach (@newresults) {
- $_->{coins} = GetCOinSBiblio($_->{'biblionumber'});
+ my $record = GetMarcBiblio($_->{'biblionumber'});
+ $_->{coins} = GetCOinSBiblio($record);
}
}
exit;
}
if ($hits) {
+ if (!C4::Context->preference('NoZebra') && !$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 .= $bibnum . ',';
+ $j++;
+ last if ($j == $results_per_page);
+ }
+ chop $pasarParams if ($pasarParams =~ /,$/);
+ $pasarParams .= '&total=' . 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;
$limit_cgi_not_availablity =~ s/&limit=available//g if defined $limit_cgi_not_availablity;
my $pages = ceil($hits / $results_per_page);
# default page number
my $current_page_number = 1;
- $current_page_number = ($offset / $results_per_page + 1) if $offset;
- my $previous_page_offset = $offset - $results_per_page unless ($offset - $results_per_page <0);
+ 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;
my $this_offset = (($i*$results_per_page)-$results_per_page);
# the page number for this page
my $this_page_number = $i;
- # it should only be highlighted if it's the current page
- my $highlight = 1 if ($this_page_number == $current_page_number);
# put it in the array
- push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ",@sort_by };
-
+ push @page_numbers,
+ { offset => $this_offset,
+ pg => $this_page_number,
+ highlight => $this_page_number == $current_page_number,
+ sort_by => join ' ', @sort_by
+ };
+
}
}
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;
- my $highlight = 1 if ($this_page_number == $current_page_number);
- if ($this_page_number <= $pages) {
- push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ",@sort_by };
+ 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
+ };
}
}