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

[Andrew Arensburger]

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

Modified Files:
      Tag: arensb-context
        search.pl 
Log Message:
Use C4::Connect instead of C4::Database, C4::Connect->dbh instead
C4Connect.
Removed old code for reading /etc/koha.conf.


Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** search.pl   20 Sep 2002 13:01:50 -0000      1.11
--- search.pl   4 Oct 2002 02:52:11 -0000       1.11.2.1
***************
*** 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');