gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 5981 - OPAC: Add limits to search history 

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
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.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Conflicts:

	installer/data/mysql/updatedatabase.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Alex Arnaud 2012-06-10 13:14:24 +02:00 committed by Chris Cormack
parent fc28be8ac3
commit 08994647f7
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/data/mysql/kohastructure.sql
View File

@ -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` varchar(255) NOT NULL,
`query_cgi` text NOT NULL,
`total` int(11) NOT NULL,
`time` timestamp NOT NULL default CURRENT_TIMESTAMP,
KEY `userid` (`userid`),

7
installer/data/mysql/updatedatabase.pl
View File

@ -5243,6 +5243,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)

6
opac/opac-search.pl
View File

@ -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 '') {