[Koha-cvs] CVS: koha/acqui.simple marcimport.pl,1.14,1.15

[Steve Tonnesen]

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv13867/acqui.simple

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


Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** marcimport.pl       5 Oct 2002 09:56:14 -0000       1.14
--- marcimport.pl       9 Oct 2002 18:09:16 -0000       1.15
***************
*** 179,185 ****
        $oldkoha=MARCmarc2koha($dbh,$record);
      }
!     my $templatebase="marcimport/marcimportdetail.tmpl";
!     my $theme=picktemplate($includes, $templatebase);
!     my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
      $oldkoha->{additionalauthors} =~ s/ \| /\n/g;
      $oldkoha =~ s/\|/\n/g;
--- 179,183 ----
        $oldkoha=MARCmarc2koha($dbh,$record);
      }
!     my $template=gettemplate('marcimport/marcimportdetail.tmpl";
      $oldkoha->{additionalauthors} =~ s/ \| /\n/g;
      $oldkoha =~ s/\|/\n/g;
***************
*** 248,254 ****
      requireDBI($dbh,"ListFileRecords");
  
!     my $templatebase="marcimport/ListFileRecords.tmpl";
!     my $theme=picktemplate($includes, $templatebase);
!     my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
  
      # File can be z3950 search query or uploaded MARC data
--- 246,250 ----
      requireDBI($dbh,"ListFileRecords");
  
!     my $template=gettemplate('marcimport/ListFileRecords.tmpl";
  
      # File can be z3950 search query or uploaded MARC data
***************
*** 579,585 ****
      requireDBI($dbh,"uploadmarc");
  
!     my $templatebase="marcimport/uploadmarc.tmpl";
!     my $theme=picktemplate($includes, $templatebase);
!     my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
      $template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'});
  #    print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n";
--- 575,579 ----
      requireDBI($dbh,"uploadmarc");
  
!     my $template=gettemplate('marcimport/uploadmarc.tmpl";
      $template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'});
  #    print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n";
***************
*** 605,611 ****
  
  sub mainmenu {
!       my $templatebase="marcimport/mainmenu.tmpl";
!       my $theme=picktemplate($includes, $templatebase);
!       my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
        $template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'});
        print "Content-Type: text/html\n\n", $template->output;
--- 599,603 ----
  
  sub mainmenu {
!       my $template=gettemplate('marcimport/mainmenu.tmpl";
        $template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'});
        print "Content-Type: text/html\n\n", $template->output;
***************
*** 746,752 ****
        print "Error in marcimport.pl/Acceptbiblioitem : numrecord not defined 
: contact administrator\n";
      }
!     my $templatebase="marcimport/AcceptBiblioitem.tmpl";
!     my $theme=picktemplate($includes, $templatebase);
!     my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
  
      my $oldkoha = MARCmarc2koha($dbh,$record);
--- 738,742 ----
        print "Error in marcimport.pl/Acceptbiblioitem : numrecord not defined 
: contact administrator\n";
      }
!     my $template=gettemplate('marcimport/AcceptBiblioitem.tmpl";
  
      my $oldkoha = MARCmarc2koha($dbh,$record);
***************
*** 852,858 ****
      my ( $dbh, $input )address@hidden;
  
!     my $templatebase="marcimport/AcceptItemCopy.tmpl";
!     my $theme=picktemplate($includes, $templatebase);
!     my $template = HTML::Template->new(filename => 
"$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => 
[$includes]);
  
      my $error;
--- 842,846 ----
      my ( $dbh, $input )address@hidden;
  
!     my $template=gettemplate('marcimport/AcceptItemCopy.tmpl";
  
      my $error;
***************
*** 994,997 ****
--- 982,988 ----
  #---------------
  # $Log$
+ # Revision 1.15  2002/10/09 18:09:16  tonnesen
+ # switched from picktemplate() to gettemplate()
+ #
  # Revision 1.14  2002/10/05 09:56:14  arensb
  # Merged with arensb-context branch: use C4::Context->dbh instead of