[Koha-cvs] CVS: koha/C4 Authorities.pm,1.7,1.8

[Paul POULAIN]

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

Modified Files:
	Authorities.pm 
Log Message:
synch'ing 2.0.0 branch (RC4 tag) and head

Index: Authorities.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Authorities.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Authorities.pm	15 Dec 2003 14:38:59 -0000	1.7
--- Authorities.pm	11 Feb 2004 08:42:02 -0000	1.8
***************
*** 193,199 ****
  		}
  #	$query .= " and freelib like \"$searchstring%\"" if ($searchstring);
! 	$query .= " order by category,freelib limit ?,?";
  	push(@bind,$offset,($pagesize*4));
! # 	warn "q : $query";
  	my $sth=$dbh->prepare($query);
  	$sth->execute(@bind);
--- 193,199 ----
  		}
  #	$query .= " and freelib like \"$searchstring%\"" if ($searchstring);
! 	$query .= " limit ?,?";
  	push(@bind,$offset,($pagesize*4));
! 	warn "q : $query". at bind;
  	my $sth=$dbh->prepare($query);
  	$sth->execute(@bind);
***************
*** 219,223 ****
  	$cnt = $pagesize+1 if ($cnt>$pagesize);
  	$sth->finish();
! 	return ($cnt,\@results);
  }
  
--- 219,223 ----
  	$cnt = $pagesize+1 if ($cnt>$pagesize);
  	$sth->finish();
! 	return ($#results,\@results);
  }