[Koha-cvs] koha catalogue/search.pl koha-tmpl/intranet-tmp... [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Tue Dec 19 11:49:21 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/19 10:49:21
Modified files:
catalogue : search.pl
koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl
updater : updatedatabase
Log message:
fix a minor bug in syspref "expandedSearchOption" and adding it on updatedatabase.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.11&r2=1.1.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.11&r2=1.1.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_3_0&r1=1.157.2.36&r2=1.157.2.37
Patches:
Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- catalogue/search.pl 15 Dec 2006 08:40:29 -0000 1.1.2.11
+++ catalogue/search.pl 19 Dec 2006 10:49:21 -0000 1.1.2.12
@@ -2,7 +2,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.11 2006/12/15 08:40:29 toins Exp $
+# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.12 2006/12/19 10:49:21 toins Exp $
#
# Copyright 2006 LibLime
#
@@ -308,13 +308,13 @@
$template->param(outer_subtype_limits_loop => $outer_subtype_limits_loop,);
my $expanded_options;
- if (C4::Context->preference("expandedSearchOption")){
+ if (not defined $cgi->param('expanded_options')){
$expanded_options = C4::Context->preference("expandedSearchOption");
}
- else{
+ else {
$expanded_options = $cgi->param('expanded_options');
}
-
+ warn "expanded option = " . $expanded_options;
$template->param(expanded_options => $expanded_options);
# load the sort_by options for the template
@@ -322,7 +322,6 @@
my $sort_by_loop = displaySortby($sort_by);
$template->param(sort_by_loop => $sort_by_loop);
- #warn "loading the template";
output_html_with_http_headers $cgi, $cookie, $template->output;
exit;
}
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/advsearch.tmpl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl 8 Dec 2006 10:16:53 -0000 1.1.2.11
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl 19 Dec 2006 10:49:21 -0000 1.1.2.12
@@ -434,11 +434,11 @@
<!-- SEARCH BUTTONS -->
<p><input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search"/>
<!-- TMPL_IF NAME="expanded_options" -->
- <a href="search.pl">[Fewer Options]</a>
+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer Options]</a>
<!-- TMPL_ELSE -->
- <a href="search.pl?expanded_options=1">[More options]</a>
+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
<!-- /TMPL_IF -->
- <a href="search.pl?do=Clear">[New Search]</a>
+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New Search]</a>
</p>
<!-- /SEARCH BUTTONS -->
</div>
Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.157.2.36
retrieving revision 1.157.2.37
diff -u -b -r1.157.2.36 -r1.157.2.37
--- updater/updatedatabase 13 Dec 2006 19:48:09 -0000 1.157.2.36
+++ updater/updatedatabase 19 Dec 2006 10:49:21 -0000 1.157.2.37
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: updatedatabase,v 1.157.2.36 2006/12/13 19:48:09 hdl Exp $
+# $Id: updatedatabase,v 1.157.2.37 2006/12/19 10:49:21 toins Exp $
# Database Updater
# This script checks for required updates to the database.
@@ -378,24 +378,24 @@
},
{
uniquefieldrequired => 'variable',
- variable => 'AutoLocation',
+ variable => 'serialsadditems',
value => '0',
- forceupdate => { 'explanation' => 1,
- 'type' => 1},
- explanation => 'switch to activate or not Autolocation, if Yes, the Librarian can\'t change his location, it\'s defined by branchip',
+ forceupdate => {
+ 'explanation' => 1,
+ 'type' => 1
+ },
+ explanation => 'If set, a new item will be automatically added when receiving an issue',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
- variable => 'serialsadditems',
+ variable => 'expandedSearchOption',
value => '0',
forceupdate => {
'explanation' => 1,
- '
- type' => 1
+ 'type' => 1
},
- explanation =>
-'If set, a new item will be automatically added when receiving an issue',
+ explanation => 'search among marc field',
type => 'YesNo',
},
],
@@ -1525,7 +1525,6 @@
# $null = 'YES' if $row->{null} eq 'NULL';
my $key = $row->{key};
my $default = $row->{default};
- my $null = $row->{null};
# $default="''" unless $default;
my $extra = $row->{extra};
my $def = $definitions->{$field};
@@ -1798,7 +1797,6 @@
#
$sth = $dbh->prepare("show columns from biblioitems");
$sth->execute();
-my $definitions;
my $marcdone=0;
while ( ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow ){
$marcdone=1 if ($type eq 'longtext' && $column eq 'marcxml') ;
@@ -2029,6 +2027,9 @@
exit;
# $Log: updatedatabase,v $
+# Revision 1.157.2.37 2006/12/19 10:49:21 toins
+# fix a minor bug in syspref "expandedSearchOption" and adding it on updatedatabase.
+#
# Revision 1.157.2.36 2006/12/13 19:48:09 hdl
# Adding claimdate to serials.
# (Needed to record claimdate
More information about the Koha-cvs
mailing list