X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2Fprint.pl;h=0c5d3f86a20f97adb00675cd4d18b3564711db29;hb=ec78566cc9572e9a76afe5f3fa5fbb5054632d59;hp=2336bba6a4e5f66eed6d99babed670df5e31ed78;hpb=6326f4b9c01e7a25a9d98a0d2e0e3b803f27f3d4;p=Biblio-RFID.git

diff --git a/scripts/print.pl b/scripts/print.pl
index 2336bba..0c5d3f8 100755
--- a/scripts/print.pl
+++ b/scripts/print.pl
@@ -54,11 +54,11 @@ while(<>) {
 	chomp;
 	my @a = split(/\t/,$_);
 	die "invalid: @a in line $_" if $a[0] !~ m/\d{12}/ && $a[1] !~ m/\@/;
-	push @queue, [ @a ] if ! $numbers->{ $a[0] };
+	push @queue, [ @a ] if ! $numbers->{ $a[0] } || $ENV{REPRINT};
 }
 
 # sort by card number
-@queue = sort { $a->[0] <=> $b->[0] } @queue;
+@queue = sort { $b->[0] <=> $a->[0] } @queue;
 
 print "# queue ", dump @queue;
 
@@ -71,7 +71,7 @@ sub tag {
 		, " AFI: "
 		, uc unpack('H2', $rfid->afi($tag))
 		, " "
-		, dump( Biblio::RFID::RFID501->to_hash( $rfid->blocks($tag) ) )
+		, dump( $rfid->to_hash( $tag ) )
 		, $/
 		;
 }
@@ -82,10 +82,19 @@ sub iso_date {
 }
 
 sub print_card;
+sub render_card;
 
 my $log_path = "$log_print/" . iso_date . ".txt";
 die "$log_path exists" if -e $log_path;
-open(my $log, '>', $log_path) || die "$log_path: $!";
+
+sub write_log {
+	my ( $tag, $number ) = @_;
+	open(my $log, '>>', $log_path) || die "$log_path: $!";
+	my $date = iso_date;
+	print $log "$date,$tag,$number\n";
+	close($log);
+	print "LOG $date $tag $number\n";
+}
 
 while ( $rfid->tags ) {
 	print "ERROR: remove all tags from output printer tray\n";
@@ -116,7 +125,7 @@ do {
 					sleep 1;
 				}
 
-				print $log iso_date, ",$tag,$number\n";
+				write_log $tag => $number;
 				$programmed->{$tag} = $number;
 
 				render_card; # pre-render next one
@@ -147,9 +156,14 @@ sub render_card {
 	my @data = @{$queue[0]};
 	my $nr = $data[0];
 
-	if ( ! ( -e "out/$nr.front.pbm" && -e "out/$nr.front.pbm" ) ) {
+	if ( $ENV{REPRINT} ) {
+		unlink $_ foreach glob("out/$nr.*");
+		warn "REPRINT: $nr";
+	}
+
+	if ( ! ( -e "out/$nr.front.pbm" && -e "out/$nr.back.pbm" ) ) {
 		print "RENDER @data\n";
-		system "$evolis_dir/scripts/inkscape-render.pl", "$evolis_dir/card/ffzg-2010.svg", @data;
+		system "$evolis_dir/scripts/inkscape-render.pl", "$evolis_dir/card/ffzg-2011.svg", @data;
 	}
 }
 
@@ -157,7 +171,6 @@ sub print_card {
 
 	if ( ! @queue ) {
 		print "QUEUE EMPTY - printing finished\n";
-		close($log);
 		print "$log_path ", -s $log_path, " bytes created\n";
 		exit;
 	}