From 7b0ee4d5949c2668b72ecc71742fcaf278c34f17 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Sun, 10 Jun 2012 13:14:24 +0200 Subject: [PATCH 1/1] Bug 5981 - OPAC: Add limits to search history Signed-off-by: Katrin Fischer Fixed a conflict in updatedatabase and removed kohaversion.pl from the patch. Patch works nicely, tested with different searches and limits. Note: Sort options don't get into the history still. --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ opac/opac-search.pl | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e1105a5..593c404 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1746,7 +1746,7 @@ CREATE TABLE IF NOT EXISTS `search_history` ( `userid` int(11) NOT NULL, `sessionid` varchar(32) NOT NULL, `query_desc` varchar(255) NOT NULL, - `query_cgi` varchar(255) NOT NULL, + `query_cgi` text NOT NULL, `total` int(11) NOT NULL, `time` timestamp NOT NULL default CURRENT_TIMESTAMP, KEY `userid` (`userid`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 4da22e7..9563de0 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5452,6 +5452,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.09.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE search_history MODIFY COLUMN query_cgi text NOT NULL"); + print "Upgrade to $DBversion done (Change search_history.query_cgi type to text. bug 5981)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 7eeebbd..404b48d 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -589,6 +589,12 @@ for (my $i=0;$i<@servers;$i++) { } # Adding the new search if needed + my $path_info = $cgi->url(-path_info=>1); + $query_cgi = $cgi->url(-query=>1); + $query_cgi =~ s/^$path_info\?//; + $query_cgi =~ s/;/&/g; + $query_desc .= ", $limit_desc"; + if (!$borrowernumber || $borrowernumber eq '') { # To a cookie (the user is not logged in) if (($params->{'offset'}||'') eq '') { -- 1.7.7.3