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

[Alan Millar]

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

Modified Files:
      Tag: rel-1-2
	marcimport.pl 
Log Message:
Allow DEFAULT as input to addz3950search.
Check for existence of pid file (cat crashed otherwise).
Return error messages in addz3950search.

Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.6.2.31
retrieving revision 1.6.2.32
diff -C2 -r1.6.2.31 -r1.6.2.32
*** marcimport.pl	28 Jun 2002 18:50:46 -0000	1.6.2.31
--- marcimport.pl	29 Jun 2002 17:33:47 -0000	1.6.2.32
***************
*** 735,738 ****
--- 735,739 ----
  
      my @serverlist;
+     my $error;
  
      requireDBI($dbh,"AcceptZ3950Queue");
***************
*** 757,767 ****
          }
  
! 	if (addz3950queue($dbh,$input->param('query'), $input->param('type'), 
! 		$input->param('rand'), @serverlist)) {
  	    print qq|
  <table border=1 cellpadding=5 cellspacing=0 align=center>
  <tr><td bgcolor=#99cc33 background=/images/background-acq.gif colspan=2><font color=red><b>Error</b></font></td></tr>
  <tr><td colspan=2>
! <b>No Z39.50 client daemon running on the server.</b><p>
  There is a launcher for the Z39.50 client daemon in your intranet installation<br>
  directory under <b>./scripts/z3950daemon/z3950-daemon-launch.sh</b>.  This<br>
--- 758,772 ----
          }
  
! 	$error=addz3950queue($dbh,$input->param('query'), $input->param('type'), 
! 		$input->param('rand'), @serverlist);
! 	if ( $error ) {
  	    print qq|
  <table border=1 cellpadding=5 cellspacing=0 align=center>
  <tr><td bgcolor=#99cc33 background=/images/background-acq.gif colspan=2><font color=red><b>Error</b></font></td></tr>
  <tr><td colspan=2>
! <b>$error</b><p>
! |;
! 	    if ( $error =~ /daemon/i ) {
! 	        print qq|
  There is a launcher for the Z39.50 client daemon in your intranet installation<br>
  directory under <b>./scripts/z3950daemon/z3950-daemon-launch.sh</b>.  This<br>
***************
*** 769,773 ****
--- 774,781 ----
  privileges of your apache user.  Ideally, this script should be started from a<br>
  system init directory so that is running after the machine starts up.
+ |;
  	
+ 	    } # if daemon
+ 	    print qq|
  </td></tr>
  </table>
***************
*** 776,780 ****
  
  |;
! 	}
      } else {
  	print "<font color=red size=+1>$query is not a valid ISBN
--- 784,788 ----
  
  |;
! 	} # if error
      } else {
  	print "<font color=red size=+1>$query is not a valid ISBN
***************
*** 1137,1140 ****
--- 1145,1153 ----
  #---------------
  # $Log$
+ # Revision 1.6.2.32  2002/06/29 17:33:47  amillar
+ # Allow DEFAULT as input to addz3950search.
+ # Check for existence of pid file (cat crashed otherwise).
+ # Return error messages in addz3950search.
+ #
  # Revision 1.6.2.31  2002/06/28 18:50:46  tonnesen
  # Got rid of white text on black, replaced with black on background-acq.gif