--- trunk/lib/BackupPC/SearchLib.pm	2006/01/28 16:45:46	303
+++ trunk/lib/BackupPC/SearchLib.pm	2006/01/30 15:12:14	320
@@ -251,7 +251,7 @@
 
 	return unless $use_hest;
 
-	use Search::Estraier;
+	use Search::Estraier 0.04;
 	die "direct access to Hyper Estraier datatase is no longer supported. Please use estmaster\n"
 		unless ($use_hest =~ m#^http://#);
 
@@ -300,8 +300,8 @@
 
 	$cond->add_attr("shareid NUMEQ $shareid") if ($shareid);
 
-#	$cond->set_max( $offset + $on_page );
-	$cond->set_options( SURE => 1 );
+	$cond->set_max( $offset + $on_page );
+	$cond->set_options( 'SURE' );
 	$cond->set_order( getSort('search', 'est', $param->{'sort'} ) );
 
 	# get the result of search
@@ -311,7 +311,7 @@
 	if ($hest_node_url) {
 		$result = $db->search($cond, 0);
 		if ($result) {
-			$hits = $result->doc_num;
+			$hits = $result->hits;
 		} else {
 			$hits = 0;
 		}
@@ -321,7 +321,7 @@
 
 	# for each document in result
 	for my $i ($offset .. ($offset + $on_page - 1)) {
-		last if ($i >= $hits);
+		last if ($i >= $result->doc_num);
 
 		my $doc;
 		if ($hest_node_url) {
@@ -462,7 +462,7 @@
 		INNER JOIN shares	ON backups.shareID=shares.ID
 		INNER JOIN hosts	ON backups.hostID = hosts.ID
 		LEFT OUTER JOIN archive_backup ON archive_backup.backup_id = backups.id 
-		WHERE backups.inc_size > 0 AND backups.inc_deleted is false AND archive_backup.backup_id IS NULL
+		WHERE backups.inc_size > 0 AND backups.size > 0 AND backups.inc_deleted is false AND archive_backup.backup_id IS NULL
 		GROUP BY
 		        backups.hostID,
 			hosts.name,
@@ -640,7 +640,7 @@
 	$retHTML .= <<'EOF3';
 
 function debug(msg) {
-//	return; // Disable debugging
+	return; // Disable debugging
 
 	if (! debug_div) debug_div = document.getElementById('debug');