[Koha-cvs] CVS: koha/html-template search.pl,1.17,1.18

[Andrew Arensburger]

Update of /cvsroot/koha/koha/html-template
In directory usw-pr-cvs1:/tmp/cvs-serv27577/html-template

Modified Files:
        search.pl 
Log Message:
Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.


Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/search.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** search.pl   14 Aug 2002 18:12:53 -0000      1.17
--- search.pl   5 Oct 2002 10:04:32 -0000       1.18
***************
*** 18,25 ****
  # Suite 330, Boston, MA  02111-1307 USA
  
  use HTML::Template;
  use strict;
! require Exporter;
! use C4::Database;
  use CGI;
  use C4::Search;
--- 18,28 ----
  # Suite 330, Boston, MA  02111-1307 USA
  
+ # FIXME - This file is nearly identical to "../search.pl". One of them
+ # should be nuked.
+ 
  use HTML::Template;
  use strict;
! require Exporter;     # FIXME - Is this really needed?
! use C4::Context;
  use CGI;
  use C4::Search;
***************
*** 28,58 ****
  my $query=new CGI;
  
! 
! my $language='french';
! 
! 
! my %configfile;
! open (KC, "/etc/koha.conf");
! while (<KC>) {
!  chomp;
!  (next) if (/^\s*#/);
!  if (/(.*)\s*=\s*(.*)/) {
!    my $variable=$1;
!    my $value=$2;
!    # Clean up white space at beginning and end
!    $variable=~s/^\s*//g;
!    $variable=~s/\s*$//g;
!    $value=~s/^\s*//g;
!    $value=~s/\s*$//g;
!    $configfile{$variable}=$value;
!  }
! }
! #print $query->header;
! 
! my $includes=$configfile{'includes'};
! ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
  my $templatebase="catalogue/searchresults.tmpl";
! my $startfrom=$query->param('startfrom');
! ($startfrom) || ($startfrom=0);
  my $theme=picktemplate($includes, $templatebase);
  
--- 31,38 ----
  my $query=new CGI;
  
! my $includes = C4::Context->config('includes') ||
!       "/usr/local/www/hdl/htdocs/includes";
  my $templatebase="catalogue/searchresults.tmpl";
! my $startfrom=$query->param('startfrom') || 0;
  my $theme=picktemplate($includes, $templatebase);
  
***************
*** 71,74 ****
--- 51,57 ----
  # get all the search variables
  # we assume that C4::Search will validate these values for us
+ # FIXME - This looks like it could go inside a
+ #     foreach my $term (qw(keyword subject author ...))
+ # loop.
  my %search;
  my $keyword=$query->param('keyword');
***************
*** 89,93 ****
  $search{'class'}=$class;
  my $dewey=$query->param('dewey');
! $search{'dewey'};
  my $branch=$query->param('branch');
  $search{'branch'}=$branch;
--- 72,76 ----
  $search{'class'}=$class;
  my $dewey=$query->param('dewey');
! $search{'dewey'};     # FIXME - Was this supposed to be $search{'dewey'} = 
$dewey ?
  my $branch=$query->param('branch');
  $search{'branch'}=$branch;