[Koha-cvs] koha admin/systempreferences.pl catalogue/searc... [rel_3_0]

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	06/11/10 16:40:52

Modified files:
	admin          : systempreferences.pl 
	catalogue      : search.pl 

Log message:
	adding a system pref to display by default or not the expanded search options.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.34.2.6&r2=1.34.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6

Patches:
Index: admin/systempreferences.pl
===================================================================
RCS file: /sources/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.34.2.6
retrieving revision 1.34.2.7
diff -u -b -r1.34.2.6 -r1.34.2.7
--- admin/systempreferences.pl	1 Nov 2006 21:21:18 -0000	1.34.2.6
+++ admin/systempreferences.pl	10 Nov 2006 16:40:52 -0000	1.34.2.7
@@ -4,22 +4,6 @@
 #written 20/02/2002 by paul.poulain at free.fr
 # This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
 
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -37,6 +21,25 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+=head1 systempreferences.pl
+
+ALGO :
+ this script use an $op to know what to do.
+ if $op is empty or none of the above values,
+	- the default screen is build (with all records, or filtered datas).
+	- the   user can clic on add, modify or delete record.
+ if $op=add_form
+	- if primkey exists, this is a modification,so we read the $primkey record
+	- builds the add/modify form
+ if $op=add_validate
+	- the user has just send datas, so we create/modify the record
+ if $op=delete_form
+	- we show the record having primkey=$primkey and ask for deletion validation form
+ if $op=delete_confirm
+	- we delete the record having primkey=$primkey
+
+=cut
+
 use strict;
 use CGI;
 use C4::Auth;
@@ -88,6 +91,7 @@
     $tabsysprefs{z3950NormalizeAuthor}="Catalogue";
     $tabsysprefs{Stemming}="Catalogue";
     $tabsysprefs{WeightFields}="Catalogue";
+    $tabsysprefs{expandedSearchOption}="Catalogue";
 
 # Circulation
     $tabsysprefs{maxoutstanding}="Circulation";

Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- catalogue/search.pl	2 Nov 2006 11:07:46 -0000	1.1.2.5
+++ catalogue/search.pl	10 Nov 2006 16:40:52 -0000	1.1.2.6
@@ -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.5 2006/11/02 11:07:46 tipaul Exp $
+# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.6 2006/11/10 16:40:52 toins Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -306,7 +306,14 @@
 	my $outer_subtype_limits_loop = displaySubtypesLimit();
 	$template->param(outer_subtype_limits_loop => $outer_subtype_limits_loop,);
 
-    my $expanded_options = $cgi->param('expanded_options');
+	my $expanded_options;
+    if (C4::Context->preference("expandedSearchOption")){
+        $expanded_options = C4::Context->preference("expandedSearchOption");
+    }
+    else{
+        $expanded_options = $cgi->param('expanded_options');
+    }
+    
     $template->param(expanded_options => $expanded_options);
 
 	# load the sort_by options for the template
@@ -341,7 +348,7 @@
 @servers = split("\0",$params->{'server'}) if $params->{'server'};
 unless (@servers) {
 	#FIXME: this should be handled using Context.pm
-    @servers = ("biblioserver");
+    @servers = ("biblioserver","");
 	# @servers = C4::Context->config("biblioserver");
 }