diff --git a/C4/Search.pm b/C4/Search.pm index 3354ead..54b5ab0 100755 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -249,16 +249,16 @@ sub CatSearch { my $i2=0; my $limit=$num+$offset; - if ($search->{'title'} ne '' || $search->{'author'} ne '' ){ - while ((my $data=$sth->fetchrow_hashref) && $i < $limit){ - if ($i >= $offset){ - -$results[$i2]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}"; - $i2++; - } - $i++; - } - } else { +# if ($search->{'title'} ne '' || $search->{'author'} ne '' ){ +# while ((my $data=$sth->fetchrow_hashref) && $i < $limit){ +# if ($i >= $offset){ +# +# $results[$i2]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}"; +# $i2++; +# } +# $i++; +# } +# } else { while (my $data=$sth->fetchrow_hashref){ if ($type ne 'subject'){ $results[$i]="$data->{'author'}\t$data->{'title'}\t @@ -270,7 +270,7 @@ $results[$i2]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}"; } $i++; } - } +# } $sth->finish; # print "$query\n"; #only update stats if search is from opac diff --git a/search.pl b/search.pl index a5657fa..64dd3ae 100755 --- a/search.pl +++ b/search.pl @@ -18,10 +18,10 @@ my $type=$input->param('type'); my $main; my $secondary; if ($type eq 'opac'){ - $main='#99cccc'; - $secondary='#efe5ef'; + $main='#99cccc'; + $secondary='#efe5ef'; } else { - $main='#cccc99'; + $main='#99cc33'; $secondary='#ffffcc'; } @@ -88,9 +88,10 @@ print mktablehdr; if ($subject ne ''){ print mktablerow(1,$main,'SUBJECT'); } else { - print mktablerow(4,$main,'TITLE','AUTHOR','ITEM COUNT','  '); + print mktablerow(4,$main,'TITLE','AUTHOR','COUNT',bold('LOCATION'),'/images/background-mem.gif'); } my $count2=@results; +#print $count2; my $i=0; my $colour=1; while ($i < $count2){ @@ -110,16 +111,16 @@ while ($i < $count2){ my ($count,$lcount,$nacount,$fcount,$scount)=itemcount($env,$stuff[2]); $stuff[3]=$count; if ($nacount > 0){ - $stuff[4]=$stuff[4]."N/A=$nacount"; + $stuff[4]=$stuff[4]."On Loan 1"; } if ($lcount > 0){ - $stuff[4]=$stuff[4]."L=$lcount"; + $stuff[4]=$stuff[4]." L$lcount"; } if ($fcount > 0){ - $stuff[4]=$stuff[4]."F=$fcount"; + $stuff[4]=$stuff[4]." F$fcount"; } if ($scount > 0){ - $stuff[4]=$stuff[4]."S=$scount"; + $stuff[4]=$stuff[4]." S$scount"; } } else { my $word=$stuff[1]; @@ -136,7 +137,7 @@ while ($i < $count2){ $i++; } $offset=$num+$offset; -print mktablerow(4,$main,'   ','   ','  ','  '); +print mktablerow(4,$main,'   ','   ','  ','  ','/images/background-mem.gif'); print mktableft(); if ($offset < $count){ my $search="num=$num&offset=$offset&type=$type";