[Koha-patches] [PATCH] bug 5981 - Add limits to search history

[alex.arnaud at biblibre.com]

From: Alex Arnaud <alex.arnaud at biblibre.com>

---
 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 aef59ce..367551e 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1640,7 +1640,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 6b88c29..6aa3c55 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4446,6 +4446,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.05.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 9581)\n";
+    SetVersion($DBversion);
+}
+
 
 =head1 FUNCTIONS
 
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index dfe4d74..cab5270 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -509,6 +509,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)
  
-- 
1.7.0.4