--- trunk/Estraier.pm	2006/05/06 22:09:01	127
+++ trunk/Estraier.pm	2006/05/08 12:00:43	128
@@ -1389,118 +1389,12 @@
 	);
 	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];
-		#warn "# $lnum: $line\n";
-		$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(.+)$/);
-					} elsif($rdline =~ /=/) {
-						$rdattrs->{$1} = $2 if ($rdline =~ /^(.+)=(.+)$/);
-					} else {
-						confess "invalid format of response";
-					}
-				}
-				while($rlnum < $lnum - 1) {
-					my $rdline = $lines[$rlnum];
-					$rlnum++;
-					$rdsnippet .= "$rdline\n";
-				}
-				#warn Dumper($rdvector, $rdattrs, $rdsnippet);
-				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;
-	}
-
-	#warn Dumper(\@docs, $hints);
-
-	return new Search::Estraier::NodeResult( docs => \@docs, hints => $hints );
-}
-
-=head2 search_new
-
-Better implementation of search by Robert Klep <robert@klep.name>
-
-=cut
-
-sub search_new {
-	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',
-		'application/x-www-form-urlencoded',
-		$self->cond_to_query( $cond, $depth ),
-		\$resbody,
-	);
-	return if ($rv != 200);
-
 	my @records 	= split /--------\[.*?\]--------(?::END)?\r?\n/, $resbody;
 	my $hintsText	= splice @records, 0, 2; # starts with empty record
 	my $hints		= { $hintsText =~ m/^(.*?)\t(.*?)$/gsm };
 
 	# process records
-	my $docs;
+	my $docs = [];
 	foreach my $record (@records)
 	{
 		# split into keys and snippets
@@ -1867,6 +1761,7 @@
 
 Dobrica Pavlinusic, E<lt>dpavlin@rot13.orgE<gt>
 
+Robert Klep E<lt>robert@klep.nameE<gt> contributed refactored search code
 
 =head1 COPYRIGHT AND LICENSE