[Koha-cvs] CVS: koha/C4 Print.pm,1.3.2.4,1.3.2.5

[Chris Cormack]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv27379/C4

Modified Files:
      Tag: rel-1-2
        Print.pm 
Log Message:
Merging across print.pm fixes bug 80
missing printslip routine


Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** Print.pm    14 Aug 2002 18:30:50 -0000      1.3.2.4
--- Print.pm    16 Aug 2002 22:50:05 -0000      1.3.2.5
***************
*** 29,33 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve);
  
  sub remoteprint {
--- 29,34 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve &printslip);
! 
  
  sub remoteprint {
***************
*** 73,102 ****
  
  sub printreserve {
!   my($env,$resrec,$rbordata,$itemdata)address@hidden;
    my $file=time;
!   my $queue = $env->{'queue'};
!   #if ($queue eq "") {
      open (PRINTER,">/tmp/kohares");
!   #} else {
!   #  open (PRINTER, "| lpr -P $queue") or die "Couldn't write to queue:$!\n";
!   #}  
!   print PRINTER "Collect at $resrec->{'branchcode'}\r\n\r\n";
!   print PRINTER "$rbordata->{'surname'}; $rbordata->{'firstname'}\r\n";
!   print PRINTER "$rbordata->{'cardnumber'}\r\n";
!   print PRINTER "Phone: $rbordata->{'phone'}\r\n";
!   print PRINTER "$rbordata->{'streetaddress'}\r\n";
!   print PRINTER "$rbordata->{'suburb'}\r\n";
!   print PRINTER "$rbordata->{'town'}\r\n";   
!   print PRINTER "$rbordata->{'emailaddress'}\r\n\r\n";
!   print PRINTER "$itemdata->{'barcode'}\r\n";
!   print PRINTER "$itemdata->{'title'}\r\n";
!   print PRINTER "$itemdata->{'author'}";
!   print PRINTER "\r\n\r\n\r\n\r\n\r\n\r\n\r\n";
!   if ($env->{'printtype'} eq "docket"){ 
!     #print chr(27).char(105);
!   }  
    close PRINTER;
-   #system("lpr /tmp/$file"); 
  }
  END { }       # module clean-up code here (global destructor)
    
--- 74,128 ----
  
  sub printreserve {
!   my($env, $branchname, $bordata, $itemdata)address@hidden;
    my $file=time;
!   my $printer = $env->{'printer'};
!   if ($printer eq "" || $printer eq 'nulllp') {
!     open (PRINTER,">>/tmp/kohares");
!   } else {
!     open (PRINTER, "| lpr -P $printer") 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";
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Date: $todaysdate;
! 
! ITEM RESERVED: 
! $itemdata->{'title'} ($itemdata->{'author'})
! barcode: $itemdata->{'barcode'}
! 
! COLLECT AT: $branchname
! 
! BORROWER:
! $bordata->{'surname'}, $bordata->{'firstname'}
! card number: $bordata->{'cardnumber'}
! Phone: $bordata->{'phone'}
! $bordata->{'streetaddress'}
! $bordata->{'suburb'}
! $bordata->{'town'}
! $bordata->{'emailaddress'}
! 
! 
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! EOF
!     print PRINTER $slip;
!   close PRINTER;
!   return $slip;
! }
! 
! sub printslip {
!   my($env, $slip)address@hidden;
!   my $printer = $env->{'printer'};
!   if ($printer eq "" || $printer eq 'nulllp') {
      open (PRINTER,">/tmp/kohares");
!   } else {
!     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
!   }
!   print PRINTER $slip;
    close PRINTER;
  }
+ 
  END { }       # module clean-up code here (global destructor)