X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2FRFID-JSONP-server.pl;h=1c464056c88f461b906013f831bc4343bea9a176;hb=3dba159608abc6b4d3ba147d8f8bb44dc3cbfa25;hp=9f1e3d6eb61ba1c00692bae568c7b5154ecbfa59;hpb=1aeb7180acb209199a37e20d17e45f5b31acab86;p=Biblio-RFID.git

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index 9f1e3d6..1c46405 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
 
@@ -15,50 +15,54 @@ use warnings;
 
 use Data::Dump qw/dump/;
 
-use JSON;
+use JSON::XS;
 use IO::Socket::INET;
 
 my $debug = 1;
+my $listen = '127.0.0.1:9000';
+my $reader;
 
-my $listen_port = 9000;                  # pick something not in use
-my $server_url  = "http://localhost:$listen_port";
+use Getopt::Long;
 
+GetOptions(
+	'debug!'    => \$debug,
+	'listen=s', => \$listen,
+	'reader=s', => \$reader,
+) || die $!;
 
 use lib 'lib';
-use RFID::Serial::3M810;
-my $rfid = RFID::Serial::3M810->new;
+use Biblio::RFID::RFID501;
+use Biblio::RFID::Reader;
+my $rfid = Biblio::RFID::Reader->new( shift @ARGV );
+
+my $index_html;
+{
+	local $/ = undef;
+	$index_html = <DATA>;
+}
+
+my $server_url;
 
 sub http_server {
 
 	my $server = IO::Socket::INET->new(
 		Proto     => 'tcp',
-		LocalPort => $listen_port,
+		LocalAddr => $listen,
 		Listen    => SOMAXCONN,
 		Reuse     => 1
 	);
 								  
 	die "can't setup server: $!" unless $server;
 
+	$server_url = 'http://' . $listen;
 	print "Server $0 ready at $server_url\n";
 
-	sub static {
-		my ($client,$path) = @_;
-
-		return unless $path eq '/';
-
-		print $client "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n";
-		while(<DATA>) {
-			print $client $_;
-		}
-
-		return $path;
-	}
-
 	while (my $client = $server->accept()) {
 		$client->autoflush(1);
 		my $request = <$client>;
 
 		warn "WEB << $request\n" if $debug;
+		my $path;
 
 		if ($request =~ m{^GET (/.*) HTTP/1.[01]}) {
 			my $method = $1;
@@ -70,16 +74,37 @@ sub http_server {
 				}
 				warn "WEB << param: ",dump( $param ) if $debug;
 			}
-			if ( my $path = static( $client,$1 ) ) {
-				warn "WEB >> $path" if $debug;
+			$path = $method;
+
+			if ( $path eq '/' ) {
+				print $client "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n$index_html";
+			} elsif ( $path =~ m{^/(examples/.+)} ) {
+				$path = $1; # FIXME prefix with dir for installation
+				my $size = -s $path;
+				warn "static $path $size bytes\n";
+				my $content_type = 'text/plain';
+				$content_type = 'application/javascript' if $path =~ /\.js/;
+				print $client "HTTP/1.0 200 OK\r\nContent-Type: $content_type\r\nContent-Length: $size\r\n\r\n";
+				{
+					local $/ = undef;
+					open(my $fh, '<', $path) || die "can't open $path: $!";
+					while(<$fh>) {
+						print $client $_;
+					}
+					close($fh);
+				}
 			} elsif ( $method =~ m{/scan} ) {
-				my $tags = $rfid->scan;
-				my $json = {
-					time => time(),
-					tags => $tags,
+				my @tags = $rfid->tags;
+				my $json = { time => time() };
+				foreach my $tag ( @tags ) {
+					my $hash = $rfid->to_hash( $tag );
+					$hash->{sid}  = $tag;
+					$hash->{security} = uc unpack 'H*', $rfid->afi( $tag ) if $hash->{tag_type} ne 'SmartX';
+					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
@@ -87,13 +112,13 @@ sub http_server {
 				foreach my $p ( keys %$param ) {
 					next unless $p =~ m/^(E[0-9A-F]{15})$/;
 					my $tag = $1;
-					my $content = "\x04\x11\x00\x01" . $param->{$p};
-					$content = "\x00" 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";
-					write_tag( $tag, $content );
-					secure_tag_with( $tag, $param->{$p} =~ /^130/ ? 'DA' : 'D7' );
+					$rfid->write_blocks( $tag => $content );
+					$rfid->write_afi(    $tag => chr( $param->{$p} =~ /^130/ ? 0xDA : 0xD7 ) );
 				}
 
 				print $client "HTTP/1.0 $status $method\r\nLocation: $server_url\r\n\r\n";
@@ -111,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 ) {
@@ -138,7 +163,7 @@ http_server;
 __DATA__
 <html>
 <head>
-<title>3M RFID</title>
+<title>RFID JSONP</title>
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 <style type="text/css">
 .status {
@@ -163,6 +188,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 ) {
@@ -171,7 +205,7 @@ function got_visible_tags(data,textStatus) {
 			console.debug( i, tag );
 			html += '<li><tt class=' + tag.security + '>' + tag.sid;
 			if ( tag.content ) {
-				html += ' <a href="https://koha-dev.rot13.org:8443/cgi-bin/koha/members/member.pl?member=' + tag.content + '" title="lookup in Koha" target="koha-lookup">' + tag.content + '</a>';
+				html += ' <a href="http://ffzg.koha-dev.rot13.org:8080/cgi-bin/koha/members/member.pl?member=' + tag.content + '" title="lookup in Koha" target="koha-lookup">' + tag.content + '</a>';
 				html += '</tt>';
 				html += '<form method=get action=program style="display:inline">'
 					+ '<input type=hidden name='+tag.sid+' value="blank">'
@@ -208,7 +242,7 @@ function got_visible_tags(data,textStatus) {
 function scan_tags() {
 	console.info('scan_tags');
 	if ( $('input#pull-reader').attr('checked') )
-		$.getJSON("http://localhost:9000/scan?callback=?", got_visible_tags);
+		$.getJSON("/scan?callback=?", got_visible_tags);
 }
 
 $(document).ready(function() {