X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2Fscan.pl;h=0b591114cf22b3a5f19bd8902ff45a5aac3fc6cf;hb=265126993f6e3c2e4c1c98f4defcdcc3670bcd67;hp=93f521cb047816b24c055bafe1618d6185e9e860;hpb=4d393c82243c411c1e3a19e1f4d255fdd9f97363;p=Biblio-RFID.git

diff --git a/scripts/scan.pl b/scripts/scan.pl
index 93f521c..0b59111 100755
--- a/scripts/scan.pl
+++ b/scripts/scan.pl
@@ -6,32 +6,66 @@ use strict;
 use Data::Dump qw(dump);
 use Getopt::Long;
 use lib 'lib';
-use RFID::Biblio::Readers;
-use RFID::Biblio::RFID501;
+use Biblio::RFID::Reader;
+use Biblio::RFID::RFID501;
 
 my $loop = 0;
 my $reader;
+my $debug = 0;
+my $log;
 
 GetOptions(
 	'loop!'     => \$loop,
 	'reader=s', => \$reader,
+	'debug+'    => \$debug,
+	'log=s'     => \$log,
 ) || die $!;
 
-my @rfid = RFID::Biblio::Readers->available( $reader );
+my $rfid = Biblio::RFID::Reader->new( $reader );
+$Biblio::RFID::debug = $debug;
+
+sub tag {
+	my $tag = shift;
+	return $tag
+		, " AFI: "
+		, uc unpack('H2', $rfid->afi($tag))
+		, " "
+		, dump( Biblio::RFID::RFID501->to_hash( $rfid->blocks($tag) ) )
+		, $/
+		;
+}
+
+my $saved;
+
+sub iso_date {
+	my @t = localtime(time);
+	return sprintf "%04d-%02d-%02dT%02d:%02d:%02d", $t[5]+1900,$t[4]+1,$t[3],$t[2],$t[1],$t[0];
+}
+
+sub log_tag {
+	my $tag = shift;
+	return if $saved->{tag} or ! $log;
+	my $hash = Biblio::RFID::RFID501->to_hash( $rfid->blocks($tag) );
+	open(my $fh, '>>', $log) || die "$log: $!";
+	print $fh iso_date,",$tag,", $hash->{content}, "\n";
+	close($fh);
+}
 
 do {
-	foreach my $rfid ( @rfid ) {
-		my $visible = $rfid->scan;
-		foreach my $tag ( keys %$visible ) {
-			my $afi = $rfid->read_afi( $tag );
-			print ref($rfid)
-				, " $tag AFI: "
-				, uc unpack('H2', $afi)
-				, " "
-				, dump( RFID::Biblio::RFID501->to_hash( join('', @{ $visible->{$tag} }) ) )
-				, $/
-				;
-		}
-	}
+	my @visible = $rfid->tags(
+		enter => sub {
+			my $tag = shift;
+			print iso_date," enter ", tag($tag);
+			log_tag $tag;
+		},
+		leave => sub {
+			my $tag = shift;
+			print iso_date," leave ", tag($tag);
+		},
+	);
+
+	warn iso_date," visible: ",join(' ',@visible),"\n";
+
+	sleep 1;
 
 } while $loop;