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

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
	search.pl 
Log Message:
No count after circ or shelf if only one item.


Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -r1.6.2.3 -r1.6.2.4
*** search.pl	28 Jun 2002 04:51:58 -0000	1.6.2.3
--- search.pl	28 Jun 2002 04:54:48 -0000	1.6.2.4
***************
*** 7,11 ****
  use C4::Output;
  use C4::Acquisitions;  # Only used for branches() routine which should probably
! 		       # be elsewhere
  
  my $env;
--- 7,11 ----
  use C4::Output;
  use C4::Acquisitions;  # Only used for branches() routine which should probably
!                        # be elsewhere
  
  my $env;
***************
*** 223,230 ****
  	      my $shelfcount=$count-$circcount-$lostcount-$mending-$transit;
  	      if ($circcount) {
! 		      $stuff[5]="Circ ($circcount) ";
  	      }
  	      if ($shelfcount) {
! 		      $stuff[5].="Shelf ($shelfcount) ";
  	      }
        }
--- 223,236 ----
  	      my $shelfcount=$count-$circcount-$lostcount-$mending-$transit;
  	      if ($circcount) {
! 		      $stuff[5]="Circ ";
! 		      if ($count>1) {
! 			      $stuff[5].="($circcount) ";
! 		      }
  	      }
  	      if ($shelfcount) {
! 		      $stuff[5].="Shelf ";
! 		      if ($count>1) {
! 			      $stuff[5].="($shelfcount) ";
! 		      }
  	      }
        }