X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2FRFID-JSONP-server.pl;h=4a6be064409fdc298ca3c8b3336421ad2ef78966;hb=bb93f2432b71bed8fed19472e014efa3a2063b68;hp=104ec8522466745db3a1f2451c07fdcf9ef02cbe;hpb=ae2eec01fb44c6ae826af21dcce27e15393d8f93;p=Biblio-RFID.git

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 104ec85..4a6be06 100755
--- 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 = Biblio::RFID::RFID501->to_hash( $rfid->blocks( $tag ) );
 					$hash->{sid}  = $tag;
-					$hash->{security} = uc unpack 'H*', $rfid->read_afi( $tag );
+					$hash->{security} = uc unpack 'H*', $rfid->afi( $tag );
 					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 ) {