--- trunk/lib/WebPAC/Output/Estraier.pm	2005/12/05 17:47:16	212
+++ trunk/lib/WebPAC/Output/Estraier.pm	2005/12/14 23:08:11	246
@@ -17,11 +17,11 @@
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 SYNOPSIS
 
@@ -153,9 +153,9 @@
 	}
 
 	my $type = $args->{'type'};
-	my $mfn = $args->{'id'};
+	my $id = $args->{'id'};
 
-	my $uri = "file:///$type/$database/$mfn";
+	my $uri = "file:///$type/$database/$id";
 	$log->debug("creating $uri");
 
 	my $doc = HyperEstraier::Document->new;
@@ -214,6 +214,29 @@
 	nodedel => [ qw/name/ ],
 };
 
+=head2 est_ua
+
+Make C<LWP::UserAgent> object with Super User priviledges
+
+  my $ua = $self->est_ua( user => 'admin', passwd => 'admin' );
+
+=cut
+
+sub est_ua {
+	my $self = shift;
+
+	return $self->{_master_ua} if ($self->{_master_ua});
+
+	$self->{_master_ua} = LWP::UserAgent->new( ) || sub {
+		my $log = $self->_get_logger;
+		$log->logdie("can't create LWP::UserAgent: $!");
+	};
+
+	$self->{_master_ua}->credentials('localhost:1978','Super User', $self->{user} => $self->{passwd});
+
+	return $self->{_master_ua};
+}
+
 sub est_master {
 	my $self = shift;
 	my $args = {@_};
@@ -234,12 +257,7 @@
 
 	$log->debug("calling $url");
 
-	if (! $self->{_master_ua}) {
-		$self->{_master_ua} = LWP::UserAgent->new( ) || $log->logdie("can't create LWP::UserAgent: $!");
-		$self->{_master_ua}->credentials('localhost:1978','Super User', $self->{user} => $self->{passwd});
-	}
-
-	my $res = $self->{_master_ua}->get($url);
+	my $res = $self->est_ua()->get($url);
 
 	if ($res->is_success) {
 		#$log->debug( $res->content );
@@ -247,7 +265,6 @@
 		return $res->content;
 	} else {
 		$log->warn("unable to call $url: " . $res->status_line);
-		#$log->debug(Dumper($res, $self->{'_master_ua'}));
 		return;
 	}