X-Git-Url: http://git.rot13.org/?p=Biblio-RFID.git;a=blobdiff_plain;f=scripts%2FRFID-JSONP-server.pl;h=06576d212a0b549fca0a8232539a7fc2819f4b13;hp=9396f5d380cdea923621ebc6b08e6b45afe2f71f;hb=4eac75a7fb5666f3ac4c2fe5259dcaf1fe769a34;hpb=cdd09022d32de8446bae6bce61b86302b6c99472

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 9396f5d..06576d2 100755
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -24,8 +24,7 @@ use POSIX qw(strftime);
 use Encode;
 
 my $debug = 0;
-my $listen = '127.0.0.1:9000';
-$listen = ':9000';
+my $listen = $ENV{HTTP_LISTEN} || 'localhost:9000';
 my $reader;
 my $koha_url = $ENV{KOHA_URL};
 warn "$koha_url";
@@ -78,14 +77,36 @@ sub rfid_borrower {
 }
 
 
+sub sip2_socket {
+
+	return $sip2->{sock} if exists $sip2->{sock} && $sip2->{sock}->connected;
+
+	if ( my $server = $sip2->{server} ) {
+		my $sock = $sip2->{sock} = IO::Socket::INET->new( $server ) || die "can't connect to $server: $!";
+		warn "SIP2 server ", $sock->peerhost, ":", $sock->peerport, "\n";
+
+		# login
+		if ( sip2_message("9300CN$sip2->{user}|CO$sip2->{password}|")->{fixed} !~ m/^941/ ) {
+			die "SIP2 login failed";
+		}
+
+	}
+	return $sip2->{sock};
+}
+
 sub sip2_message {
 	my $send = shift;
 
-	my $sock = $sip2->{sock} || die "no sip2 socket";
+	my $retry = 0;
+
+send_again:
+	my $sock = sip2_socket || die "no sip2 socket";
 
 	local $/ = "\r";
 
 	$send .= "\r" unless $send =~ m/\r$/;
+	$send .= "\n" unless $send =~ m/\n$/;
+
 	warn "SIP2 >>>> ",dump($send), "\n";
 	print $sock $send;
 	$sock->flush;
@@ -93,11 +114,21 @@ sub sip2_message {
 	my $expect = substr($send,0,2) | 0x01;
 
 	my $in = <$sock>;
+	warn "SIP2 <<<< ",dump($in), "\n";
+
 	$in =~ s/^\n//;
 	$in =~ s/\r$//;
-	warn "SIP2 <<<< ",dump($in), "\n";
 
-	die "empty read from SIP server" unless length $in > 1;
+	if ( ! $in ) {
+		$retry++;
+		warn "empty read from SIP server, retry: $retry\n";
+		if ( $retry < 10 ) {
+			close( $sip2->{sock} );
+			goto send_again;
+		}
+		die "aborted";
+	}
+
 
 	die "expected $expect" unless substr($in,0,2) != $expect;
 
@@ -115,16 +146,6 @@ sub sip2_message {
 	return $hash;
 }
 
-if ( my $server = $sip2->{server} ) {
-	my $sock = $sip2->{sock} = IO::Socket::INET->new( $server ) || die "can't connect to $server: $!";
-	warn "SIP2 server ", $sock->peerhost, ":", $sock->peerport, "\n";
-
-	# login
-	if ( sip2_message("9300CN$sip2->{user}|CO$sip2->{password}|")->{fixed} !~ m/^941/ ) {
-		die "SIP2 login failed";
-	}
-
-}
 
 use lib 'lib';
 use Biblio::RFID::RFID501;
@@ -347,8 +368,11 @@ sub rfid_register {
 
 	my $ua = LWP::UserAgent->new;
 	my $url = URI->new( $rfid_url . '/register.pl');
-	$url->query_form(
-		local_ip => $ip->{eth0} || $ip->{ (keys %$ip)[0] },
+	$url->query_form( %$ip,
+		HTTP_LISTEN => $listen,
+		RFID_LISTEN => $ENV{RFID_LISTEN},
+		KOHA_URL => $koha_url,
+		RFID_URL => $rfid_url,
 	);
 	warn "GET ",$url->as_string;
 	my $response = $ua->get($url);