}
use C4::Output;
-use C4::Auth qw(:DEFAULT get_session);
+use C4::Auth qw(:DEFAULT get_session ParseSearchHistorySession SetSearchHistorySession);
use C4::Languages qw(getAllLanguages);
use C4::Search;
use C4::Biblio; # GetBiblioData
use C4::Branch; # GetBranches
use C4::SocialData;
use C4::Ratings;
+use C4::External::OverDrive;
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");
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)
}
$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.)
}
# 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 = ParseSearchHistorySession($cgi);
# Adding the new search if needed
my $path_info = $cgi->url(-path_info=>1);
my $query_cgi_history = $cgi->url(-query=>1);
$query_cgi_history =~ s/^$path_info\?//;
$query_cgi_history =~ s/;/&/g;
- my $query_desc_history = "$query_desc, $limit_desc";
+ my $query_desc_history = join ", ", grep { defined $_ } $query_desc, $limit_desc;
if (!$borrowernumber || $borrowernumber eq '') {
- # To a cookie (the user is not logged in)
+ # To the session (the user is not logged in)
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
};
}
shift @recentSearches if (@recentSearches > 15);
- # 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 =>freeze(\@recentSearches),
- -expires => ''
- );
- $cookie = [$cookie, $newsearchcookie];
+ SetSearchHistorySession($cgi, \@recentSearches);
}
else {
- # To the session (the user is logged in)
+ # To the database (the user is logged in)
if (!$offset) {
AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc_history, $query_cgi_history, $total);
$template->param(ShowOpacRecentSearchLink => 1);
$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');
$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');
+if ($offset == 0 && IsOverDriveEnabled()) {
+ $template->param(OverDriveEnabled => 1);
+ $template->param(OverDriveLibraryID => C4::Context->preference('OverDriveLibraryID'));
+}
+
$template->param( borrowernumber => $borrowernumber);
output_with_http_headers $cgi, $cookie, $template->output, $content_type;