X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FPrint.pm;h=6683119d4bf86548293c327f111ec115eb57a022;hb=08382876306cfda839637c5f72a107b304458a8e;hp=2ba7584d2bf363418a84cabafc83bfde2f65c5a3;hpb=b9d743a9281bfd6c853ffaa639577e1801f3b71b;p=koha.git

diff --git a/C4/Print.pm b/C4/Print.pm
index 2ba7584d2b..6683119d4b 100644
--- a/C4/Print.pm
+++ b/C4/Print.pm
@@ -20,17 +20,15 @@ package C4::Print;
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
-use C4::Members;
-use C4::Dates qw(format_date);
 
 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(&remoteprint &printreserve &printslip);
+    @EXPORT = qw(&NetworkPrint);
 }
 
 =head1 NAME
@@ -47,28 +45,19 @@ The functions in this module handle sending text to a printer.
 
 =head1 FUNCTIONS
 
-=head2 remoteprint
+=head2 NetworkPrint
 
-  &remoteprint($items, $borrower);
+  &NetworkPrint($text)
 
-Prints the list of items in C<$items> to a printer.
-
-C<$borrower> is a reference-to-hash giving information about a patron.
-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<&GetBorrowerIssues>.
+Queue some text for printing on the selected branch printer
 
 =cut
 
+sub NetworkPrint {
+    my ($text) = @_;
+
 # FIXME - It'd be nifty if this could generate pretty PostScript.
-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
@@ -78,8 +67,11 @@ sub remoteprint ($$) {
     # 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' ) {
-        open( PRINTER, ">/tmp/kohaiss" );
+        return;
+	#open( $fh, ">/tmp/kohaiss" );
     }
     else {
 
@@ -87,106 +79,19 @@ sub remoteprint ($$) {
         # 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");
-    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;
+    print $fh $text;
+    print $fh "\r\n" x 7 ;
+    close $fh;
 
     #system("lpr /tmp/$file");
 }
 
-sub printreserve {
-    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;
-
-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;
-}
-
-=head2 printslip
-
-  &printslip($borrowernumber)
-
-print a slip for the given $borrowernumber
-
-=cut
-
-#'
-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)
-
 1;
 __END__