[Koha-cvs] CVS: koha/marc MARCdetail.pl,1.3,1.4

[Steve Tonnesen]

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

Modified Files:
        MARCdetail.pl 
Log Message:
switched from picktemplate() to gettemplate()


Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/MARCdetail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MARCdetail.pl       5 Oct 2002 10:06:07 -0000       1.3
--- MARCdetail.pl       9 Oct 2002 18:09:16 -0000       1.4
***************
*** 22,26 ****
  require Exporter;     # FIXME - Is this really necessary?
  use C4::Context;
! use C4::Output;  # contains picktemplate
  use CGI;
  use C4::Search;
--- 22,26 ----
  require Exporter;     # FIXME - Is this really necessary?
  use C4::Context;
! use C4::Output;  # contains gettemplate
  use CGI;
  use C4::Search;
***************
*** 36,44 ****
  #print STDERR "BIB : $biblionumber // TAG : $tag\n";
  if (! defined $biblionumber) {
!     my $includes = C4::Context->config('includes') ||
!       "/usr/local/www/hdl/htdocs/includes";
!     my $templatebase="MARCdetailbiblioselect.tmpl";
!     my $theme=picktemplate($includes, $templatebase);
!     my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
      print "Content-Type: text/html\n\n", $template->output;
  
--- 36,40 ----
  #print STDERR "BIB : $biblionumber // TAG : $tag\n";
  if (! defined $biblionumber) {
!     my $template = gettemplate("MARCdetailbiblioselect.tmpl");
      print "Content-Type: text/html\n\n", $template->output;
  
***************
*** 53,61 ****
      my $record =MARCgetbiblio($dbh,$biblionumber);
  # open template
!     my $templatebase="catalogue/MARCdetail.tmpl";
!     my $includes = C4::Context->config('includes') ||
!       "/usr/local/www/hdl/htdocs/includes";
!     my $theme=picktemplate($includes, $templatebase);
!     my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
  # fill arrays
      my @loop_data =();
--- 49,53 ----
      my $record =MARCgetbiblio($dbh,$biblionumber);
  # open template
!     my $template = gettemplate("MARCdetail.tmpl");
  # fill arrays
      my @loop_data =();