[Koha-cvs] CVS: koha/C4 Search.pm,1.85.2.5,1.85.2.6

[Ambrose C. LI]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25630/C4

Modified Files:
      Tag: rel_2_0
	Search.pm 
Log Message:
Missed one "On Loan"


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.85.2.5
retrieving revision 1.85.2.6
diff -C2 -r1.85.2.5 -r1.85.2.6
*** Search.pm	19 Feb 2004 10:19:57 -0000	1.85.2.5
--- Search.pm	11 Mar 2004 08:21:07 -0000	1.85.2.6
***************
*** 252,255 ****
--- 252,256 ----
  			}
  			my $locationtext='';
+ 			my $locationtextonly='';
  			my $notavailabletext='';
  			foreach (sort keys %{$data->{'locationhash'}}) {
***************
*** 257,266 ****
--- 258,286 ----
  					$notavailabletext="Not available";
  					my $c=$data->{'locationhash'}->{$_};
+ 					$data->{'not-available-p'}=$totalitemcounts;
  					if ($totalitemcounts>1) {
  					$notavailabletext.=" ($c)";
+ 					$data->{'not-available-plural-p'}=1;
  					}
  				} else {
  					$locationtext.="$_";
  					my $c=$data->{'locationhash'}->{$_};
+ 					if ($_ eq 'Item Lost') {
+ 					$data->{'lost-p'}=$totalitemcounts;
+ 					$data->{'lost-plural-p'}=1
+ 							if $totalitemcounts > 1;
+ 					} elsif ($_ eq 'Withdrawn') {
+ 					$data->{'withdrawn-p'}=$totalitemcounts;
+ 					$data->{'withdrawn-plural-p'}=1
+ 							if $totalitemcounts > 1;
+ 					} elsif ($_ eq 'On Loan') {
+ 					$data->{'on-loan-p'}=$totalitemcounts;
+ 					$data->{'on-loan-plural-p'}=1
+ 							if $totalitemcounts > 1;
+ 					} else {
+ 					$locationtextonly.=$_;
+ 					$locationtextonly.=" ($c), "
+ 							if $totalitemcounts>1;
+ 					}
  					if ($totalitemcounts>1) {
  					$locationtext.=" ($c), ";
***************
*** 274,278 ****
--- 294,300 ----
  			}
  			$data->{'location'}=$locationtext;
+ 			$data->{'location-only'}=$locationtextonly;
  			$data->{'subject2'}=$subject2;
+ 			$data->{'use-location-flags-p'}=1; # XXX
  		}
  	}