X-Git-Url: http://git.rot13.org/?p=safeq;a=blobdiff_plain;f=terminal-server.pl;h=5d425ec2d8b0b990b8f16d5fde97743ee3cdb913;hp=992768e3ef66ce9029ba32580314dab3362c20fb;hb=097f49f257fcfac5d55f72aead26014e464f9970;hpb=73be26bbf5b2c3fbd642f531be3b7d60a2bcd606 diff --git a/terminal-server.pl b/terminal-server.pl index 992768e..5d425ec 100755 --- a/terminal-server.pl +++ b/terminal-server.pl @@ -25,6 +25,7 @@ my $prices = { BW => 0.0, # just paper cost COLOR => 3.99, # FIXME DUPLEX => -0.05, + COPY => 0, # no additional price other than paper }; @@ -65,7 +66,7 @@ while(1) { $line =~ s/[\r\n]+$//; warn "<< $line\n"; } else { - warn "<< [NULL] connected: ",dump($client_socket), $client_socket->connected; + warn "<< NULL ", $client_socket->connected ? '' : 'NOT ', "connected"; } return $line; @@ -89,6 +90,7 @@ while(1) { while ($client_socket->connected) { my $line = client_line; + last if ! defined $line; if ( $line =~ m/^\.SQ ([\d\.]+) (\S+)/ ) { my ($version,$serial) = ($1,$2); @@ -125,22 +127,78 @@ while(1) { $total_charged += $charge; $total_pages++; client_send ".CREDIT ".credit; - client_send ".COPY 1"; # I verified that you are allowed to copy 1 page? + client_send ".COPY $total_pages"; # page copied client_send ".NOP"; } elsif ( $line =~ m/\.ACTION LIST/ ) { + + client_send "2"; # nr of items in list + # status: 0 - pendng/3 - printed + # | pages + # | | title + # | | | queue + client_send "3|1|Koha online catalog|XWC7232"; + client_send "0|1|Koha online catalog|XWC5225"; # FIXME - } elsif ( $line =~ m/\.ACTION PRINT ALL/ ) { + } elsif ( $line =~ m/\.ACTION PRINT (ALL|\d+)/ ) { + my $what = $1; + my $job = $1 if $1 =~ m/^\d+$/; # 0 means print all? + + my $charge = $prices->{'A4'} || die "no A4 price"; + + my $nr_jobs = 2; + + if ( $nr_jobs == 0 ) { + client_send ".ACTION NOJOB Nema se Å¡ta tiskat"; + next; + } + # FIXME + warn "FIXME $line\n"; + client_send ".ACTION PRINT"; # device locked from terminal screen? + + # check if printer ready + my $printer_ready = 0; + if ( ! $printer_ready ) { + client_send ".WARN 1/1|The printer is not ready|job has been suspended ... (1x)"; + next; + } + + my $send = 0; # 0 .. 100 + my $printed = 0; # 0 .. nr pages + + # total pages in batch + # | page/batch + # | | title + # | | | + client_send ".PRINT 1|1/1|Microsoft Word - molba_opca"; + client_send ".NOP S $send C 0"; + + # open 10.60.3.25:9100 + $send = 100; + + client_send ".NOP S $send C 0"; + client_send ".MSG Please check display of device" if $send == 100; + + # check smtp counters to be sure page is printed + + $credit -= $charge; + $total_charged += $charge; + $total_pages++; + + client_send ".DONE $nr_jobs $total_pages ".credit($total_charged); } elsif ( $line =~ m/^\.NOP/ ) { # XXX it's important to sleep, before sending response or # interface on terminal device will be unresponsive $next_nop_t = time() + 5; # NOP every 5s? } elsif ( $line =~ m/^\.END/ ) { - client_send ".DONE BLK WAIT"; - $client_socket->close; + client_send ".DONE BLK WAIT"; + client_send ".NOP"; + my $nr_jobs = 0; # FIXME + client_send ".DONE $total_pages ".credit($total_charged); +# $client_socket->close; } elsif (defined $line) { warn "UNKNOWN: ",dump($line); print "Response>"; @@ -148,7 +206,7 @@ while(1) { chomp $r; client_send $r; } else { - warn "NULL line, connected ", $client_socket->connected; + warn "NULL line ", $client_socket->connected ? '' : 'NOT ', "connected"; } } warn "# return to accept";