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

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
	search.pl 
Log Message:
Fixed bug where location wouldn't show up in search results.  Should still
be compatible with HLT configuration.


Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** search.pl	18 May 2002 10:21:51 -0000	1.6.2.1
--- search.pl	26 Jun 2002 18:18:23 -0000	1.6.2.2
***************
*** 167,171 ****
        $stuff[5]='';
        $stuff[0]=mklink($url,$stuff[0]);
!       my ($count,$lcount,$nacount,$fcount,$scount,$lostcount,$mending,$transit,$ocount)=itemcount($env,$stuff[2],$type);
        $stuff[4]=$count;
        if ($nacount > 0){
--- 167,171 ----
        $stuff[5]='';
        $stuff[0]=mklink($url,$stuff[0]);
!       my ($count,$lcount,$nacount,$fcount,$scount,$lostcount,$mending,$transit,$ocount,$branchcount)=itemcount($env,$stuff[2],$type);
        $stuff[4]=$count;
        if ($nacount > 0){
***************
*** 197,201 ****
  	 $stuff[5].=" ";	
        }
!       if ($lostcount > 0){
          $stuff[5]=$stuff[5]."Lost";
           if ($lostcount >1 ){                                                                                                         
--- 197,211 ----
  	 $stuff[5].=" ";	
        }
!       $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 ){