--- trunk/lib/WebPAC/Output/Estraier.pm	2005/12/20 00:03:04	307
+++ trunk/lib/WebPAC/Output/Estraier.pm	2006/01/07 02:21:18	345
@@ -5,7 +5,7 @@
 
 use base qw/WebPAC::Common/;
 
-use HyperEstraier;
+use Search::Estraier;
 use Text::Iconv;
 use Data::Dumper;
 use LWP;
@@ -17,11 +17,11 @@
 
 =head1 VERSION
 
-Version 0.08
+Version 0.09
 
 =cut
 
-our $VERSION = '0.08';
+our $VERSION = '0.09';
 
 =head1 SYNOPSIS
 
@@ -77,8 +77,8 @@
 
 sub new {
 	my $class = shift;
-        my $self = {@_};
-        bless($self, $class);
+	my $self = {@_};
+	bless($self, $class);
 
 	my $log = $self->_get_logger;
 
@@ -111,13 +111,14 @@
 		) || $log->logdie("can't create Hyper Estraier node $self->{database}");
 	}
 
-	$self->{'db'} = HyperEstraier::Node->new($self->{url});
-	$self->{'db'}->set_auth($self->{'user'}, $self->{passwd});
+	$self->{db} = Search::Estraier::Node->new( debug => $self->{debug} );
+	$self->{db}->set_url($self->{url});
+	$self->{db}->set_auth($self->{user}, $self->{passwd});
 
-	my $encoding = $self->{'encoding'} || 'ISO-8859-2';
+	my $encoding = $self->{encoding} || 'ISO-8859-2';
 	$log->info("using index $self->{url} with encoding $encoding");
 
-	$self->{'iconv'} = new Text::Iconv($encoding, 'UTF-8') or
+	$self->{iconv} = new Text::Iconv($encoding, 'UTF-8') or
 		$log->logdie("can't create conversion from $encoding to UTF-8");
 
 	$self ? return $self : return undef;
@@ -164,7 +165,7 @@
 	my $uri = "file:///$type/$database/$id";
 	$log->debug("creating $uri");
 
-	my $doc = HyperEstraier::Document->new;
+	my $doc = Search::Estraier::Document->new;
 	$doc->add_attr('@uri', $self->{'iconv'}->convert($uri) );
 
 	$log->debug("ds = ", sub { Dumper($args->{'ds'}) } );
@@ -199,7 +200,7 @@
 	}
 
 	$log->debug("adding ", sub { $doc->dump_draft } );
-	$self->{'db'}->put_doc($doc) || $log->logdie("can't add document $uri to node " . $self->{url} . " status: " . $self->{db}->status());
+	$self->{'db'}->put_doc($doc) || $log->warn("can't add document $uri with draft " . $doc->dump_draft . " to node " . $self->{url} . " status: " . $self->{db}->status());
 
 	return 1;
 }