From b0d735a0a6d29838de2a4116e6a8b92d0affc7f6 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Sun, 8 Jul 2012 06:15:36 +1200
Subject: [PATCH] Revert "Bug 5981 - OPAC: Add limits to search history"

This reverts commit 08994647f70deac85ca527b09ea21213c625b73f.

Conflicts:

	installer/data/mysql/updatedatabase.pl
---
 installer/data/mysql/kohastructure.sql | 2 +-
 installer/data/mysql/updatedatabase.pl | 7 -------
 kohaversion.pl                         | 2 +-
 opac/opac-search.pl                    | 6 ------
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 17eb27cba6..488a4f0bd3 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1742,7 +1742,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` text NOT NULL,
+  `query_cgi` varchar(255) 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 16bdef08c9..7f7722b9dc 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5243,13 +5243,6 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
-$DBversion = "3.08.02.001";
-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/kohaversion.pl b/kohaversion.pl
index aaea7e8b62..5e74f3c7a8 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.08.02.001';
+    our $VERSION = '3.08.01.002';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 0e74d39f29..5f3ad8608c 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -589,12 +589,6 @@ 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 '') {
-- 
2.20.1