[Koha-cvs] CVS: koha/html-template detail.pl,1.4,1.5

[Andrew Arensburger]

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

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


Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/detail.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** detail.pl   14 Aug 2002 18:12:53 -0000      1.4
--- detail.pl   5 Oct 2002 10:04:17 -0000       1.5
***************
*** 20,25 ****
  use HTML::Template;
  use strict;
! require Exporter;
! use C4::Database;
  use C4::Output;  # contains picktemplate
  use CGI;
--- 20,25 ----
  use HTML::Template;
  use strict;
! require Exporter;             # FIXME - Is this really necessary?
! use C4::Context;
  use C4::Output;  # contains picktemplate
  use CGI;
***************
*** 28,52 ****
  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;
-  }
- }
- 
  my $biblionumber=$query->param('bib');
  my $type=$query->param('type');
--- 28,31 ----
***************
*** 78,83 ****
  my address@hidden;
  
! my $includes=$configfile{'includes'};
! ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
  my $templatebase="catalogue/detail.tmpl";
  my $startfrom=$query->param('startfrom');
--- 57,62 ----
  my address@hidden;
  
! my $includes = C4::Context->config('includes') ||
!       "/usr/local/www/hdl/htdocs/includes";
  my $templatebase="catalogue/detail.tmpl";
  my $startfrom=$query->param('startfrom');