[Koha-cvs] CVS: koha/search.marc search.pl,1.28,1.29

[Paul POULAIN]

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29373/search.marc

Modified Files:
	search.pl 
Log Message:
big commit, still breaking things...

* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/search.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** search.pl	5 Oct 2005 16:19:21 -0000	1.28
--- search.pl	26 Oct 2005 09:13:37 -0000	1.29
***************
*** 25,29 ****
  use HTML::Template;
  use C4::Context;
! use C4::Search;
  use C4::Auth;
  use C4::Output;
--- 25,29 ----
  use HTML::Template;
  use C4::Context;
! # use C4::Search;
  use C4::Auth;
  use C4::Output;
***************
*** 93,97 ****
  my $query=new CGI;
  my $type=$query->param('type');
! my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
  
--- 93,97 ----
  my $query=new CGI;
  my $type=$query->param('type');
! my $op = $query->param('op') || "";
  my $dbh = C4::Context->dbh;
  
***************
*** 365,368 ****
--- 365,369 ----
  
  
+ 	$template->param('Disable_Dictionary'=>C4::Context->preference("Disable_Dictionary")) if (C4::Context->preference("Disable_Dictionary"));
  	$template->param("statements" => \@statements,
  			"nbstatements" => 3,