[Koha-cvs] CVS: koha/telnet doreturns.pl,1.2,1.3

[Andrew Arensburger]

Update of /cvsroot/koha/koha/telnet
In directory usw-pr-cvs1:/tmp/cvs-serv31790/telnet

Modified Files:
        doreturns.pl 
Log Message:
Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.


Index: doreturns.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/doreturns.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** doreturns.pl        14 Aug 2002 18:12:54 -0000      1.2
--- doreturns.pl        5 Oct 2002 10:16:57 -0000       1.3
***************
*** 20,24 ****
  
  use DBI;
! use C4::Database;
  use C4::Accounts;
  use C4::InterfaceCDK;
--- 20,24 ----
  
  use DBI;
! use C4::Context;
  use C4::Accounts;
  use C4::InterfaceCDK;
***************
*** 32,44 ****
  
  
! my %env = (                                                                   
                   
! branchcode => $ARGV[0], usercode => $ARGV[1], proccode => "lgon", 
borrowernumber => "",        
! logintime  => "", lasttime => "", tempuser => "", debug => "9",               
                 
! telnet => $ARGV[2], queue => $ARGV[3], printtype => $ARGV[4], brdata => 
$ARGV[5]               
! );  
  my $env=\%env;
  
  
! my $dbh=&C4Connect;
  my @items;
  @items[0]=" "x50;
--- 32,44 ----
  
  
! my %env = (
! branchcode => $ARGV[0], usercode => $ARGV[1], proccode => "lgon", 
borrowernumber => "",
! logintime  => "", lasttime => "", tempuser => "", debug => "9",
! telnet => $ARGV[2], queue => $ARGV[3], printtype => $ARGV[4], brdata => 
$ARGV[5]
! );
  my $env=\%env;
  
  
! my $dbh = C4::Context->dbh;
  my @items;
  @items[0]=" "x50;
***************
*** 56,84 ****
  startint();
  until ($reason ne "") {
!   ($reason,$item) = returnwindow($env,"Enter 
Returns",$item,address@hidden,$borrower,$amt_owing,$odues,$dbh,$resp); 
#C4::Circulation                                                        
    if ($reason eq "")  {
!     $resp = "";                                                               
                                                     
!     ($resp,$bornum,$borrower,$itemno,$itemrec,$amt_owing) = 
C4::Circulation::Returns::checkissue($env,$dbh,$item);                          
                                                                      
!     if ($bornum ne "") {                                                      
                                                     
!       ($issues,$odues,$amt_owing) = borrdata2($env,$bornum);                  
                                                    
!     } else {                                                                  
                                                     
!       $issues = "";                                                           
                                                     
!       $odues = "";                                                            
                                                     
!       $amt_owing = "";                                                        
                                                     
!     }                                                                         
                                                     
!     if ($resp ne "") {                                                        
                                                     
!       if ($itemno ne "" ) {                                                   
                                                     
!         my $item = itemnodata($env,$dbh,$itemno);                             
                                                     
!       my $fmtitem = 
C4::Circulation::Issues::formatitem($env,$item,"",$amt_owing);                  
                             
!       unshift @items,$fmtitem;                                                
                                                   
!       if ($items[20] > "") {                                                  
                                                   
!         pop @items;                                                           
                                                   
!       }                                                                       
                                                   
!       }                                                                       
                                                     
!     }                                                                         
                                                     
!   }                                                                           
                                                     
! }                                                                             
                                                     
  die;
- $dbh->disconnect;                                                             
                                                     
  
  
--- 56,83 ----
  startint();
  until ($reason ne "") {
!   ($reason,$item) = returnwindow($env,"Enter 
Returns",$item,address@hidden,$borrower,$amt_owing,$odues,$dbh,$resp); 
#C4::Circulation
    if ($reason eq "")  {
!     $resp = "";
!     ($resp,$bornum,$borrower,$itemno,$itemrec,$amt_owing) = 
C4::Circulation::Returns::checkissue($env,$dbh,$item);
!     if ($bornum ne "") {
!       ($issues,$odues,$amt_owing) = borrdata2($env,$bornum);
!     } else {
!       $issues = "";
!       $odues = "";
!       $amt_owing = "";
!     }
!     if ($resp ne "") {
!       if ($itemno ne "" ) {
!         my $item = itemnodata($env,$dbh,$itemno);
!       my $fmtitem = 
C4::Circulation::Issues::formatitem($env,$item,"",$amt_owing);
!       unshift @items,$fmtitem;
!       if ($items[20] > "") {
!         pop @items;
!       }
!       }
!     }
!   }
! }
  die;