[Koha-cvs] CVS: koha/C4 InterfaceCDK.pm,1.6,1.7

[Andrew Arensburger]

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

Modified Files:
        InterfaceCDK.pm 
Log Message:
Removed trailing whitespace.


Index: InterfaceCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/InterfaceCDK.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** InterfaceCDK.pm     11 Oct 2002 12:37:47 -0000      1.6
--- InterfaceCDK.pm     13 Oct 2002 09:31:35 -0000      1.7
***************
*** 35,42 ****
  use DBI;
  use vars qw($VERSION @ISA @EXPORT);
!   
  # set the version for version checking
  $VERSION = 0.01;
!     
  @ISA = qw(Exporter);
  @EXPORT = qw(&dialog &startint &endint &output &clearscreen &pause &helptext
--- 35,42 ----
  use DBI;
  use vars qw($VERSION @ISA @EXPORT);
! 
  # set the version for version checking
  $VERSION = 0.01;
! 
  @ISA = qw(Exporter);
  @EXPORT = qw(&dialog &startint &endint &output &clearscreen &pause &helptext
***************
*** 48,52 ****
      # is this planned for something?
  }
!       
  sub startint {
    my ($env,$msg)address@hidden;
--- 48,52 ----
      # is this planned for something?
  }
! 
  sub startint {
    my ($env,$msg)address@hidden;
***************
*** 65,69 ****
      $mitems[$x]="<C>".$items[$x];
      $x++;
!   }  
    if ($type eq 'console'){
      my $menucnt = @items;
--- 65,69 ----
      $mitems[$x]="<C>".$items[$x];
      $x++;
!   }
    if ($type eq 'console'){
      my $menucnt = @items;
***************
*** 72,83 ****
        'Height'=> $menucnt+4,
        'Width'=> 26);
!     # Activate the object.         
      my ($menuItem) = $menu->activate();
      # Check the results.
      undef $menu;
!     if (!defined $menuItem) {      
        $data = "Quit";
      }
!     else { 
        $data = $items[$menuItem];
      }
--- 72,83 ----
        'Height'=> $menucnt+4,
        'Width'=> 26);
!     # Activate the object.
      my ($menuItem) = $menu->activate();
      # Check the results.
      undef $menu;
!     if (!defined $menuItem) {
        $data = "Quit";
      }
!     else {
        $data = $items[$menuItem];
      }
***************
*** 88,97 ****
  
  # FIXME - Is this a placeholder?
! sub clearscreen { 
  }
  
  # FIXME - Is this a placeholder?
  sub pause {
!  
  }
  
--- 88,97 ----
  
  # FIXME - Is this a placeholder?
! sub clearscreen {
  }
  
  # FIXME - Is this a placeholder?
  sub pause {
! 
  }
  
***************
*** 163,167 ****
  #  } else {
  #    print "****DEBUG $text****";
!   }  
    return();
  }
--- 163,167 ----
  #  } else {
  #    print "****DEBUG $text****";
!   }
    return();
  }
***************
*** 191,207 ****
    my $x = 0;
    while (@$brrecs[$x] ne "") {
!     my $brrec address@hidden; 
      $mitems[$x]=fmtstr($env,$brrec->{'branchcode'},"L6");
      $mitems[$x]=$mitems[$x].fmtstr($env,$brrec->{'branchname'},"L20");
      $x++;
!   }  
    my $menu = new Cdk::Scroll ('Title'=>"  ",
        'List'=>address@hidden,
        'Height'=> 16,
        'Width'=> 30);
!   # Activate the object.         
    my ($menuItem) = $menu->activate();
    # Check the results.
