From b24df0897f712ac0ae68a537d5084a8ea7c00192 Mon Sep 17 00:00:00 2001
From: dpavlin <dpavlin@8392b6e1-25fa-0310-8288-cc32f8e212ea>
Date: Sat, 28 Jan 2006 20:42:42 +0000
Subject: [PATCH 1/1] fix uri_to_id (and thus updating of Hyper Estraier)

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@306 8392b6e1-25fa-0310-8288-cc32f8e212ea
---
 bin/BackupPC_updatedb | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/bin/BackupPC_updatedb b/bin/BackupPC_updatedb
index b052b33..074d4da 100755
--- a/bin/BackupPC_updatedb
+++ b/bin/BackupPC_updatedb
@@ -104,22 +104,8 @@ sub curr_time {
 	return strftime($t_fmt,localtime());
 }
 
-my $hest_db;
 my $hest_node;
 
-sub signal {
-	my($sig) = @_;
-	if ($hest_db) {
-		print "\nCaught a SIG$sig--syncing database and shutting down\n";
-		$hest_db->sync();
-		$hest_db->close();
-	}
-	exit(0);
-}
-
-$SIG{'INT'}  = \&signal;
-$SIG{'QUIT'} = \&signal;
-
 sub hest_update {
 
 	my ($host_id, $share_id, $num) = @_;
@@ -141,8 +127,12 @@ sub hest_update {
 
 	print " opening index $index_node_url";
 	if ($index_node_url) {
-		$hest_node ||= Search::Estraier::Node->new($index_node_url);
-		$hest_node->set_auth('admin', 'admin');
+		$hest_node ||= Search::Estraier::Node->new(
+			url => $index_node_url,
+			user => 'admin',
+			passwd => 'admin',
+			croak_on_error => 1,
+		);
 		print " via node URL";
 	} else {
 		die "don't know how to use Hyper Estraier Index $index_node_url";
@@ -193,7 +183,7 @@ sub hest_update {
 
 		if ($results == 0) {
 			print " - no new files\n";
-			last;
+			return;
 		} else {
 			print " - $results files: ";
 		}
@@ -211,8 +201,8 @@ sub hest_update {
 			my $uri = 'file:///' . $fid;
 
 			unless ($skip_check) {
-				my $id = ($hest_db || $hest_node)->uri_to_id($uri);
-				next unless ($id == -1);
+				my $id = $hest_node->uri_to_id($uri);
+				next if ($id && $id == -1);
 			}
 
 			# create a document object 
-- 
2.20.1