[Koha-cvs] CVS: koha/C4 Print.pm,1.13,1.14

[Steve Tonnesen]

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

Modified Files:
	Print.pm 
Log Message:
Merging from rel-1-2 to trunk


Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Print.pm	10 Oct 2002 04:42:35 -0000	1.13
--- Print.pm	28 Oct 2002 20:02:59 -0000	1.14
***************
*** 23,26 ****
--- 23,29 ----
  #use C4::InterfaceCDK;
  
+ use C4::Context;
+ 
+ 
  use vars qw($VERSION @ISA @EXPORT);
  
***************
*** 47,51 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printslip);
  
  =item remoteprint
--- 50,54 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve &printslip);
  
  =item remoteprint
***************
*** 72,79 ****
  sub remoteprint {
    my ($env,$items,$borrower)=@_;
!   #open (FILE,">/tmp/olwen");
!   #print FILE "queue $env->{'queue'}";
!   #close FILE;
!   #debug_msg($env,"In print");
    my $file=time;		# FIXME - Not used
    my $queue = $env->{'queue'};
--- 75,80 ----
  sub remoteprint {
    my ($env,$items,$borrower)=@_;
! 
!   (return) unless (C4::Context->preference('printcirculationslips'));
    my $file=time;		# FIXME - Not used
    my $queue = $env->{'queue'};
***************
*** 92,96 ****
      # printing package has a wrapper script called 'lpr'. It'd still
      # be better to be able to customize this.
!     open(PRINTER, "| lpr -P $queue") or die "Couldn't write to queue:$queue!\n";
    }
  #  print $queue;
--- 93,97 ----
      # 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;
***************
*** 127,130 ****
--- 128,172 ----
  }
  
+ sub printreserve {
+   my($env, $branchname, $bordata, $itemdata)=@_;
+   my $file=time;
+   my $printer = $env->{'printer'};
+   (return) unless (C4::Context->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";
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 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;
+ }
+ 
  =item printslip
  
***************
*** 143,150 ****
    my($env, $slip)=@_;
    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;
--- 185,193 ----
    my($env, $slip)=@_;
    my $printer = $env->{'printer'};
+   (return) unless (C4::Context->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;