Merge branch 'master' of github.com:dpavlin/RFID-Biblio

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

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index dbb51a8..7877fca 100755 (executable)
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -15,7 +15,7 @@ use warnings;
 
 use Data::Dump qw/dump/;
 
-use JSON;
+use JSON::XS;
 use IO::Socket::INET;
 
 my $debug = 1;
@@ -23,10 +23,12 @@ my $debug = 1;
 my $listen_port = 9000;                  # pick something not in use
 my $server_url  = "http://localhost:$listen_port";
 
+my $reader = shift @ARGV;
 
 use lib 'lib';
-use RFID::Serial::3M810;
-my $rfid = RFID::Serial::3M810->new;
+use RFID::Biblio::RFID501;
+use RFID::Biblio::Readers;
+my $rfid = (RFID::Biblio::Readers->available( $reader ))[0]; # FIXME
 
 my $index_html;
 {
@@ -70,12 +72,16 @@ sub http_server {
                                print $client "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n$index_html";
                        } elsif ( $method =~ m{/scan} ) {
                                my $tags = $rfid->scan;
-                               my $json = {
-                                       time => time(),
-                                       tags => $tags,
+                               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 );
+                                       push @{ $json->{tags} }, $hash;
                                };
+                               warn "#### ", encode_json($json);
                                print $client "HTTP/1.0 200 OK\r\nContent-Type: application/json\r\n\r\n",
-                                       $param->{callback}, "(", to_json($json), ")\r\n";
+                                       $param->{callback}, "(", encode_json($json), ")\r\n";
                        } elsif ( $method =~ m{/program} ) {
 
                                my $status = 501; # Not implementd
@@ -159,6 +165,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 ) {