!   if (defined $menuItem) {      
      my $brrec = @$brrecs[$menuItem];
      $env->{'branchcode'} = $brrec->{'branchcode'};
--- 191,207 ----
    my $x = 0;
    while (@$brrecs[$x] ne "") {
!     my $brrec address@hidden;
      $mitems[$x]=fmtstr($env,$brrec->{'branchcode'},"L6");
      $mitems[$x]=$mitems[$x].fmtstr($env,$brrec->{'branchname'},"L20");
      $x++;
!   }
    my $menu = new Cdk::Scroll ('Title'=>"  ",
        'List'=>address@hidden,
        'Height'=> 16,
        'Width'=> 30);
!   # Activate the object.
    my ($menuItem) = $menu->activate();
    # Check the results.
!   if (defined $menuItem) {
      my $brrec = @$brrecs[$menuItem];
      $env->{'branchcode'} = $brrec->{'branchcode'};
***************
*** 211,215 ****
    undef $titlebar;
    return();
!   
  }
  
--- 211,215 ----
    undef $titlebar;
    return();
! 
  }
  
***************
*** 221,238 ****
    my $x = 0;
    while (@$prrecs[$x] ne "") {
!     my $prrec address@hidden; 
      $mitems[$x]=fmtstr($env,$prrec->{'printername'},"L20");
      $x++;
!   }  
    my $menu = new Cdk::Scroll ('Title'=>"  ",
        'List'=>address@hidden,
        'Height'=> 16,
        'Width'=> 30);
!   # Activate the object.         
    my ($menuItem) = $menu->activate();
    undef $menu;
    undef $titlebar;
    # Check the results.
!   if (defined $menuItem) {      
      my $prrec = @$prrecs[$menuItem];
      $env->{'queue'} = $prrec->{'printqueue'};
--- 221,238 ----
    my $x = 0;
    while (@$prrecs[$x] ne "") {
!     my $prrec address@hidden;
      $mitems[$x]=fmtstr($env,$prrec->{'printername'},"L20");
      $x++;
!   }
    my $menu = new Cdk::Scroll ('Title'=>"  ",
        'List'=>address@hidden,
        'Height'=> 16,
        'Width'=> 30);
!   # Activate the object.
    my ($menuItem) = $menu->activate();
    undef $menu;
    undef $titlebar;
    # Check the results.
!   if (defined $menuItem) {
      my $prrec = @$prrecs[$menuItem];
      $env->{'queue'} = $prrec->{'printqueue'};
***************
*** 240,244 ****
    }
    return();
!   
  }
  
--- 240,244 ----
    }
    return();
! 
  }
  
***************
*** 255,267 ****
    my $matrix = new Cdk::Matrix (
       'ColTitles'=> address@hidden,
!      'RowTitles'=> address@hidden, 
       'ColWidths'=> address@hidden,
       'ColTypes'=>  address@hidden,
!      'Vrows'=>     1, 
       'Vcols'=>     2);
    borrbind($env,$matrix);
    #$matrix->draw();
