use Pod::Readme

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

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index bd6ba9f..ca4db0c 100755 (executable)
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -19,16 +19,22 @@ use JSON::XS;
 use IO::Socket::INET;
 
 my $debug = 1;
+my $listen = '127.0.0.1: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 $!;
 
 use lib 'lib';
 use RFID::Biblio::RFID501;
-use RFID::Biblio::Readers;
-my $rfid = (RFID::Biblio::Readers->available( $reader ))[0]; # FIXME
+use RFID::Biblio::Reader;
+my $rfid = RFID::Biblio::Reader->new( shift @ARGV );
+warn "using readers: ",dump( $rfid->_available );
 
 my $index_html;
 {
@@ -36,17 +42,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 +95,13 @@ sub http_server {
                                        close($fh);
                                }
                        } elsif ( $method =~ m{/scan} ) {
-                               my $tags = $rfid->scan;
+                               my $tags = $rfid->scan || {};
                                my $json = { time => time() };
                                foreach my $tag ( keys %$tags ) {
                                        my $hash = RFID::Biblio::RFID501->to_hash( $tags->{$tag} );
                                        $hash->{sid}  = $tag;
-                                       $hash->{security} = uc unpack 'H*', $rfid->read_afi( $tag );
+                                       $hash->{security} = uc unpack 'H*', $rfid->read_afi( $tag )
+                                               if $rfid->can('read_afi');
                                        push @{ $json->{tags} }, $hash;
                                };
                                warn "#### ", encode_json($json);
@@ -128,7 +138,7 @@ sub http_server {
                                        $status = 302;
 
                                        warn "SECURE $tag $data\n";
-                                       secure_tag_with( $tag, $data );
+                                       $rfid->write_afi( $tag => hex($data) );
                                }
 
                                if ( $json ) {