if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
my %row =( number=>$cnt++,
- ccl => $itype_or_itemtype,
+ ccl => qq($itype_or_itemtype,phr),
code => $thisitemtype,
selected => $selected,
description => $itemtypes->{$thisitemtype}->{'description'},
$template->param(outer_sup_servers_loop => $secondary_servers_loop,);
# set the default sorting
- my $default_sort_by = C4::Context->preference('defaultSortField')."_".C4::Context->preference('defaultSortOrder')
- 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('defaultSortField') . '_'
+ . C4::Context->preference('defaultSortOrder');
+ $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; # FIXME: using OPAC sysprefs?
+ my $search_boxes_count = 3; # begin whith 3 boxes
# FIXME: all this junk can be done in TMPL using __first__ and __last__
for (my $i=1;$i<=$search_boxes_count;$i++) {
# if it's the first one, don't display boolean option, but show scan indexes
# 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('defaultSortField')."_".C4::Context->preference('defaultSortOrder')
- if (C4::Context->preference('defaultSortField') && C4::Context->preference('defaultSortOrder'));
+my $default_sort_by;
+if ( C4::Context->preference('defaultSortField')
+ && C4::Context->preference('defaultSortOrder') ) {
+ $default_sort_by =
+ C4::Context->preference('defaultSortField') . '_'
+ . C4::Context->preference('defaultSortOrder');
+}
@sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
$sort_by[0] = $default_sort_by unless $sort_by[0];
foreach my $sort (@sort_by) {
- $template->param($sort => 1);
+ $template->param($sort => 1) if $sort;
}
$template->param('sort_by' => $sort_by[0]);
# if a simple index (only one) display the index used in the top search box
if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
- $template->param("ms_".$indexes[0] => 1);}
+ my $idx = "ms_".$indexes[0];
+ $idx =~ s/\,/comma/g; # template toolkit doesnt like variables with a , in it
+ $template->param($idx => 1);
+}
# an operand can be a single term, a phrase, or a complete ccl query
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,$scan,$lang);
## parse the query_cgi string and put it into a form suitable for <input>s
for my $this_cgi ( split('&',$query_cgi) ) {
next unless $this_cgi;
- $this_cgi =~ m/(.?)=(.*)/;
+ $this_cgi =~ m/(.*?)=(.*)/;
my $input_name = $1;
my $input_value = $2;
push @query_inputs, { input_name => $input_name, input_value => $input_value };
# 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);
+ 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,
+ # it should only be highlighted if it's the current page
+ highlight => $this_page_number == $current_page_number,
+ sort_by => join ' ', @sort_by
+ };
}
for (my $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
+ };
}
}
}
my ($pubshelves, $total) = GetRecentShelves(2, $row_count, undef);
my ($barshelves, $total) = GetRecentShelves(1, $row_count, $borrowernumber);
-my @pubshelves = @{$pubshelves};
-my @barshelves = @{$barshelves};
-
-if (@pubshelves) {
- $template->param( addpubshelves => scalar (@pubshelves));
- $template->param( addpubshelvesloop => @pubshelves);
+if (@{$pubshelves}) {
+ $template->param( addpubshelves => scalar @{$pubshelves});
+ $template->param( addpubshelvesloop => $pubshelves);
}
-if (@barshelves) {
- $template->param( addbarshelves => scalar (@barshelves));
- $template->param( addbarshelvesloop => @barshelves);
+if (@{$barshelves}) {
+ $template->param( addbarshelves => scalar @{$barshelves});
+ $template->param( addbarshelvesloop => $barshelves);
}