--- trunk/Estraier.pm	2006/01/06 12:40:23	49
+++ trunk/Estraier.pm	2006/01/06 14:10:29	52
@@ -867,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;
 }
@@ -1050,7 +1050,7 @@
 		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.";
 	}
@@ -1152,13 +1152,172 @@
 }
 
 
+=head2 search
+
+Search documents which match condition
+
+  my $nres = $node->search( $cond, $depth );
+
+C<$cond> is C<Search::Estraier::Condition> object, while <$depth> specifies
+depth for meta search.
+
+Function results C<Search::Estraier::NodeResult> object.
+
+=cut
+
+sub search {
+	my $self = shift;
+	my ($cond, $depth) = @_;
+	return unless ($cond && defined($depth) && $self->{url});
+	croak "cond mush be Search::Estraier::Condition, not '$cond->isa'" unless ($cond->isa('Search::Estraier::Condition'));
+	croak "depth needs number, not '$depth'" unless ($depth =~ m/^\d+$/);
+
+	my $resbody;
+
+	my $rv = $self->shuttle_url( $self->{url} . '/search',
+		'text/x-estraier-draft',
+		$self->cond_to_query( $cond ),
+		\$resbody,
+	);
+	return if ($rv != 200);
+
+	my (@docs, $hints);
+
+	my @lines = split(/\n/, $resbody);
+	return unless (@lines);
+
+	my $border = $lines[0];
+	my $isend = 0;
+	my $lnum = 1;
+
+	while ( $lnum <= $#lines ) {
+		my $line = $lines[$lnum];
+		$lnum++;
+
+		#warn "## $line\n";
+		if ($line && $line =~ m/^\Q$border\E(:END)*$/) {
+			$isend = $1;
+			last;
+		}
+
+		if ($line =~ /\t/) {
+			my ($k,$v) = split(/\t/, $line, 2);
+			$hints->{$k} = $v;
+		}
+	}
+
+	my $snum = $lnum;
+
+	while( ! $isend && $lnum <= $#lines ) {
+		my $line = $lines[$lnum];
+		$lnum++;
+
+		if ($line && $line =~ m/^\Q$border\E/) {
+			if ($lnum > $snum) {
+				my $rdattrs;
+				my $rdvector;
+				my $rdsnippet;
+				
+				my $rlnum = $snum;
+				while ($rlnum < $lnum - 1 ) {
+					#my $rdline = $self->_s($lines[$rlnum]);
+					my $rdline = $lines[$rlnum];
+					$rlnum++;
+					last unless ($rdline);
+					if ($rdline =~ /^%/) {
+						$rdvector = $1 if ($rdline =~ /^%VECTOR\t(.+)$/);
+					} else {
+						$rdattrs->{$1} = {$2} if ($line =~ /^(.+)=(.+)$/);
+					}
+				}
+				while($rlnum < $lnum - 1) {
+					my $rdline = $lines[$rlnum];
+					$rlnum++;
+					$rdsnippet .= "$rdline\n";
+				}
+				if (my $rduri = $rdattrs->{'@uri'}) {
+					push @docs, new Search::Estraier::ResultDocument(
+						uri => $rduri,
+						attrs => $rdattrs,
+						snippet => $rdsnippet,
+						keywords => $rdvector,
+					);
+				}
+			}
+			$snum = $lnum;
+			#warn "### $line\n";
+			$isend = 1 if ($line =~ /:END$/);
+		}
+
+		if (! $isend) {
+			warn "received result doesn't have :END\n$resbody";
+			return;
+		}
+	}
+
+	if (! $isend) {
+		warn "received result doesn't have :END\n$resbody";
+		return;
+	}
+					
+
+	return new Search::Estraier::NodeResult( docs => \@docs, hints => $hints );
+}
+
+
+=head2 cond_to_query
+
+  my $args = $node->cond_to_query( $cond );
+
+=cut
+
+sub cond_to_query {
+	my $self = shift;
+
+	my $cond = shift || return;
+	croak "condition must be Search::Estraier::Condition, not '$cond->isa'" unless ($cond->isa('Search::Estraier::Condition'));
+
+	my @args;
+
+	if (my $phrase = $cond->phrase) {
+		push @args, 'phrase=' . uri_escape($phrase);
+	}
+
+	if (my @attrs = $cond->attrs) {
+		for my $i ( 0 .. $#attrs ) {
+			push @args,'attr' . ($i+1) . '=' . uri_escape( $attrs[$i] );
+		}
+	}
+
+	if (my $order = $cond->order) {
+		push @args, 'order=' . uri_escape($order);
+	}
+		
+	if (my $max = $cond->max) {
+		push @args, 'max=' . $max;
+	} else {
+		push @args, 'max=' . (1 << 30);
+	}
+
+	if (my $options = $cond->options) {
+		push @args, 'options=' . $options;
+	}
+
+	push @args, 'depth=' . $self->{depth} if ($self->{depth});
+	push @args, 'wwidth=' . $self->{wwidth};
+	push @args, 'hwidth=' . $self->{hwidth};
+	push @args, 'awidth=' . $self->{awidth};
+
+	return join('&', @args);
+}
+
 
 =head2 shuttle_url
 
 This is method which uses C<IO::Socket::INET> to communicate with Hyper Estraier node
 master.
 
-  my $rv = shuttle_url( $url, $content_type, \$req_body, \$resbody );
+  my $rv = shuttle_url( $url, $content_type, $req_body, \$resbody );
 
 C<$resheads> and C<$resbody> booleans controll if response headers and/or response
 body will be saved within object.