fix spelling

[Biblio-RFID.git] / scripts / RFID-JSONP-server.pl

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 4bec23e..215d6ca 100755 (executable)
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -78,14 +78,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,13 +115,24 @@ sub sip2_message {
        my $expect = substr($send,0,2) | 0x01;
 
        my $in = <$sock>;
-       $in =~ s/^\n//;
        warn "SIP2 <<<< ",dump($in), "\n";
 
-       die "expected $expect" unless substr($in,0,2) != $expect;
-
+       $in =~ s/^\n//;
        $in =~ s/\r$//;
 
+       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;
+
        my $hash;
        if ( $in =~ s/^([0-9\s]+)// ) {
                $hash->{fixed} = $1;
@@ -114,16 +147,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;