[Koha-cvs] CVS: koha/acqui.simple marcimport.pl,1.23,1.24

[Paul POULAIN]

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

Modified Files:
	marcimport.pl 
Log Message:
bugfix : use gettemplate_and_user instead of gettemplate.
fix a blank screen in 1.3.3 in "import in breeding farm"

Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** marcimport.pl	6 Jan 2003 13:06:28 -0000	1.23
--- marcimport.pl	14 Jan 2003 16:41:17 -0000	1.24
***************
*** 36,48 ****
  # Koha modules used
  use C4::Context;
- #use C4::Database;
- #use C4::Acquisitions;
  use C4::Output;
  use C4::Input;
  use C4::Biblio;
- #use C4::SimpleMarc;
- #use C4::Z3950;
  use MARC::File::USMARC;
  use HTML::Template;
  
  #------------------
--- 36,46 ----
  # Koha modules used
  use C4::Context;
  use C4::Output;
  use C4::Input;
  use C4::Biblio;
  use MARC::File::USMARC;
  use HTML::Template;
+ use C4::Output;
+ use C4::Auth;
  
  #------------------
***************
*** 68,73 ****
  my $overwrite_biblio = $input->param('overwrite_biblio');
  my $filename = $input->param('filename');
  
- my $template = gettemplate("acqui.simple/marcimport.tmpl");
  $template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
  						uploadmarc => $uploadmarc);
--- 66,78 ----
  my $overwrite_biblio = $input->param('overwrite_biblio');
  my $filename = $input->param('filename');
+ my ($template, $loggedinuser, $cookie)
+ 	= get_template_and_user({template_name => "acqui.simple/marcimport.tmpl",
+ 					query => $input,
+ 					type => "intranet",
+ 					authnotrequired => 0,
+ 					flagsrequired => {parameters => 1},
+ 					debug => 1,
+ 					});
  
  $template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
  						uploadmarc => $uploadmarc);
***************
*** 800,803 ****
--- 805,812 ----
  # log cleared, as marcimport is (almost) rewritten from scratch.
  # $Log$
+ # Revision 1.24  2003/01/14 16:41:17  tipaul
+ # bugfix : use gettemplate_and_user instead of gettemplate.
+ # fix a blank screen in 1.3.3 in "import in breeding farm"
+ #
  # Revision 1.23  2003/01/06 13:06:28  tipaul
  # removing trailing #