X-Git-Url: http://git.rot13.org/?p=Biblio-RFID.git;a=blobdiff_plain;f=scripts%2FRFID-JSONP-server.pl;h=06576d212a0b549fca0a8232539a7fc2819f4b13;hp=46abca958729fe2e8590780801966f72289f8cd5;hb=4eac75a7fb5666f3ac4c2fe5259dcaf1fe769a34;hpb=07407d8a1d12e6cf9d50ec84d018d9b4c6a6538d diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl index 46abca9..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"; @@ -98,6 +97,8 @@ sub sip2_socket { sub sip2_message { my $send = shift; + my $retry = 0; + send_again: my $sock = sip2_socket || die "no sip2 socket"; @@ -106,8 +107,6 @@ send_again: $send .= "\r" unless $send =~ m/\r$/; $send .= "\n" unless $send =~ m/\n$/; - - my $retry = 0; warn "SIP2 >>>> ",dump($send), "\n"; print $sock $send; $sock->flush; @@ -369,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);