added all RFID501 fields

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

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index bd6ba9f..08258d1 100755 (executable)
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 
-=head1 RFID-JSONP-server
+=head1 NAME
 
-This is simpliest possible JSONP server which provides local web interface to RFID readers
+RFID-JSONP-server - simpliest possible JSONP server which provides local web interface to RFID readers
 
-Usage:
+=head1 USAGE
 
-  ./scripts/RFID-JSONP-server.pl
+  ./scripts/RFID-JSONP-server.pl [--debug] [--listen=127.0.0.1:9000] [--reader=filter]
 
 =cut
 
@@ -17,18 +17,51 @@ use Data::Dump qw/dump/;
 
 use JSON::XS;
 use IO::Socket::INET;
+use LWP::UserAgent;
+use URI;
 
 my $debug = 1;
+my $listen = '127.0.0.1:9000';
+$listen = ':9000';
+my $reader;
 
-my $listen_port = 9000;                  # pick something not in use
-my $server_url  = "http://localhost:$listen_port";
+use Getopt::Long;
 
-my $reader = shift @ARGV;
+GetOptions(
+       'debug!'    => \$debug,
+       'listen=s', => \$listen,
+       'reader=s', => \$reader,
+) || die $!;
+
+our $rfid_sid_cache;
+
+sub rfid_borrower {
+       my $hash = shift;
+       if ( my $json = $rfid_sid_cache->{ $hash->{sid} } ) {
+               return $json;
+       }
+       my $ua = LWP::UserAgent->new;
+       my $url = URI->new('http://ffzg.koha-dev.rot13.org:8080/cgi-bin/koha/ffzg/rfid-borrower.pl');
+       $url->query_form(
+                 RFID_SID => $hash->{sid}
+               , OIB => $hash->{OIB}
+               , JMBAG => $hash->{JMBAG}
+       );
+       warn "GET ",$url->as_string;
+       my $response = $ua->get($url);
+       if ( $response->is_success ) {
+               my $json = decode_json $response->decoded_content;
+               $rfid_sid_cache->{ $hash->{sid} } = $json;
+               return $json;
+       } else {
+               warn "ERROR ", $response->status_line;
+       }
+}
 
 use lib 'lib';
-use RFID::Biblio::RFID501;
-use RFID::Biblio::Readers;
-my $rfid = (RFID::Biblio::Readers->available( $reader ))[0]; # FIXME
+use Biblio::RFID::RFID501;
+use Biblio::RFID::Reader;
+my $rfid = Biblio::RFID::Reader->new( shift @ARGV );
 
 my $index_html;
 {
@@ -36,17 +69,20 @@ my $index_html;
        $index_html = <DATA>;
 }
 
+my $server_url;
+
 sub http_server {
 
        my $server = IO::Socket::INET->new(
                Proto     => 'tcp',
-               LocalPort => $listen_port,
+               LocalAddr => $listen,
                Listen    => SOMAXCONN,
                Reuse     => 1
        );
                                                                  
        die "can't setup server: $!" unless $server;
 
+       $server_url = 'http://' . $listen;
        print "Server $0 ready at $server_url\n";
 
        while (my $client = $server->accept()) {
@@ -86,12 +122,21 @@ sub http_server {
                                        close($fh);
                                }
                        } elsif ( $method =~ m{/scan} ) {
-                               my $tags = $rfid->scan;
+                               my @tags = $rfid->tags;
                                my $json = { time => time() };
-                               foreach my $tag ( keys %$tags ) {
-                                       my $hash = RFID::Biblio::RFID501->to_hash( $tags->{$tag} );
+                               foreach my $tag ( @tags ) {
+                                       my $hash = $rfid->to_hash( $tag );
                                        $hash->{sid}  = $tag;
-                                       $hash->{security} = uc unpack 'H*', $rfid->read_afi( $tag );
+                                       if ( $hash->{tag_type} eq 'SmartX' ) {
+                                               my $borrower = rfid_borrower $hash;
+                                               if ( exists $borrower->{error} ) {
+                                                       warn "ERROR ", dump($borrower);
+                                               } else {
+                                                       $hash->{borrower} = $borrower->{borrower};
+                                               }
+                                       } else {
+                                               $hash->{security} = uc unpack 'H*', $rfid->afi( $tag );
+                                       }
                                        push @{ $json->{tags} }, $hash;
                                };
                                warn "#### ", encode_json($json);
@@ -104,8 +149,8 @@ sub http_server {
                                foreach my $p ( keys %$param ) {
                                        next unless $p =~ m/^(E[0-9A-F]{15})$/;
                                        my $tag = $1;
-                                       my $content = RFID::Biblio::RFID501->from_hash({ content => $param->{$p} });
-                                       $content    = RFID::Biblio::RFID501->blank if $param->{$p} eq 'blank';
+                                       my $content = Biblio::RFID::RFID501->from_hash({ content => $param->{$p} });
+                                       $content    = Biblio::RFID::RFID501->blank if $param->{$p} eq 'blank';
                                        $status = 302;
 
                                        warn "PROGRAM $tag $content\n";
@@ -128,7 +173,7 @@ sub http_server {
                                        $status = 302;
 
                                        warn "SECURE $tag $data\n";
-                                       secure_tag_with( $tag, $data );
+                                       $rfid->write_afi( $tag => hex($data) );
                                }
 
                                if ( $json ) {
@@ -195,15 +240,19 @@ function got_visible_tags(data,textStatus) {
                html = '<ul class="tags">';
                $.each(data.tags, function(i,tag) {
                        console.debug( i, tag );
-                       html += '<li><tt class=' + tag.security + '>' + tag.sid;
-                       if ( tag.content ) {
-                               html += ' <a href="https://koha-dev.rot13.org:8443/cgi-bin/koha/members/member.pl?member=' + tag.content + '" title="lookup in Koha" target="koha-lookup">' + tag.content + '</a>';
+                       html += '<li><tt class="' + tag.security + '">' + tag.sid;
+                       var borrowernumber = tag.content || tag.borrower.cardnumber;
+
+                       if ( borrowernumber ) {
+                               html += ' <a href="http://ffzg.koha-dev.rot13.org:8080/cgi-bin/koha/members/member.pl?member=' + borrowernumber + '" title="lookup in Koha" target="koha-lookup">' + borrowernumber + '</a>';
                                html += '</tt>';
+/*
                                html += '<form method=get action=program style="display:inline">'
                                        + '<input type=hidden name='+tag.sid+' value="blank">'
                                        + '<input type=submit value="Blank" onclick="return confirm(\'Blank tag '+tag.sid+'\')">'
                                        + '</form>'
                                ;
+*/
                        } else {
                                html += '</tt>';
                                html += ' <form method=get action=program style="display:inline">'