!   my ($rows,$cols,$info) = $matrix->activate(); 
!   if ((!defined $rows) && ($info->[0][0] eq "")) { 
      $result = "Circ";
    } else {
--- 255,267 ----
    my $matrix = new Cdk::Matrix (
       'ColTitles'=> address@hidden,
!      'RowTitles'=> address@hidden,
       'ColWidths'=> address@hidden,
       'ColTypes'=>  address@hidden,
!      'Vrows'=>     1,
       'Vcols'=>     2);
    borrbind($env,$matrix);
    #$matrix->draw();
!   my ($rows,$cols,$info) = $matrix->activate();
!   if ((!defined $rows) && ($info->[0][0] eq "")) {
      $result = "Circ";
    } else {
***************
*** 285,289 ****
    if (!defined $returnValue) {
      #$result = "Circ";
!   } else {  
      $result = substr(@$borrows[$returnValue],0,9);
    }
--- 285,289 ----
    if (!defined $returnValue) {
      #$result = "Circ";
!   } else {
      $result = substr(@$borrows[$returnValue],0,9);
    }
***************
*** 320,330 ****
    $scroll1->draw();
    $funcmenu->draw();
!   $loanlength->draw(); 
!   $borrbox->draw();   
    #$env->{'loanlength'} = "";
    #debug_msg($env,"clear len");
    my $x;
    my $barcode;
!   $entryBox->preProcess ('Function' => 
      sub{prebook(@_,$env,$dbh,$funcmenu,$entryBox,$loanlength,
      $scroll1,$scroll2,$borrower,$amountowing,$odues);});
--- 320,330 ----
    $scroll1->draw();
    $funcmenu->draw();
!   $loanlength->draw();
!   $borrbox->draw();
    #$env->{'loanlength'} = "";
    #debug_msg($env,"clear len");
    my $x;
    my $barcode;
!   $entryBox->preProcess ('Function' =>
      sub{prebook(@_,$env,$dbh,$funcmenu,$entryBox,$loanlength,
      $scroll1,$scroll2,$borrower,$amountowing,$odues);});
***************
*** 348,354 ****
    undef $loanlength;
    Cdk::refreshCdkScreen();
!   #debug_msg($env,"exiting");    
    return $barcode,$reason;
! }  
  sub actfmenu {
    my ($env,$dbh,$funcmenu,$entryBox,$loanlength,$scroll1,
--- 348,354 ----
    undef $loanlength;
    Cdk::refreshCdkScreen();
!   #debug_msg($env,"exiting");
    return $barcode,$reason;
! }
  sub actfmenu {
    my ($env,$dbh,$funcmenu,$entryBox,$loanlength,$scroll1,
***************
*** 358,362 ****
    } elsif ($funct == 0 ) {
      actloanlength ($env,$entryBox,$loanlength,$scroll1,$scroll2);
!   } elsif ($funct == 1 ) { 
      $entryBox->erase();
      $scroll1->erase();
--- 358,362 ----
    } elsif ($funct == 0 ) {
      actloanlength ($env,$entryBox,$loanlength,$scroll1,$scroll2);
!   } elsif ($funct == 1 ) {
      $entryBox->erase();
      $scroll1->erase();
***************
*** 386,390 ****
    $entryBox->register();
    return
! }  
  sub actscroll1 {
    my ($env,$entryBox,$loanlength,$scroll1,$scroll2) = @_;
--- 386,390 ----
    $entryBox->register();
    return
! }
  sub actscroll1 {
    my ($env,$entryBox,$loanlength,$scroll1,$scroll2) = @_;
***************
*** 408,412 ****
        $env->{'loanlength'} = "";
        $validdate = "Y";
!     } else {    
        my $date = ParseDate($loanlength);
        if ( $date > ParseDate('today')){
--- 408,412 ----
        $env->{'loanlength'} = "";
        $validdate = "Y";
!     } else {
        my $date = ParseDate($loanlength);
        if ( $date > ParseDate('today')){
***************
*** 415,423 ****
        #debug_msg($env,"$date $fdate");
          $env->{'loanlength'} = $fdate;
!       } else { 
!         error_msg($env,"Invalid date"); 
        }
      }
!   }  
    return;
  }
--- 415,423 ----
        #debug_msg($env,"$date $fdate");
          $env->{'loanlength'} = $fdate;
!       } else {
!         error_msg($env,"Invalid date");
        }
      }
!   }
    return;
  }
***************
*** 427,431 ****
      $scroll1,$scroll2,$borrower,$amountowing,$odues)= @_;
    # FIXME - $key_tab is undefined
!   if ($input eq $key_tab) {    
      actfmenu ($env,$dbh,$funcmenu,$entryBox,$loanlength,$scroll1,
         $scroll2,$borrower,$amountowing,$odues);
--- 427,431 ----
      $scroll1,$scroll2,$borrower,$amountowing,$odues)= @_;
    # FIXME - $key_tab is undefined
!   if ($input eq $key_tab) {
      actfmenu ($env,$dbh,$funcmenu,$entryBox,$loanlength,$scroll1,
         $scroll2,$borrower,$amountowing,$odues);
***************
*** 434,438 ****
    return 1;
  }
!                                                         
  sub borrowerbox {
    my ($env,$borrower,$amountowing,$odues) = @_;
--- 434,438 ----
    return 1;
  }
