[Koha-cvs] CVS: koha/acqui.simple marcimport.pl,1.6.2.32,1.6.2.33

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
	marcimport.pl 
Log Message:
Fixing some bugs in marcimport.pl that broke uploading marc records.


Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.6.2.32
retrieving revision 1.6.2.33
diff -C2 -r1.6.2.32 -r1.6.2.33
*** marcimport.pl	29 Jun 2002 17:33:47 -0000	1.6.2.32
--- marcimport.pl	5 Jul 2002 16:04:04 -0000	1.6.2.33
***************
*** 25,28 ****
--- 25,30 ----
  use C4::Z3950;
  
+ my $input = new CGI;
+ 
  #------------------
  # Constants
***************
*** 38,50 ****
  my $userid=$ENV{'REMOTE_USER'};
  
- my $input = new CGI;
  my $dbh=C4Connect;
  
  #-------------
  # Display output
! print $input->header;
  print startpage();
  print startmenu('acquisitions');
  
  #-------------
  # Process input parameters
--- 40,52 ----
  my $userid=$ENV{'REMOTE_USER'};
  
  my $dbh=C4Connect;
  
  #-------------
  # Display output
! print $input->header();
  print startpage();
  print startmenu('acquisitions');
  
+ 
  #-------------
  # Process input parameters
***************
*** 84,88 ****
      {
  	if ($menu eq 'z3950') { z3950menu($dbh,$input); last SWITCH; }
! 	if ($menu eq 'uploadmarc') { uploadmarc(); last SWITCH; }
  	if ($menu eq 'manual') { manual(); last SWITCH; }
  	mainmenu();
--- 86,90 ----
      {
  	if ($menu eq 'z3950') { z3950menu($dbh,$input); last SWITCH; }
! 	if ($menu eq 'uploadmarc') { uploadmarc($dbh); last SWITCH; }
  	if ($menu eq 'manual') { manual(); last SWITCH; }
  	mainmenu();
***************
*** 679,683 ****
      my ($dbh)=@_;
  
!     requireDBI($dbh,"uploadmarc");
  
      print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n";
--- 681,685 ----
      my ($dbh)=@_;
  
!     requireDBI($dbh,"uploadedmarc");
  
      print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n";
***************
*** 799,803 ****
      )=@_;
  
!     requireDBI($dbh,"AcceptMarcUpload");
  
      my $name=$input->param('name');
--- 801,805 ----
      )=@_;
  
!     requireDBI($dbh,"uploadedmarc");
  
      my $name=$input->param('name');
***************
*** 1145,1148 ****
--- 1147,1153 ----
  #---------------
  # $Log$
+ # Revision 1.6.2.33  2002/07/05 16:04:04  tonnesen
+ # Fixing some bugs in marcimport.pl that broke uploading marc records.
+ #
  # Revision 1.6.2.32  2002/06/29 17:33:47  amillar
  # Allow DEFAULT as input to addz3950search.