[Koha-cvs] CVS: koha search.pl,1.6.2.2,1.6.2.3

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
	search.pl 
Log Message:
Changes to "Location" column output when there is only one branch in branches
table.  Outputs number of items in circulation and on shelf instead of number
of items in each branch.


Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** search.pl	26 Jun 2002 18:18:23 -0000	1.6.2.2
--- search.pl	28 Jun 2002 04:51:58 -0000	1.6.2.3
***************
*** 6,9 ****
--- 6,11 ----
  use CGI;
  use C4::Output;
+ use C4::Acquisitions;  # Only used for branches() routine which should probably
+ 		       # be elsewhere
  
  my $env;
***************
*** 198,213 ****
        }
        $stuff[5]='';
!       foreach my $branchcode (sort keys %$branchcount) {
! 	  my $branchname=branchname($branchcode);
! 	  my $c=$branchcount->{$branchcode};
! 	  $stuff[5].="$branchname";
! 	  if ($c>1) {
! 	      $stuff[5].=" ($c)";
! 	  }
! 	  $stuff[5].=" ";
        }
        if ($lostcount > 0) {
          $stuff[5]=$stuff[5]."Lost";
!          if ($lostcount >1 ){                                                                                                         
  	  $stuff[5]=$stuff[5]." ($lostcount)";                                                                                            
           }                                                                                                                         
--- 200,235 ----
        }
        $stuff[5]='';
!       my ($numbranches, @branches) = branches();
!       my $branchinfo;
!       foreach (@branches) {
! 	      my $branchcode=$_->{'branchcode'};
! 	      my $branchname=$_->{'branchname'};
! 	      $branchinfo->{$branchcode}=$branchname;
!       }
!       if ($numbranches>1) {
! 	      foreach my $branchcode (sort keys %$branchcount) {
! 		  my $c=$branchcount->{$branchcode};
! 		  $stuff[5].=$branchinfo->{$branchcode};
! 		  if ($c>1) {
! 		      $stuff[5].=" ($c)";
! 		  }
! 		  $stuff[5].=" ";
! 	      }
!       } else {
! 	      my $circcount;
! 	      foreach my $branchcode (sort keys %$branchcount) {
! 		  $circcount=$branchcount->{$branchcode};
! 	      }
! 	      my $shelfcount=$count-$circcount-$lostcount-$mending-$transit;
! 	      if ($circcount) {
! 		      $stuff[5]="Circ ($circcount) ";
! 	      }
! 	      if ($shelfcount) {
! 		      $stuff[5].="Shelf ($shelfcount) ";
! 	      }
        }
        if ($lostcount > 0) {
          $stuff[5]=$stuff[5]."Lost";
!          if ($count >1 ){                                                                                                         
  	  $stuff[5]=$stuff[5]." ($lostcount)";                                                                                            
           }                                                                                                                         
***************
*** 216,220 ****
        if ($mending > 0){
          $stuff[5]=$stuff[5]."Mending";
!          if ($mending >1 ){                                                                                                         
  	  $stuff[5]=$stuff[5]." ($mending)";                                                                                            
           }                                                                                                                         
--- 238,242 ----
        if ($mending > 0){
          $stuff[5]=$stuff[5]."Mending";
!          if ($count >1 ){                                                                                                         
  	  $stuff[5]=$stuff[5]." ($mending)";                                                                                            
           }                                                                                                                         
***************
*** 223,227 ****
        if ($transit > 0){
          $stuff[5]=$stuff[5]."In Transiit";
!          if ($transit >1 ){                                                                                                         
  	  $stuff[5]=$stuff[5]." ($transit)";                                                                                            
           }                                                                                                                         
--- 245,249 ----
        if ($transit > 0){
          $stuff[5]=$stuff[5]."In Transiit";
!          if ($count >1 ){                                                                                                         
  	  $stuff[5]=$stuff[5]." ($transit)";                                                                                            
           }