[Koha-cvs] CVS: koha subjectsearch.pl,1.3,1.4

[Andrew Arensburger]

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

Modified Files:
        subjectsearch.pl 
Log Message:
Added magic RCS comment.
Removed trailing whitespace.


Index: subjectsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/subjectsearch.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** subjectsearch.pl    14 Aug 2002 18:12:51 -0000      1.3
--- subjectsearch.pl    13 Oct 2002 07:35:31 -0000      1.4
***************
*** 1,4 ****
--- 1,6 ----
  #!/usr/bin/perl
  
+ # $Id$
+ 
  #script to display detailed information
  #written 8/11/99
***************
*** 38,50 ****
  #my $title=$input->param('title');
  
! my $main;                                                                     
                                                            
! my $secondary;                                                                
                                                            
! if ($type eq 'opac'){                                                         
                                                            
!   $main='#99cccc';                                                            
                                                            
!   $secondary='#efe5ef';                                                       
                                                            
! } else {                                                                      
                                                            
!   $main='#99cc33';                                                            
                                                            
!   $secondary='#ffffcc';                                                       
                                                            
! }      
  
  my @items=subsearch(\$blah,$subject);
--- 40,52 ----
  #my $title=$input->param('title');
  
! my $main;
! my $secondary;
! if ($type eq 'opac'){
!   $main='#99cccc';
!   $secondary='#efe5ef';
! } else {
!   $main='#99cc33';
!   $secondary='#ffffcc';
! }
  
  my @items=subsearch(\$blah,$subject);
***************
*** 55,61 ****
  print mktablehdr;
  if ($type ne 'opac'){
!   print 
mktablerow(5,$main,bold('TITLE'),bold('AUTHOR'),bold('COUNT'),bold('LOCATION'),'
 ',"/images/background-mem.gif"); 
  } else {
!   print 
mktablerow(5,$main,bold('TITLE'),bold('AUTHOR'),bold('COUNT'),bold('BRANCH'),' 
  '); 
  }
  my $colour=1;
--- 57,63 ----
  print mktablehdr;
  if ($type ne 'opac'){
!   print 
mktablerow(5,$main,bold('TITLE'),bold('AUTHOR'),bold('COUNT'),bold('LOCATION'),'
 ',"/images/background-mem.gif");
  } else {
!   print 
mktablerow(5,$main,bold('TITLE'),bold('AUTHOR'),bold('COUNT'),bold('BRANCH'),' 
  ');
  }
  my $colour=1;
***************
*** 67,109 ****
    #$word=~ s/\,/\,%20/;
    
$results[1]=mklink("/cgi-bin/koha/search.pl?author=$word&type=$type",$results[1]);
!   my ($count,$lcount,$nacount,$fcount,$scount)=itemcount($env,$results[2]);   
                                                                  
!   $results[3]=$count;                                                         
                                                                  
!   if ($nacount > 0){                                                          
                                                                
!     $results[4]=$results[4]."On Loan";                                        
                                                                  
      if ($nacount > 1){
        $results[4].=" $nacount";
      }
      $results[4].=" ";
!   }                                                                           
                                                                
!   if ($lcount > 0){                                                           
                                                                
!     $results[4]=$results[4]." Levin";                                         
                                                                 
      if ($lcount > 1){
        $results[4].=" $lcount";
      }
      $results[4].=" ";
!   }                                                                           
                                                                
!   if ($fcount > 0){                                                           
                                                                
!     $results[4]=$results[4]." Foxton";                                        
                                                                  
      if ($fcount > 1){
        $results[4].=" $fcount";
      }
      $results[4].=" ";
!   }                                                                           
                                                                
!   if ($scount > 0){                                                           
                                                                
!     $results[4]=$results[4]." Shannon";                                       
                                                                   
      if ($scount > 1){
        $results[4].=" $scount";
      }
      $results[4].=" ";
!   }             
    if ($type ne 'opac'){
      $results[6]=mklink("/cgi-bin/koha/request.pl?bib=$results[2]","Request");
    }
!   if ($colour == 1){                                                          
                
!     print 
mktablerow(5,$secondary,$results[0],$results[1],$results[3],$results[4],$results[6]);
                                        
!     $colour=0;                                                                
   
!   } else{                                                                     
   
!     print 
mktablerow(5,'white',$results[0],$results[1],$results[3],$results[4],$results[6]);
                                     
!     $colour=1;                                                                
                
    }
     $i++;
--- 69,111 ----
    #$word=~ s/\,/\,%20/;
    
$results[1]=mklink("/cgi-bin/koha/search.pl?author=$word&type=$type",$results[1]);
!   my ($count,$lcount,$nacount,$fcount,$scount)=itemcount($env,$results[2]);
!   $results[3]=$count;
!   if ($nacount > 0){
!     $results[4]=$results[4]."On Loan";
      if ($nacount > 1){
        $results[4].=" $nacount";
      }
      $results[4].=" ";
!   }
!   if ($lcount > 0){
!     $results[4]=$results[4]." Levin";
      if ($lcount > 1){
        $results[4].=" $lcount";
      }
      $results[4].=" ";
!   }
!   if ($fcount > 0){
!     $results[4]=$results[4]." Foxton";
      if ($fcount > 1){
        $results[4].=" $fcount";
      }
      $results[4].=" ";
!   }
!   if ($scount > 0){
!     $results[4]=$results[4]." Shannon";
      if ($scount > 1){
        $results[4].=" $scount";
      }
      $results[4].=" ";
!   }
    if ($type ne 'opac'){
      $results[6]=mklink("/cgi-bin/koha/request.pl?bib=$results[2]","Request");
    }
!   if ($colour == 1){
!     print 
mktablerow(5,$secondary,$results[0],$results[1],$results[3],$results[4],$results[6]);
!     $colour=0;
!   } else{
!     print 
mktablerow(5,'white',$results[0],$results[1],$results[3],$results[4],$results[6]);
!     $colour=1;
    }
     $i++;