X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2FRFID-JSONP-server.pl;h=2575c5774a845679b20a8cd70cd54efa73cba2e8;hb=9d7698d4ac2b5fc73df2d40a5413f0e190d61b4c;hp=176d7e604df3e9f6db6d474cca8cab1a1e3c7643;hpb=f2197c45deafd6bbc5a9d200f1b372081e5bb157;p=Biblio-RFID.git

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 176d7e6..2575c57 100755
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -32,9 +32,8 @@ GetOptions(
 
 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 RFID::Biblio::Reader;
+my $rfid = RFID::Biblio::Reader->new( shift @ARGV );
 
 my $index_html;
 {
@@ -95,13 +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::Biblio::RFID501->to_hash( $rfid->blocks( $tag ) );
 					$hash->{sid}  = $tag;
-					$hash->{security} = uc unpack 'H*', $rfid->read_afi( $tag )
-						if $rfid->can('read_afi');
+					$hash->{security} = uc unpack 'H*', $rfid->afi( $tag );
 					push @{ $json->{tags} }, $hash;
 				};
 				warn "#### ", encode_json($json);