[Koha-cvs] CVS: koha/C4 Z3950.pm,1.5,1.6

[Andrew Arensburger]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv15053

Modified Files:
	Z3950.pm 
Log Message:
Deleted unused variables.
Removed trailing whitespace.


Index: Z3950.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Z3950.pm	13 Oct 2002 06:13:23 -0000	1.5
--- Z3950.pm	13 Oct 2002 08:30:53 -0000	1.6
***************
*** 1,3 ****
! package C4::Z3950; 
  
  # $Id$
--- 1,3 ----
! package C4::Z3950;
  
  # $Id$
***************
*** 67,72 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(
! 	 &z3950servername 
! 	 &addz3950queue 
  );
  
--- 67,72 ----
  @ISA = qw(Exporter);
  @EXPORT = qw(
! 	 &z3950servername
! 	 &addz3950queue
  );
  
***************
*** 90,94 ****
      my (
  	$dbh,		# FIXME - Unused argument
! 	$srvid,		# server id number 
  	$default,
      )=@_;
--- 90,94 ----
      my (
  	$dbh,		# FIXME - Unused argument
! 	$srvid,		# server id number
  	$default,
      )=@_;
***************
*** 100,105 ****
  
  	# FIXME - Fix indentation
! 	my $sti=$dbh->prepare("select name 
! 		from z3950servers 
  		where id=?");
  	$sti->execute($srvid);
--- 100,105 ----
  
  	# FIXME - Fix indentation
! 	my $sti=$dbh->prepare("select name
! 		from z3950servers
  		where id=?");
  	$sti->execute($srvid);
***************
*** 172,176 ****
      # FIXME - Should be configurable, probably in /etc/koha.conf.
      my $pidfile='/var/log/koha/processz3950queue.pid';
!     
      $error="";
  
--- 172,176 ----
      # FIXME - Should be configurable, probably in /etc/koha.conf.
      my $pidfile='/var/log/koha/processz3950queue.pid';
! 
      $error="";
  
***************
*** 187,194 ****
  	    } elsif ($server eq 'DEFAULT' || $server eq 'CHECKED' ) {
                  $sth=$dbh->prepare("select host,port,db,userid,password ,name
! 	          from z3950servers 
  	          where checked <> 0 ");
  		$sth->execute;
! 		while ( my ($host, $port, $db, $userid, $password,$servername) 
  			= $sth->fetchrow ) {
  		    push @serverlist, "$servername/$host\:$port/$db/$userid/$password";
--- 187,194 ----
  	    } elsif ($server eq 'DEFAULT' || $server eq 'CHECKED' ) {
                  $sth=$dbh->prepare("select host,port,db,userid,password ,name
! 	          from z3950servers
  	          where checked <> 0 ");
  		$sth->execute;
! 		while ( my ($host, $port, $db, $userid, $password,$servername)
  			= $sth->fetchrow ) {
  		    push @serverlist, "$servername/$host\:$port/$db/$userid/$password";
***************
*** 196,200 ****
  	    } else {
                  $sth=$dbh->prepare("select host,port,db,userid,password
! 	          from z3950servers 
  	          where id=? ");
  		$sth->execute($server);
--- 196,200 ----
  	    } else {
                  $sth=$dbh->prepare("select host,port,db,userid,password
! 	          from z3950servers
  	          where id=? ");
  		$sth->execute($server);
***************
*** 219,231 ****
  	if ( $serverlist !~ /^ +$/ ) {
  	    # Don't allow reinsertion of the same request identifier.
! 	    $sth=$dbh->prepare("select identifier from z3950queue 
  		where identifier=?");
  	    $sth->execute($requestid);
  	    if ( ! $sth->rows) {
! 	        $sth=$dbh->prepare("insert into z3950queue 
! 		    (term,type,servers, identifier) 
  		    values (?, ?, ?, ?)");
  	        $sth->execute($query, $type, $serverlist, $requestid);
! 		if ( -r $pidfile ) { 
  		    # FIXME - Perl is good at opening files. No need to
  		    # spawn a separate 'cat' process.
--- 219,231 ----
  	if ( $serverlist !~ /^ +$/ ) {
  	    # Don't allow reinsertion of the same request identifier.
! 	    $sth=$dbh->prepare("select identifier from z3950queue
  		where identifier=?");
  	    $sth->execute($requestid);
  	    if ( ! $sth->rows) {
! 	        $sth=$dbh->prepare("insert into z3950queue
! 		    (term,type,servers, identifier)
  		    values (?, ?, ?, ?)");
  	        $sth->execute($query, $type, $serverlist, $requestid);
! 		if ( -r $pidfile ) {
  		    # FIXME - Perl is good at opening files. No need to
  		    # spawn a separate 'cat' process.
***************
*** 257,261 ****
  	    $error.="No Z39.50 search servers specified. ";
  	} # if serverlist empty
! 	
  	return $error;
  
--- 257,261 ----
  	    $error.="No Z39.50 search servers specified. ";
  	} # if serverlist empty
! 
  	return $error;
  
***************
*** 275,278 ****
--- 275,282 ----
  #--------------------------------------
  # $Log$
+ # Revision 1.6  2002/10/13 08:30:53  arensb
+ # Deleted unused variables.
+ # Removed trailing whitespace.
+ #
  # Revision 1.5  2002/10/13 06:13:23  arensb
  # Removed bogus #! line (this isn't a script!)