projects
/
Biblio-RFID.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
display time for all events
[Biblio-RFID.git]
/
scripts
/
RFID-JSONP-server.pl
diff --git
a/scripts/RFID-JSONP-server.pl
b/scripts/RFID-JSONP-server.pl
index
176d7e6
..
2575c57
100755
(executable)
--- 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 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;
{
my $index_html;
{
@@
-95,13
+94,12
@@
sub http_server {
close($fh);
}
} elsif ( $method =~ m{/scan} ) {
close($fh);
}
} elsif ( $method =~ m{/scan} ) {
- my
$tags = $rfid->scan || {}
;
+ my
@tags = $rfid->tags
;
my $json = { time => time() };
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->{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);
push @{ $json->{tags} }, $hash;
};
warn "#### ", encode_json($json);