X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FPrint.pm;h=69986dc74078c7a3ddb400fac369250817ffb2e6;hb=970e90b3091c1ef54b9d57e6287a112f1977c887;hp=042f1224400c63ca1494836c38d23771bddacf35;hpb=c41c02271d2471751b0a8692024fdad706b9e598;p=koha.git diff --git a/C4/Print.pm b/C4/Print.pm index 042f122440..69986dc740 100644 --- a/C4/Print.pm +++ b/C4/Print.pm @@ -1,5 +1,4 @@ -package C4::Print; #assumes C4/Print.pm - +package C4::Print; # Copyright 2000-2002 Katipo Communications # @@ -19,16 +18,20 @@ package C4::Print; #assumes C4/Print.pm # Suite 330, Boston, MA 02111-1307 USA use strict; -require Exporter; -#use C4::InterfaceCDK; - use C4::Context; - +use C4::Circulation; +use C4::Members; +use C4::Dates qw(format_date); use vars qw($VERSION @ISA @EXPORT); -# set the version for version checking -$VERSION = 0.01; +BEGIN { + # set the version for version checking + $VERSION = 3.01; + require Exporter; + @ISA = qw(Exporter); + @EXPORT = qw(&remoteprint &printreserve &printslip); +} =head1 NAME @@ -46,102 +49,98 @@ The functions in this module handle sending text to a printer. =over 2 -=cut - -@ISA = qw(Exporter); -@EXPORT = qw(&remoteprint &printreserve &printslip); - =item remoteprint - &remoteprint($env, $items, $borrower); + &remoteprint($items, $borrower); Prints the list of items in C<$items> to a printer. -C<$env> is a reference-to-hash. C<$env-E{queue}> specifies the -queue to print to; if it is empty or has the special value C, -C<&remoteprint> will print to the file F. - C<$borrower> is a reference-to-hash giving information about a patron. -This may be gotten from C<&getpatroninformation>. The patron's name +This may be gotten from C<&GetMemberDetails>. The patron's name will be printed in the output. C<$items> is a reference-to-list, where each element is a reference-to-hash describing a borrowed item. C<$items> may be gotten -from C<¤tissues>. +from C<&GetBorrowerIssues>. =cut -#' + # FIXME - It'd be nifty if this could generate pretty PostScript. -sub remoteprint { - my ($env,$items,$borrower)=@_; - - (return) unless (C4::Context->boolean_preference('printcirculationslips')); - my $file=time; # FIXME - Not used - my $queue = $env->{'queue'}; - # FIXME - If 'queue' is undefined or empty, then presumably it should - # mean "use the default queue", whatever the default is. Presumably - # the default depends on the physical location of the machine. - # FIXME - Perhaps "print to file" should be a supported option. Just - # set the queue to "file" (or " file", if real queues aren't allowed - # to have spaces in them). Or perhaps if $queue eq "" and - # $env->{file} ne "", then that should mean "print to $env->{file}". - if ($queue eq "" || $queue eq 'nulllp') { - open (PRINTER,">/tmp/kohaiss"); - } else { - # FIXME - This assumes that 'lpr' exists, and works as expected. - # This is a reasonable assumption, but only because every other - # printing package has a wrapper script called 'lpr'. It'd still - # be better to be able to customize this. - open(PRINTER, "| lpr -P $queue > /dev/null") or die "Couldn't write to queue:$queue!\n"; - } -# print $queue; - #open (FILE,">/tmp/$file"); - my $i=0; - my $brdata = $env->{'brdata'}; # FIXME - Not used - # FIXME - This is HLT-specific. Put this stuff in a customizable - # site-specific file somewhere. - print PRINTER "Horowhenua Library Trust\r\n"; -# print PRINTER "$brdata->{'branchname'}\r\n"; - print PRINTER "Phone: 368-1953\r\n"; - print PRINTER "Fax: 367-9218\r\n"; - print PRINTER "Email: renewals\@library.org.nz\r\n\r\n\r\n"; - print PRINTER "$borrower->{'cardnumber'}\r\n"; - print PRINTER "$borrower->{'title'} $borrower->{'initials'} $borrower->{'surname'}\r\n"; - # FIXME - Use for ($i = 0; $items->[$i]; $i++) - # Or better yet, foreach $item (@{$items}) - while ($items->[$i]){ -# print $i; - my $itemdata = $items->[$i]; - # FIXME - This is just begging for a Perl format. - print PRINTER "$i $itemdata->{'title'}\r\n"; - print PRINTER "$itemdata->{'barcode'}"; - print PRINTER " "x15; - print PRINTER "$itemdata->{'date_due'}\r\n"; - $i++; - } - print PRINTER "\r\n\r\n\r\n\r\n\r\n\r\n\r\n"; - if ($env->{'printtype'} eq "docket"){ - #print chr(27).chr(105); - } - close PRINTER; - #system("lpr /tmp/$file"); +sub remoteprint ($$) { + my ($items, $borrower) = @_; + + (return) + unless ( C4::Context->boolean_preference('printcirculationslips') ); + my $queue = ''; + + # FIXME - If 'queue' is undefined or empty, then presumably it should + # mean "use the default queue", whatever the default is. Presumably + # the default depends on the physical location of the machine. + # FIXME - Perhaps "print to file" should be a supported option. Just + # set the queue to "file" (or " file", if real queues aren't allowed + # to have spaces in them). Or perhaps if $queue eq "" and + # $env->{file} ne "", then that should mean "print to $env->{file}". + if ( $queue eq "" || $queue eq 'nulllp' ) { + open( PRINTER, ">/tmp/kohaiss" ); + } + else { + + # FIXME - This assumes that 'lpr' exists, and works as expected. + # This is a reasonable assumption, but only because every other + # printing package has a wrapper script called 'lpr'. It'd still + # be better to be able to customize this. + open( PRINTER, "| lpr -P $queue > /dev/null" ) + or die "Couldn't write to queue:$queue!\n"; + } + + # print $queue; + #open (FILE,">/tmp/$file"); + my $i = 0; + # FIXME - This is HLT-specific. Put this stuff in a customizable + # site-specific file somewhere. + print PRINTER "Horowhenua Library Trust\r\n"; + print PRINTER "Phone: 368-1953\r\n"; + print PRINTER "Fax: 367-9218\r\n"; + print PRINTER "Email: renewals\@library.org.nz\r\n\r\n\r\n"; + print PRINTER "$borrower->{'cardnumber'}\r\n"; + print PRINTER + "$borrower->{'title'} $borrower->{'initials'} $borrower->{'surname'}\r\n"; + + # FIXME - Use for ($i = 0; $items->[$i]; $i++) + # Or better yet, foreach $item (@{$items}) + while ( $items->[$i] ) { + + # print $i; + my $itemdata = $items->[$i]; + + # FIXME - This is just begging for a Perl format. + print PRINTER "$i $itemdata->{'title'}\r\n"; + print PRINTER "$itemdata->{'barcode'}"; + print PRINTER " " x 15; + print PRINTER "$itemdata->{'date_due'}\r\n"; + $i++; + } + print PRINTER "\r\n" x 7 ; + close PRINTER; + + #system("lpr /tmp/$file"); } sub printreserve { - my($env, $branchname, $bordata, $itemdata)=@_; - my $file=time; - my $printer = $env->{'printer'}; - (return) unless (C4::Context->boolean_preference('printreserveslips')); - if ($printer eq "" || $printer eq 'nulllp') { - open (PRINTER,">>/tmp/kohares"); - } else { - open (PRINTER, "| lpr -P $printer >/dev/null") or die "Couldn't write to queue:$!\n"; - } - my @da = localtime(time()); - my $todaysdate = "$da[2]:$da[1] $da[3]/$da[4]/$da[5]"; - -#(1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]); - my $slip = <<"EOF"; + my ( $branchname, $bordata, $itemdata ) = @_; + my $printer = ''; + (return) unless ( C4::Context->boolean_preference('printreserveslips') ); + if ( $printer eq "" || $printer eq 'nulllp' ) { + open( PRINTER, ">>/tmp/kohares" ) + or die "Could not write to /tmp/kohares"; + } + else { + open( PRINTER, "| lpr -P $printer >/dev/null" ) + or die "Couldn't write to queue:$!\n"; + } + my @da = localtime(); + my $todaysdate = "$da[2]:$da[1] " . C4::Dates->today(); + my $slip = <<"EOF"; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Date: $todaysdate; @@ -164,37 +163,31 @@ $bordata->{'emailaddress'} ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ EOF print PRINTER $slip; - close PRINTER; - return $slip; + close PRINTER; + return $slip; } =item printslip - &printslip($env, $text) - -Prints the string C<$text> to a printer. C<$env-E{queue}> -specifies the queue to print to. - -If C<$env-E{queue}> is empty or set to C, C<&printslip> -will print to the file F. + &printslip($borrowernumber) + print a slip for the given $borrowernumber + =cut + #' -# FIXME - There's also a &printslip in circ/circulation.pl -sub printslip { - my($env, $slip)=@_; - my $printer = $env->{'printer'}; - (return) unless (C4::Context->boolean_preference('printcirculationslips')); - if ($printer eq "" || $printer eq 'nulllp') { - open (PRINTER,">/tmp/kohares"); - } else { - open (PRINTER, "| lpr -P $printer >/dev/null") or die "Couldn't write to queue:$!\n"; - } - print PRINTER $slip; - close PRINTER; +sub printslip ($) { + my $borrowernumber = shift; + my $borrower = GetMemberDetails($borrowernumber); + my $issueslist = GetPendingIssues($borrowernumber); + foreach my $it (@$issueslist){ + $it->{'date_due'}=format_date($it->{'date_due'}); + } + my @issues = sort { $b->{'timestamp'} <=> $a->{'timestamp'} } @$issueslist; + remoteprint(\@issues, $borrower ); } -END { } # module clean-up code here (global destructor) +END { } # module clean-up code here (global destructor) 1; __END__