[Koha-cvs] CVS: koha search.pl,1.11,1.12

[Andrew Arensburger]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19827

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/search.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** search.pl   20 Sep 2002 13:01:50 -0000      1.11
--- search.pl   5 Oct 2002 09:46:35 -0000       1.12
***************
*** 23,27 ****
  use strict;
  require Exporter;
- use C4::Database;
  use CGI;
  use C4::Search;
--- 23,26 ----
***************
*** 30,57 ****
  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');
--- 29,34 ----
  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');
***************
*** 73,76 ****
--- 50,57 ----
  # get all the search variables
  # we assume that C4::Search will validate these values for us
+ # FIXME - This whole section, up to the &catalogsearch call, is crying
+ # out for
+ #     foreach $search_term (qw(keyword subject author ...))
+ #     { ... }
  my %search;
  my $keyword=$query->param('keyword');
***************
*** 91,95 ****
  $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 - This should be $search{'dewey'} = 
$dewey, right?
  my $branch=$query->param('branch');
  $search{'branch'}=$branch;