! 
  sub borrowerbox {
    my ($env,$borrower,$amountowing,$odues) = @_;
***************
*** 454,458 ****
    if ($odues > 0) {
      $line = $line." </R>ODUE<!R>";
!   }   
    if ($borrower->{'borrowernotes'} ne "" ) {
      $line = $line." </R>NOTES<!R>";
--- 454,458 ----
    if ($odues > 0) {
      $line = $line." </R>ODUE<!R>";
!   }
    if ($borrower->{'borrowernotes'} ne "" ) {
      $line = $line." </R>NOTES<!R>";
***************
*** 463,467 ****
    $borrinfo[2]=$line;
    if ($borrower->{'borrowernotes'} ne "" ) {
!     $borrinfo[3]=substr($borrower->{'borrowernotes'},0,40);     
    }
    my $borrbox = new Cdk::Label ('Message' =>address@hidden,
--- 463,467 ----
    $borrinfo[2]=$line;
    if ($borrower->{'borrowernotes'} ne "" ) {
!     $borrinfo[3]=substr($borrower->{'borrowernotes'},0,40);
    }
    my $borrbox = new Cdk::Label ('Message' =>address@hidden,
***************
*** 482,487 ****
    $funcmenu->draw();
    my $borrbox;
!   if ($borrower->{'cardnumber'} ne "") {    
!     $borrbox = borrowerbox($env,$borrower,$amountowing);  
      $borrbox->draw();
    } else {
--- 482,487 ----
    $funcmenu->draw();
    my $borrbox;
!   if ($borrower->{'cardnumber'} ne "") {
!     $borrbox = borrowerbox($env,$borrower,$amountowing);
      $borrbox->draw();
    } else {
***************
*** 492,496 ****
        $borrbox->draw();
      }
!   }  
    my $bookentry  =  new Cdk::Entry('Label'=>" ",
       'Max'=>"11",'Width'=>"11",
--- 492,496 ----
        $borrbox->draw();
      }
!   }
    my $bookentry  =  new Cdk::Entry('Label'=>" ",
       'Max'=>"11",'Width'=>"11",
***************
*** 569,575 ****
         #Cdk::refreshCdkScreen();
      }
!   } 
  }
!   
  sub act {
    my ($obj) = @_;
--- 569,575 ----
         #Cdk::refreshCdkScreen();
      }
!   }
  }
! 
  sub act {
    my ($obj) = @_;
***************
*** 579,583 ****
  
  sub borrbind {
!   my ($env,$entry) = @_; 
    my $lastborr = $env->{"bcard"};
    $entry->preProcess ('Function' => sub {preborr (@_, $env,$entry);});
--- 579,583 ----
  
  sub borrbind {
!   my ($env,$entry) = @_;
    my $lastborr = $env->{"bcard"};
    $entry->preProcess ('Function' => sub {preborr (@_, $env,$entry);});
***************
*** 587,602 ****
    my ($input,$env, $entry) = @_;
    if ($env->{"bcard"} ne "") {
! #     error_msg($env,"hi there");  
      # FIXME - $lastval is undefined
      if ($input eq $lastval) {
! #        error_msg($env,"its a ctrl-r");  
        borfill($env,$entry);
        return 0;
      }
!   } 
    return 1;
! }  
!   
!   
  sub borfill {
    my ($env,$entry) = @_;
--- 587,602 ----
    my ($input,$env, $entry) = @_;
    if ($env->{"bcard"} ne "") {
! #     error_msg($env,"hi there");
      # FIXME - $lastval is undefined
      if ($input eq $lastval) {
! #        error_msg($env,"its a ctrl-r");
        borfill($env,$entry);
        return 0;
      }
!   }
    return 1;
! }
! 
! 
  sub borfill {
    my ($env,$entry) = @_;
***************
*** 610,616 ****
      $i++;
    }
!    
  }
!                              
  END { }       # module clean-up code here (global destructor)
  
--- 610,616 ----
      $i++;
    }
! 
  }
! 
  END { }       # module clean-up code here (global destructor)