added from_hash and test roundtrip

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

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 0b4bd3d..d9ea814 100755 (executable)
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -25,9 +25,9 @@ my $server_url  = "http://localhost:$listen_port";
 
 
 use lib 'lib';
-use RFID::Serial::Decode::RFID501;
-use RFID::Serial::3M810;
-my $rfid = RFID::Serial::3M810->new;
+use RFID::Biblio::RFID501;
+use RFID::Biblio::3M810;
+my $rfid = RFID::Biblio::3M810->new;
 
 my $index_html;
 {
@@ -73,8 +73,9 @@ sub http_server {
                                my $tags = $rfid->scan;
                                my $json = { time => time() };
                                foreach my $tag ( keys %$tags ) {
-                                       my $hash = RFID::Serial::Decode::RFID501->to_hash( $tags->{$tag} );
+                                       my $hash = RFID::Biblio::RFID501->to_hash( $tags->{$tag} );
                                        $hash->{sid}  = $tag;
+                                       $hash->{security} = uc unpack 'H*', $rfid->read_afi( $tag );
                                        push @{ $json->{tags} }, $hash;
                                };
                                warn "#### ", encode_json($json);
@@ -163,6 +164,15 @@ label[for=pull-reader] {
 </style>
 <script type="text/javascript">
 
+// mock console
+if(!window.console) {
+       window.console = new function() {
+               this.info = function(str) {};
+               this.debug = function(str) {};
+       };
+}
+
+
 function got_visible_tags(data,textStatus) {
        var html = 'No tags in range';
        if ( data.tags ) {