X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FPrint.pm;h=6683119d4bf86548293c327f111ec115eb57a022;hb=827ef0e83c594d92c2fc387760b3f0e43adfe032;hp=c0b37c8a12f992db66fe525536773d52f94e90d0;hpb=55409868114f406659761cffc274d8dd72ebb72b;p=koha.git

diff --git a/C4/Print.pm b/C4/Print.pm
index c0b37c8a12..6683119d4b 100644
--- a/C4/Print.pm
+++ b/C4/Print.pm
@@ -25,10 +25,10 @@ use vars qw($VERSION @ISA @EXPORT);
 
 BEGIN {
 	# set the version for version checking
-	$VERSION = 3.01;
+    $VERSION = 3.07.00.049;
 	require Exporter;
 	@ISA    = qw(Exporter);
-	@EXPORT = qw(&printslip);
+    @EXPORT = qw(&NetworkPrint);
 }
 
 =head1 NAME
@@ -45,45 +45,16 @@ The functions in this module handle sending text to a printer.
 
 =head1 FUNCTIONS
 
-=cut
-
-=for comment
-    my $slip = <<"EOF";
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Date: $todaysdate;
-
-ITEM RESERVED:
-$itemdata->{'title'} ($itemdata->{'author'})
-barcode: $itemdata->{'barcode'}
+=head2 NetworkPrint
 
-COLLECT AT: $branchname
+  &NetworkPrint($text)
 
-BORROWER:
-$bordata->{'surname'}, $bordata->{'firstname'}
-card number: $bordata->{'cardnumber'}
-Phone: $bordata->{'phone'}
-$bordata->{'streetaddress'}
-$bordata->{'suburb'}
-$bordata->{'town'}
-$bordata->{'emailaddress'}
+Queue some text for printing on the selected branch printer
 
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-EOF
 =cut
 
-=head2 printslip
-
-  &printslip($slip)
-
-print a slip for the given $borrowernumber and $branchcode
-
-=cut
-
-sub printslip ($) {
-    my ($slip) = @_;
-
-    return unless ( C4::Context->boolean_preference('printcirculationslips') );
+sub NetworkPrint {
+    my ($text) = @_;
 
 # FIXME - It'd be nifty if this could generate pretty PostScript.
 
@@ -96,9 +67,11 @@ sub printslip ($) {
     # 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}".
+
+    my $fh;
     if ( $queue eq "" || $queue eq 'nulllp' ) {
         return;
-	#open( PRINTER, ">/tmp/kohaiss" );
+	#open( $fh, ">/tmp/kohaiss" );
     }
     else {
 
@@ -106,15 +79,15 @@ sub printslip ($) {
         # 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" )
+        open( $fh, "-|", "lpr -P $queue > /dev/null" )
           or die "Couldn't write to queue:$queue!\n";
     }
 
     #  print $queue;
     #open (FILE,">/tmp/$file");
-    print PRINTER $slip;
-    print PRINTER "\r\n" x 7 ;
-    close PRINTER;
+    print $fh $text;
+    print $fh "\r\n" x 7 ;
+    close $fh;
 
     #system("lpr /tmp/$file");
 }