X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2Fprint.pl;h=0c5d3f86a20f97adb00675cd4d18b3564711db29;hb=ec011dbcb9305fd06c19e4dbd69d49e48eaa5b42;hp=701447eb197b09c593b69229f619c49d8d05dffb;hpb=4097fd6b4aceb437839c3b45440cdb9061ee6088;p=Biblio-RFID.git diff --git a/scripts/print.pl b/scripts/print.pl index 701447e..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 ) ) , $/ ; } @@ -89,7 +89,7 @@ die "$log_path exists" if -e $log_path; sub write_log { my ( $tag, $number ) = @_; - open(my $log, '>', $log_path) || die "$log_path: $!"; + open(my $log, '>>', $log_path) || die "$log_path: $!"; my $date = iso_date; print $log "$date,$tag,$number\n"; close($log); @@ -156,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; } }