use C4::Biblio; # GetBiblioData
use C4::Koha;
use C4::Tags qw(get_tags);
-use POSIX qw(ceil floor strftime);
use C4::Branch; # GetBranches
+use POSIX qw(ceil floor strftime);
+use URI::Escape;
+use Storable qw(thaw freeze);
# create a new CGI object
# FIXME: no_undef_params needs to be tested
elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
$template->param('usmarc' => 1);
}
+$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
if (C4::Context->preference('BakerTaylorEnabled')) {
$template->param(
push @itemtypesloop, \%row;
}
} else {
- my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
+ my $advsearchtypes = GetAuthorisedValues($advanced_search_types, '', 'opac');
for my $thisitemtype (@$advsearchtypes) {
my %row =(
number=>$cnt++,
my $primary_servers_loop;# = displayPrimaryServers();
$template->param(outer_servers_loop => $primary_servers_loop,);
- my $secondary_servers_loop;# = displaySecondaryServers();
+ my $secondary_servers_loop;
$template->param(outer_sup_servers_loop => $secondary_servers_loop,);
# set the default sorting
search_boxes_loop => \@search_boxes_array);
# use the global setting by default
- if ( C4::Context->preference("expandedSearchOption") ) {
+ if ( C4::Context->preference("expandedSearchOption") == 1 ) {
$template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
}
# but let the user override it
- if ( $cgi->param("expanded_options") && (($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 )) ) {
- $template->param( expanded_options => $cgi->param('expanded_options'));
- }
-
+ 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'));
+ }
+ }
output_html_with_http_headers $cgi, $cookie, $template->output;
exit;
}
my @results;
## 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);
+my $lang = C4::Output::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 ($) {
my @elements;
my @coins;
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);
$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 ($results_hashref->{$server}->{"hits"}){
$total = $total + $results_hashref->{$server}->{"hits"};
}
- ## If there's just one result, redirect to the detail page
+ # 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)};
+ }
+ }
+
+ # Adding the new search if needed
+ if ($borrowernumber eq '') {
+ # To a cookie (the user is not logged in)
+
+ if ($params->{'offset'} eq '') {
+
+ push @recentSearches, {
+ "query_desc" => $query_desc || "unknown",
+ "query_cgi" => $query_cgi || "unknown",
+ "time" => time(),
+ "total" => $total
+ };
+ $template->param(ShowOpacRecentSearchLink => 1);
+ }
+
+ # 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)),
+ -expires => ''
+ );
+ $cookie = [$cookie, $newsearchcookie];
+ }
+ else {
+ # To the session (the user is logged in)
+ if ($params->{'offset'} eq '') {
+ AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc, $query_cgi, $total);
+ $template->param(ShowOpacRecentSearchLink => 1);
+ }
+ }
+ }
+ ## If there's just one result, redirect to the detail page
if ($total == 1) {
my $biblionumber=$newresults[0]->{biblionumber};
if (C4::Context->preference('BiblioDefaultView') eq 'isbd') {
$template->param(searchdesc => 1);
}
-## Now let's find out if we have any supplemental data to show the user
-# and in the meantime, save the current query for statistical purposes, etc.
-my $koha_spsuggest; # a flag to tell if we've got suggestions coming from Koha
-my @koha_spsuggest; # place we store the suggestions to be returned to the template as LOOP
-my $phrases = $query_desc;
-my $ipaddress;
-
-if ( C4::Context->preference("kohaspsuggest") ) {
- my ($suggest_host, $suggest_dbname, $suggest_user, $suggest_pwd) = split(':', C4::Context->preference("kohaspsuggest"));
- eval {
- my $koha_spsuggest_dbh;
- # FIXME: this needs to be moved to Context.pm
- eval {
- $koha_spsuggest_dbh=DBI->connect("DBI:mysql:$suggest_dbname:$suggest_host","$suggest_user","$suggest_pwd");
- };
- if ($@) {
- warn "can't connect to spsuggest db";
- }
- else {
- my $koha_spsuggest_insert = "INSERT INTO phrase_log(phr_phrase,phr_resultcount,phr_ip) VALUES(?,?,?)";
- my $koha_spsuggest_query = "SELECT display FROM distincts WHERE strcmp(soundex(suggestion), soundex(?)) = 0 order by soundex(suggestion) limit 0,5";
- my $koha_spsuggest_sth = $koha_spsuggest_dbh->prepare($koha_spsuggest_query);
- $koha_spsuggest_sth->execute($phrases);
- while (my $spsuggestion = $koha_spsuggest_sth->fetchrow_array) {
- $spsuggestion =~ s/(:|\/)//g;
- my %line;
- $line{spsuggestion} = $spsuggestion;
- push @koha_spsuggest,\%line;
- $koha_spsuggest = 1;
- }
-
- # Now save the current query
- $koha_spsuggest_sth=$koha_spsuggest_dbh->prepare($koha_spsuggest_insert);
- #$koha_spsuggest_sth->execute($phrases,$results_per_page,$ipaddress);
- $koha_spsuggest_sth->finish;
-
- $template->param( koha_spsuggest => $koha_spsuggest ) unless $hits;
- $template->param( SPELL_SUGGEST => \@koha_spsuggest,
- );
- }
- };
- if ($@) {
- warn "Kohaspsuggest failure:".$@;
- }
-}
-
# VI. BUILD THE TEMPLATE
# Build drop-down list for 'Add To:' menu...
my $session = get_session($cgi->cookie("CGISESSID"));
projects / koha_fer / blobdiff