[Koha-cvs] CVS: koha/acqui newbasket2.pl,1.5,1.6

[Andrew Arensburger]

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv23687

Modified Files:
        newbasket2.pl 
Log Message:
Added some FIXME comments.
Removed trailing whitespace.


Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** newbasket2.pl       14 Aug 2002 18:12:52 -0000      1.5
--- newbasket2.pl       13 Oct 2002 06:30:50 -0000      1.6
***************
*** 31,44 ****
  my $input = new CGI;
  print $input->header;
! #whether it is called from the opac of the intranet                           
                                 
! my $type=$input->param('type');                                               
   
  if ($type eq ''){
    $type = 'intra';
  }
! #setup colours                                                                
                                 
! my $main;                                                                     
                                 
! my $secondary;                                                                
                                 
!   $main='#cccc99';                                                            
                                 
!   $secondary='#ffffcc';                                                       
                                 
  
  
--- 31,44 ----
  my $input = new CGI;
  print $input->header;
! #whether it is called from the opac of the intranet
! my $type=$input->param('type');
  if ($type eq ''){
    $type = 'intra';
  }
! #setup colours
! my $main;
! my $secondary;
!   $main='#cccc99';
!   $secondary='#ffffcc';
  
  
***************
*** 109,117 ****
  
  print "You searched on ";
! while ( my ($key, $value) = each %search) {                                 
    if ($value ne ''){
      $value=~ s/\\//g;
      print bold("$key $value,");
!   }                          
  }
  print " $count results found";
--- 109,117 ----
  
  print "You searched on ";
! while ( my ($key, $value) = each %search) {
    if ($value ne ''){
      $value=~ s/\\//g;
      print bold("$key $value,");
!   }
  }
  print " $count results found";
***************
*** 153,157 ****
      } else {
        
$result->{'title'}=mklink("/cgi-bin/koha/acqui/newbiblio.pl?sub=$sub&author=$author2&copyright=$copyright&id=$id&basket=$basket&biblio=$result->{'biblionumber'}&title=$title2",$result->{'title'});
!     }  
      my $word=$result->{'author'};
        $word=~ s/([a-z]) +([a-z])/$1%20$2/ig;
--- 153,157 ----
      } else {
        
$result->{'title'}=mklink("/cgi-bin/koha/acqui/newbiblio.pl?sub=$sub&author=$author2&copyright=$copyright&id=$id&basket=$basket&biblio=$result->{'biblionumber'}&title=$title2",$result->{'title'});
!     }
      my $word=$result->{'author'};
        $word=~ s/([a-z]) +([a-z])/$1%20$2/ig;
***************
*** 165,217 ****
        $itemcount=$count;
        if ($nacount > 0){
!         $location=$location."On Loan";
!       if ($nacount >1 ){                                                      
                                                   
!         $location=$location." ($nacount)";                                    
                                                        
!          }                                                                    
                                                     
         $location.=" ";
        }
        if ($lcount > 0){
!          $location=$location."Levin";
!          if ($lcount >1 ){                                                    
                                                     
!         $location=$location." ($lcount)";                                     
                                                       
!          }                                                                    
                                                     
         $location.=" ";
        }
        if ($fcount > 0){
!         $location=$location."Foxton";
!          if ($fcount >1 ){                                                    
                                                     
!         $location=$location." ($fcount)";                                     
                                                       
!          }                                                                    
                                                     
!        $location.=" ";        
        }
        if ($scount > 0){
!         $location=$location."Shannon";
!          if ($scount >1 ){                                                    
                                                     
!         $location=$location." ($scount)";                                     
                                                       
!          }                                                                    
                                                     
!        $location.=" ";        
        }
        if ($lostcount > 0){
!         $location=$location."Lost";
!          if ($lostcount >1 ){                                                 
                                                        
!         $location=$location." ($lostcount)";                                  
                                                          
!          }                                                                    
                                                     
!        $location.=" ";        
        }
        if ($mending > 0){
!         $location=$location."Mending";
!          if ($mending >1 ){                                                   
                                                      
!         $location=$location." ($mending)";                                    
                                                        
!          }                                                                    
                                                     
!        $location.=" ";        
        }
        if ($transit > 0){
!         $location=$location."In Transiit";
!          if ($transit >1 ){                                                   
                                                      
!         $location=$location." ($transit)";                                    
                                                        
!          }                                                                    
                                                     
!        $location.=" ";        
        }
!       
      if ($colour == 1){
        print 
mktablerow(6,$secondary,$result->{'title'},$result->{'author'},$result->{'copyrightdate'},$itemcount,$location);
--- 165,217 ----
        $itemcount=$count;
        if ($nacount > 0){
!         $location=$location."On Loan";                # FIXME - .=
!       if ($nacount >1 ){
!         $location=$location." ($nacount)";    # FIXME - .=
!          }
         $location.=" ";
        }
        if ($lcount > 0){
!          $location=$location."Levin";         # FIXME - .=
!          if ($lcount >1 ){
!         $location=$location." ($lcount)";     # FIXME - .=
!          }
         $location.=" ";
        }
        if ($fcount > 0){
!         $location=$location."Foxton";         # FIXME - .=
!          if ($fcount >1 ){
!         $location=$location." ($fcount)";     # FIXME - .=
!          }
!        $location.=" ";
        }
        if ($scount > 0){
!         $location=$location."Shannon";                # FIXME - .=
!          if ($scount >1 ){
!         $location=$location." ($scount)";     # FIXME - .=
!          }
!        $location.=" ";
        }
        if ($lostcount > 0){
!         $location=$location."Lost";           # FIXME - .=
!          if ($lostcount >1 ){
!         $location=$location." ($lostcount)";  # FIXME - .=
!          }
!        $location.=" ";
        }
        if ($mending > 0){
!         $location=$location."Mending";                # FIXME - .=
!          if ($mending >1 ){
!         $location=$location." ($mending)";    # FIXME - .=
!          }
!        $location.=" ";
        }
        if ($transit > 0){
!         $location=$location."In Transiit";    # FIXME - .=
!          if ($transit >1 ){
!         $location=$location." ($transit)";    # FIXME - .=
!          }
!        $location.=" ";
        }
! 
      if ($colour == 1){
        print 
mktablerow(6,$secondary,$result->{'title'},$result->{'author'},$result->{'copyrightdate'},$itemcount,$location);