--- trunk/Estraier.pm	2006/01/06 01:12:10	44
+++ trunk/Estraier.pm	2006/01/06 12:48:14	50
@@ -692,6 +692,7 @@
 use URI;
 use MIME::Base64;
 use IO::Socket::INET;
+use URI::Escape qw/uri_escape/;
 
 =head1 Search::Estraier::Node
 
@@ -818,7 +819,7 @@
 sub put_doc {
 	my $self = shift;
 	my $doc = shift || return;
-	return unless ($self->{url});
+	return unless ($self->{url} && $doc->isa('Search::Estraier::Document'));
 	$self->shuttle_url( $self->{url} . '/put_doc',
 		'text/x-estraier-draft',
 		$doc->dump_draft,
@@ -854,7 +855,7 @@
 
 Remove a registrated document using it's uri
 
-  $node->out_doc_by_uri( 'file:///document_url' ) or "can't remove document";
+  $node->out_doc_by_uri( 'file:///document/uri/42' ) or "can't remove document";
 
 Return true on success or false on failture.
 
@@ -866,7 +867,7 @@
 	return unless ($self->{url});
 	$self->shuttle_url( $self->{url} . '/out_doc',
 		'application/x-www-form-urlencoded',
-		"uri=$uri",
+		"uri=" . uri_escape($uri),
 		undef
 	) == 200;
 }
@@ -885,7 +886,7 @@
 sub edit_doc {
 	my $self = shift;
 	my $doc = shift || return;
-	return unless ($self->{url});
+	return unless ($self->{url} && $doc->isa('Search::Estraier::Document'));
 	$self->shuttle_url( $self->{url} . '/edit_doc',
 		'text/x-estraier-draft',
 		$doc->dump_draft,
@@ -915,7 +916,7 @@
 
 Retreive document
 
-  my $doc = $node->get_doc_by_uri( 'file:///document_uri' ) or die "can't get document";
+  my $doc = $node->get_doc_by_uri( 'file:///document/uri/42' ) or die "can't get document";
 
 Return true on success or false on failture.
 
@@ -928,6 +929,40 @@
 }
 
 
+=head2 get_doc_attr
+
+Retrieve the value of an atribute from object
+
+  my $val = $node->get_doc_attr( document_id, 'attribute_name' ) or
+  	die "can't get document attribute";
+
+=cut
+
+sub get_doc_attr {
+	my $self = shift;
+	my ($id,$name) = @_;
+	return unless ($id && $name);
+	return $self->_fetch_doc( id => $id, attr => $name );
+}
+
+
+=head2 get_doc_attr_by_uri
+
+Retrieve the value of an atribute from object
+
+  my $val = $node->get_doc_attr_by_uri( document_id, 'attribute_name' ) or
+  	die "can't get document attribute";
+
+=cut
+
+sub get_doc_attr_by_uri {
+	my $self = shift;
+	my ($uri,$name) = @_;
+	return unless ($uri && $name);
+	return $self->_fetch_doc( uri => $uri, attr => $name );
+}
+
+
 =head2 etch_doc
 
 Exctract document keywords
@@ -936,7 +971,7 @@
 
 =cut
 
-sub erch_doc {
+sub etch_doc {
 	my $self = shift;
 	my $id = shift || return;
 	return $self->_fetch_doc( id => $id, etch => 1 );
@@ -946,7 +981,7 @@
 
 Retreive document
 
-  my $keywords = $node->etch_doc_by_uri( 'file:///document_uri' ) or die "can't etch document";
+  my $keywords = $node->etch_doc_by_uri( 'file:///document/uri/42' ) or die "can't etch document";
 
 Return true on success or false on failture.
 
@@ -959,13 +994,45 @@
 }
 
 
+=head2 uri_to_id
+
+Get ID of document specified by URI
+
+  my $id = $node->uri_to_id( 'file:///document/uri/42' );
+
+=cut
+
+sub uri_to_id {
+	my $self = shift;
+	my $uri = shift || return;
+	return $self->_fetch_doc( uri => $uri, path => '/uri_to_id', chomp_resbody => 1 );
+}
+
+
 =head2 _fetch_doc
 
 Private function used for implementing of C<get_doc>, C<get_doc_by_uri>,
 C<etch_doc>, C<etch_doc_by_uri>.
 
- my $doc = $node->fetch_doc( id => 42, etch => 1 );
- my $doc = $node->fetch_doc( uri => 'file://uri/42' );
+ # this will decode received draft into Search::Estraier::Document object
+ my $doc = $node->_fetch_doc( id => 42 );
+ my $doc = $node->_fetch_doc( uri => 'file:///document/uri/42' );
+
+ # to extract keywords, add etch
+ my $doc = $node->_fetch_doc( id => 42, etch => 1 );
+ my $doc = $node->_fetch_doc( uri => 'file:///document/uri/42', etch => 1 );
+
+ # to get document attrubute add attr
+ my $doc = $node->_fetch_doc( id => 42, attr => '@mdate' );
+ my $doc = $node->_fetch_doc( uri => 'file:///document/uri/42', attr => '@mdate' );
+
+ # more general form which allows implementation of
+ # uri_to_id
+ my $id = $node->_fetch_doc(
+ 	uri => 'file:///document/uri/42',
+	path => '/uri_to_id',
+	chomp_resbody => 1
+ );
 
 =cut
 
@@ -976,22 +1043,28 @@
 
 	my ($arg, $resbody);
 
-	my $path = '/get_doc';
+	my $path = $a->{path} || '/get_doc';
 	$path = '/etch_doc' if ($a->{etch});
 
 	if ($a->{id}) {
 		croak "id must be numberm not '$a->{id}'" unless ($a->{id} =~ m/^\d+$/);
 		$arg = 'id=' . $a->{id};
 	} elsif ($a->{uri}) {
-		$arg = 'uri=' . $a->{uri};
+		$arg = 'uri=' . uri_escape($a->{uri});
 	} else {
 		confess "unhandled argument. Need id or uri.";
 	}
 
+	if ($a->{attr}) {
+		$path = '/get_doc_attr';
+		$arg .= '&attr=' . uri_escape($a->{attr});
+		$a->{chomp_resbody} = 1;
+	}
+
 	my $rv = $self->shuttle_url( $self->{url} . $path,
 		'application/x-www-form-urlencoded',
 		$arg,
-		$resbody,
+		\$resbody,
 	);
 
 	return if ($rv != 200);
@@ -1004,12 +1077,80 @@
 			$self->{kwords}->{$k} = $v if ($v);
 		}
 		return $self->{kwords};
+	} elsif ($a->{chomp_resbody}) {
+		return unless (defined($resbody));
+		chomp($resbody);
+		return $resbody;
 	} else {
 		return new Search::Estraier::Document($resbody);
 	}
 }
 
 
