[Koha-cvs] CVS: koha/C4 Output.pm,1.19,1.20

[Andrew Arensburger]

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

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


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** Output.pm   2 Oct 2002 16:26:15 -0000       1.19
--- Output.pm   5 Oct 2002 09:51:54 -0000       1.20
***************
*** 26,29 ****
--- 26,30 ----
  require Exporter;
  
+ use C4::Context;
  use C4::Database;
  use C4::Search; #for getting the systempreferences
***************
*** 93,107 ****
  # the functions below that use them.
  
! #
! # Change this value to reflect where you will store your includes
! #
! # FIXME - Since this is used in several places, it ought to be put
! # into a separate file. Better yet, put "use C4::Config;" inside the
! # &import method of any package that requires the config file.
! 
! my $configfile=configfile();
! 
! my $path=$configfile->{'includes'};
! ($path) || ($path="/usr/local/www/hdl/htdocs/includes");
  
  
#---------------------------------------------------------------------------------------------------------
--- 94,99 ----
  # the functions below that use them.
  
! my $path = C4::Context->config('includes') ||
!       "/usr/local/www/hdl/htdocs/includes";
  
  
#---------------------------------------------------------------------------------------------------------
***************
*** 259,263 ****
    #where to search for templates
    my @tmpldirs = ("$path/templates", $path);
!   unshift (@tmpldirs, $configfile->{'templatedirectory'}) if 
$configfile->{'templatedirectory'};
    unshift (@tmpldirs, $params{'path'}) if $params{'path'};
  
--- 251,255 ----
    #where to search for templates
    my @tmpldirs = ("$path/templates", $path);
!   unshift (@tmpldirs, C4::Context->config('templatedirectory')) if 
C4::Context->config('templatedirectory');
    unshift (@tmpldirs, $params{'path'}) if $params{'path'};