don't populate (fake) security for SmartX

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

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 104ec85..1c46405 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
 
@@ -19,16 +19,21 @@ use JSON::XS;
 use IO::Socket::INET;
 
 my $debug = 1;
-
 my $listen = '127.0.0.1:9000';
+my $reader;
+
+use Getopt::Long;
 
-my $reader = shift @ARGV;
+GetOptions(
+       'debug!'    => \$debug,
+       'listen=s', => \$listen,
+       'reader=s', => \$reader,
+) || die $!;
 
 use lib 'lib';
-use RFID::Biblio::RFID501;
-use RFID::Biblio::Readers;
-my $rfid = (RFID::Biblio::Readers->available( $reader ))[0]; # FIXME
-warn "using $rfid reader\n";
+use Biblio::RFID::RFID501;
+use Biblio::RFID::Reader;
+my $rfid = Biblio::RFID::Reader->new( shift @ARGV );
 
 my $index_html;
 {
@@ -89,12 +94,12 @@ 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 );
+                                       $hash->{security} = uc unpack 'H*', $rfid->afi( $tag ) if $hash->{tag_type} ne 'SmartX';
                                        push @{ $json->{tags} }, $hash;
                                };
                                warn "#### ", encode_json($json);
@@ -107,8 +112,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";
@@ -131,7 +136,7 @@ sub http_server {
                                        $status = 302;
 
                                        warn "SECURE $tag $data\n";
-                                       secure_tag_with( $tag, $data );
+                                       $rfid->write_afi( $tag => hex($data) );
                                }
 
                                if ( $json ) {
@@ -200,7 +205,7 @@ function got_visible_tags(data,textStatus) {
                        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 += ' <a href="http://ffzg.koha-dev.rot13.org:8080/cgi-bin/koha/members/member.pl?member=' + tag.content + '" title="lookup in Koha" target="koha-lookup">' + tag.content + '</a>';
                                html += '</tt>';
                                html += '<form method=get action=program style="display:inline">'
                                        + '<input type=hidden name='+tag.sid+' value="blank">'