# Script to perform searching
# Mostly copied from search.pl, see POD there
use strict; # always use
+use warnings;
## STEP 1. Load things that are used in both search page and
# results page and decide which template to load, operations
# decide which template to use
my $template_name;
-my $template_type;
+my $template_type = 'basic';
my @params = $cgi->param("limit");
my $build_grouped_results = C4::Context->preference('OPACGroupResults');
-if ($cgi->param("format") =~ /(rss|atom|opensearchdescription)/) {
+if ($cgi->param("format") && $cgi->param("format") =~ /(rss|atom|opensearchdescription)/) {
$template_name = 'opac-opensearch.tmpl';
}
elsif ($build_grouped_results) {
}
);
-if ($cgi->param("format") eq 'rss2') {
+if ($cgi->param("format") && $cgi->param("format") eq 'rss2') {
$template->param("rss2" => 1);
}
-elsif ($cgi->param("format") eq 'atom') {
+elsif ($cgi->param("format") && $cgi->param("format") eq 'atom') {
$template->param("atom" => 1);
# FIXME - the timestamp is a hack - the biblio update timestamp should be used for each
# entry, but not sure if that's worth an extra database query for each bib
$template->param(timestamp => strftime("%Y-%m-%dT%H:%M:%S-00:00", gmtime));
}
-elsif ($cgi->param("format") eq 'opensearchdescription') {
+elsif ($cgi->param("format") && $cgi->param("format") eq 'opensearchdescription') {
$template->param("opensearchdescription" => 1);
}
if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
$template->param('UNIMARC' => 1);
}
+if (C4::Context->preference("marcflavour") eq "MARC21" ) {
+ $template->param('usmarc' => 1);
+}
if (C4::Context->preference('BakerTaylorEnabled')) {
$template->param(
#}
# load the branches
+my $mybranch = ( C4::Context->preference( 'SearchMyLibraryFirst' ) && C4::Context->userenv ) ? C4::Context->userenv->{branch} : '';
my $branches = GetBranches();
-my @branch_loop;
-
-for my $branch_hash (sort keys %$branches) {
- push @branch_loop, {value => "$branch_hash" , branchname => $branches->{$branch_hash}->{'branchname'}, };
-}
+# FIXME: next line duplicates GetBranchesLoop(0,0);
+my @branch_loop = map {
+ {
+ value => $_,
+ branchname => $branches->{$_}->{branchname},
+ selected => ( $mybranch eq $_ ) ? 1 : 0
+ }
+ } sort {
+ $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}
+ } keys %$branches;
my $categories = GetBranchCategories(undef,'searchdomain');
# $template->param(itypeloop=>\@itype_loop,);
# The following should only be loaded if we're bringing up the advanced search template
-if ( $template_type eq 'advsearch' ) {
+if ( $template_type && $template_type eq 'advsearch' ) {
# load the servers (used for searching -- to do federated searching, etc.)
my $primary_servers_loop;# = displayPrimaryServers();
my $secondary_servers_loop;# = displaySecondaryServers();
$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);
+
# 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: should be a syspref
+ my $search_boxes_count = C4::Context->preference("OPACAdvSearchInputCount") || 3; # FIXME: should be a syspref
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) {
search_boxes_loop => \@search_boxes_array);
# use the global setting by default
- if ( C4::Context->preference("expandedSearchOption") == 1) {
+ if ( C4::Context->preference("expandedSearchOption") ) {
$template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
}
# but let the user override it
- if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) {
+ if ( $cgi->param("expanded_options") && (($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 )) ) {
$template->param( expanded_options => $cgi->param('expanded_options'));
}
if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
@sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
-$sort_by[0] = $default_sort_by unless $sort_by[0];
+$sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
foreach my $sort (@sort_by) {
$template->param($sort => 1);
}
# indexes are query qualifiers, like 'title', 'author', etc. They
# can be single or multiple parameters separated by comma: kw,right-Truncation
-my @indexes = split("\0",$params->{'idx'});
+my @indexes;
+@indexes = split("\0",$params->{'idx'}) if $params->{'idx'};
# if a simple index (only one) display the index used in the top search box
if ($indexes[0] && !$indexes[1]) {
my @elements;
for my $this_cgi ( split('&',shift) ) {
next unless $this_cgi;
- $this_cgi =~ /(.*)=(.*)/;
+ $this_cgi =~ /(.*?)=(.*)/;
push @elements, { input_name => $1, input_value => $2 };
}
return @elements;
$template->param ( QUERY_INPUTS => \@query_inputs );
## parse the limit_cgi string and put it into a form suitable for <input>s
-my @limit_inputs = _input_cgi_parse($limit_cgi);
+my @limit_inputs = $limit_cgi ? _input_cgi_parse($limit_cgi) : ();
# add OPAC 'hidelostitems'
if (C4::Context->preference('hidelostitems') == 1) {
$template->param ( LIMIT_INPUTS => \@limit_inputs );
## II. DO THE SEARCH AND GET THE RESULTS
-my $total; # the total results for the whole set
+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) {
my $taglist = get_tags({term=>$tag, approved=>1});
my @sup_results_array;
for (my $i=0;$i<=@servers;$i++) {
my $server = $servers[$i];
- if ($server =~/biblioserver/) { # this is the local bibliographic server
+ if ($server && $server =~/biblioserver/) { # this is the local bibliographic server
$hits = $results_hashref->{$server}->{"hits"};
my $page = $cgi->param('page') || 0;
my @newresults;
}
}
foreach (@newresults) {
- my $clean = $_->{isbn} or next;
- unless (
- $clean =~ /\b(\d{13})\b/ or
- $clean =~ /\b(\d{10})\b/ or
- $clean =~ /\b(\d{9}X)\b/i
- ) {
- next;
- }
- $_ ->{'clean_isbn'} = $1;
+ $_->{coins} = GetCOinSBiblio($_->{'biblionumber'});
}
- $total = $total + $results_hashref->{$server}->{"hits"};
+
+ if ($results_hashref->{$server}->{"hits"}){
+ $total = $total + $results_hashref->{$server}->{"hits"};
+ }
## If there's just one result, redirect to the detail page
if ($total == 1) {
- my $biblionumber=@newresults[0]->{biblionumber};
+ my $biblionumber=$newresults[0]->{biblionumber};
if (C4::Context->preference('BiblioDefaultView') eq 'isbd') {
print $cgi->redirect("/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=$biblionumber");
} elsif (C4::Context->preference('BiblioDefaultView') eq 'marc') {
if ($hits) {
$template->param(total => $hits);
my $limit_cgi_not_availablity = $limit_cgi;
- $limit_cgi_not_availablity =~ s/&limit=available//g;
+ $limit_cgi_not_availablity =~ s/&limit=available//g if defined $limit_cgi_not_availablity;
$template->param(limit_cgi_not_availablity => $limit_cgi_not_availablity);
$template->param(limit_cgi => $limit_cgi);
$template->param(query_cgi => $query_cgi);
}
} # end of the if local
# asynchronously search the authority server
- elsif ($server =~/authorityserver/) { # this is the local authority server
+ elsif ($server && $server =~/authorityserver/) { # this is the local authority server
my @inner_sup_results_array;
for my $sup_record ( @{$results_hashref->{$server}->{"RECORDS"}} ) {
my $marc_record_object = MARC::Record->new_from_usmarc($sup_record);
}
# VI. BUILD THE TEMPLATE
-# NOTE: not using application/atom+xml or application/rss+xml beccause of Internet Explorer 6;
-# see bug 2078.
-my $content_type = $cgi->param('format') =~ /rss|atom/ ? "application/xml" :
- "text/html";
-
# Build drop-down list for 'Add To:' menu...
my $session = get_session($cgi->cookie("CGISESSID"));
my @addpubshelves;
push (@addpubshelves, $shelf);
}
-if (defined @addpubshelves) {
+if (@addpubshelves) {
$template->param( addpubshelves => scalar (@addpubshelves));
$template->param( addpubshelvesloop => \@addpubshelves);
}
$template->param( addbarshelvesloop => $barshelves);
}
-output_html_with_http_headers $cgi, $cookie, $template->output, $content_type;
+my $content_type;
+
+if ($cgi->param('format') && $cgi->param('format') =~ /rss/) {
+ $content_type = 'rss'
+} elsif ($cgi->param('format') && $cgi->param('format') =~ /atom/) {
+ $content_type = 'atom'
+} else {
+ $content_type = 'html'
+}
+
+# If GoogleIndicTransliteration system preference is On Set paramter to load Google's javascript in OPAC search screens
+if (C4::Context->preference('GoogleIndicTransliteration')) {
+ $template->param('GoogleIndicTransliteration' => 1);
+}
+
+output_with_http_headers $cgi, $cookie, $template->output, $content_type;
projects / koha.git / blobdiff