+=head2 name
+
+  my $node_name = $node->name;
+
+=cut
+
+sub name {
+	my $self = shift;
+	$self->set_info unless ($self->{name});
+	return $self->{name};
+}
+
+
+=head2 label
+
+  my $node_label = $node->label;
+
+=cut
+
+sub label {
+	my $self = shift;
+	$self->set_info unless ($self->{label});
+	return $self->{label};
+}
+
+
+=head2 doc_num
+
+  my $documents_in_node = $node->doc_num;
+
+=cut
+
+sub doc_num {
+	my $self = shift;
+	$self->set_info if ($self->{dnum} < 0);
+	return $self->{dnum};
+}
+
+
+=head2 word_num
+
+  my $words_in_node = $node->word_num;
+
+=cut
+
+sub word_num {
+	my $self = shift;
+	$self->set_info if ($self->{wnum} < 0);
+	return $self->{wnum};
+}
+
+
+=head2 size
+
+  my $node_size = $node->size;
+
+=cut
+
+sub size {
+	my $self = shift;
+	$self->set_info if ($self->{size} < 0);
+	return $self->{size};
+}
+
 
 
 =head2 shuttle_url
@@ -1123,6 +1264,37 @@
 	return $self->{status};
 }
 
+
+=head2 set_info
+
+Set information for node
+
+  $node->set_info;
+
+=cut
+
+sub set_info {
+	my $self = shift;
+
+	$self->{status} = -1;
+	return unless ($self->{url});
+
+	my $resbody;
+	my $rv = $self->shuttle_url( $self->{url} . '/inform',
+		'text/plain',
+		undef,
+		\$resbody,
+	);
+
+	return if ($rv != 200 || !$resbody);
+
+	chomp($resbody);
+
+	( $self->{name}, $self->{label}, $self->{dnum}, $self->{wnum}, $self->{size} ) =
+		split(/\t/, $resbody, 5);
+
+}
+
 ###
 
 =head1 EXPORT