Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv14738/C4 Modified Files: Search.pm Log Message: Making the CatSearch and KeywordSearch return more sane returns Returns an array of hashrefs now, rather than the array of tab separated strings it was returning before. Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** Search.pm 6 May 2002 23:12:25 -0000 1.20 --- Search.pm 7 May 2002 00:08:20 -0000 1.21 *************** *** 243,247 **** # print $i4; if ($i4 <=$end && $i4 > $offset){ ! $res2[$i3]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}\t$dewey"; $i3++; $i4++; --- 243,250 ---- # print $i4; if ($i4 <=$end && $i4 > $offset){ ! $data2->{'dewey'}=$dewey; ! $res2[$i3]=$data2; ! ! # $res2[$i3]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}\t$dewey"; $i3++; $i4++; *************** *** 283,288 **** ($dewey == 0) && ($dewey=''); ($dewey) && ($dewey.=" $subclass") ; ! $sth->finish; ! $res2[$i]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}\t$dewey"; $i++; } --- 286,293 ---- ($dewey == 0) && ($dewey=''); ($dewey) && ($dewey.=" $subclass") ; ! $sth->finish; ! $data2->{'dewey'}=$dewey; ! $res2[$i]=$data2; ! # $res2[$i]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}\t$dewey"; $i++; } *************** *** 473,477 **** ($dewey == 0) && ($dewey=''); ($dewey) && ($dewey.=" $subclass"); ! $results[$i2]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey\t$data->{'isbn'}\t$data->{'itemtype'}"; $i2++; $sth->finish; --- 478,484 ---- ($dewey == 0) && ($dewey=''); ($dewey) && ($dewey.=" $subclass"); ! $data->{'dewey'}=$dewey; ! $results[$i2]=$data; ! # $results[$i2]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey\t$data->{'isbn'}\t$data->{'itemtype'}"; $i2++; $sth->finish; *************** *** 527,540 **** ($dewey == 0) && ($dewey=''); ($dewey) && ($dewey.=" $subclass"); $sti->finish; if ($true == 1){ if ($count > $offset && $count <= $limit){ ! if ($type ne 'subject' && $type ne 'precise'){ ! $results[$i]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey\t$data->{'illus'}"; ! } elsif ($search->{'isbn'} ne '' || $search->{'item'} ne ''){ ! $results[$i]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey\t$data->{'illus'}"; ! } else { ! $results[$i]="$data->{'author'}\t$data->{'subject'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey\t$data->{'illus'}"; ! } $i++; } --- 534,549 ---- ($dewey == 0) && ($dewey=''); ($dewey) && ($dewey.=" $subclass"); + $data->{'dewey'}=$dewey; $sti->finish; if ($true == 1){ if ($count > $offset && $count <= $limit){ ! # if ($type ne 'subject' && $type ne 'precise'){ ! # $results[$i]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey\t$data->{'illus'}"; ! # } elsif ($search->{'isbn'} ne '' || $search->{'item'} ne ''){ ! # $results[$i]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey\t$data->{'illus'}"; ! # } else { ! # $results[$i]="$data->{'author'}\t$data->{'subject'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey\t$data->{'illus'}"; ! # } ! $results[$i]=$data; $i++; }