--- trunk/Estraier.pm	2006/02/19 17:13:57	108
+++ trunk/Estraier.pm	2006/05/06 21:38:14	126
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.04_2';
+our $VERSION = '0.06_1';
 
 =head1 NAME
 
@@ -599,6 +599,35 @@
 }
 
 
+=head2 set_skip
+
+Set number of skipped documents from beginning of results
+
+  $cond->set_skip(42);
+
+Similar to C<offset> in RDBMS.
+
+=cut
+
+sub set_skip {
+	my $self = shift;
+	$self->{skip} = shift;
+}
+
+=head2 skip
+
+Return skip for this condition.
+
+  print $cond->skip;
+
+=cut
+
+sub skip {
+	my $self = shift;
+	return $self->{skip};
+}
+
+
 package Search::Estraier::ResultDocument;
 
 use Carp qw/croak/;
@@ -874,14 +903,12 @@
 	my $self = {
 		pxport => -1,
 		timeout => 0,	# this used to be -1
-		dnum => -1,
-		wnum => -1,
-		size => -1.0,
 		wwidth => 480,
 		hwidth => 96,
 		awidth => 96,
 		status => -1,
 	};
+
 	bless($self, $class);
 
 	if ($#_ == 0) {
@@ -894,6 +921,12 @@
 		warn "## Node debug on\n" if ($self->{debug});
 	}
 
+	$self->{inform} = {
+		dnum => -1,
+		wnum => -1,
+		size => -1.0,
+	};
+
 	$self ? return $self : return undef;
 }
 
@@ -1270,8 +1303,8 @@
 
 sub name {
 	my $self = shift;
-	$self->_set_info unless ($self->{name});
-	return $self->{name};
+	$self->_set_info unless ($self->{inform}->{name});
+	return $self->{inform}->{name};
 }
 
 
@@ -1283,8 +1316,8 @@
 
 sub label {
 	my $self = shift;
-	$self->_set_info unless ($self->{label});
-	return $self->{label};
+	$self->_set_info unless ($self->{inform}->{label});
+	return $self->{inform}->{label};
 }
 
 
@@ -1296,8 +1329,8 @@
 
 sub doc_num {
 	my $self = shift;
-	$self->_set_info if ($self->{dnum} < 0);
-	return $self->{dnum};
+	$self->_set_info if ($self->{inform}->{dnum} < 0);
+	return $self->{inform}->{dnum};
 }
 
 
@@ -1309,8 +1342,8 @@
 
 sub word_num {
 	my $self = shift;
-	$self->_set_info if ($self->{wnum} < 0);
-	return $self->{wnum};
+	$self->_set_info if ($self->{inform}->{wnum} < 0);
+	return $self->{inform}->{wnum};
 }
 
 
@@ -1322,8 +1355,8 @@
 
 sub size {
 	my $self = shift;
-	$self->_set_info if ($self->{size} < 0);
-	return $self->{size};
+	$self->_set_info if ($self->{inform}->{size} < 0);
+	return $self->{inform}->{size};
 }
 
 
@@ -1440,6 +1473,56 @@
 	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;
+	foreach my $record (@records)
+	{
+		# split into keys and snippets
+		my ($keys, $snippet) = $record =~ m/^(.*?)\n\n(.*?)$/s;
+
+		# create document hash
+		my $doc				= { $keys =~ m/^(.*?)=(.*?)$/gsm };
+		$doc->{'@keywords'}	= $doc->{keywords};
+		($doc->{keywords})	= $keys =~ m/^%VECTOR\t(.*?)$/gm;
+		$doc->{snippet}		= $snippet;
+
+		push @$docs, new Search::Estraier::ResultDocument(
+			attrs 		=> $doc,
+			uri 		=> $doc->{'@uri'},
+			snippet 	=> $snippet,
+			keywords 	=> $doc->{'keywords'},
+		);
+	}
+
+	return new Search::Estraier::NodeResult( docs => $docs, hints => $hints );
+}
+
 
 =head2 cond_to_query
 
@@ -1486,6 +1569,7 @@
 	push @args, 'wwidth=' . $self->{wwidth};
 	push @args, 'hwidth=' . $self->{hwidth};
 	push @args, 'awidth=' . $self->{awidth};
+	push @args, 'skip=' . $self->{skip} if ($self->{skip});
 
 	return join('&', @args);
 }
@@ -1680,8 +1764,8 @@
 
 sub admins {
 	my $self = shift;
-	$self->_set_info unless ($self->{name});
-	return $self->{admins};
+	$self->_set_info unless ($self->{inform}->{name});
+	return $self->{inform}->{admins};
 }
 
 =head2 guests
@@ -1694,8 +1778,8 @@
 
 sub guests {
 	my $self = shift;
-	$self->_set_info unless ($self->{name});
-	return $self->{guests};
+	$self->_set_info unless ($self->{inform}->{name});
+	return $self->{inform}->{guests};
 }
 
 =head2 links
@@ -1708,8 +1792,8 @@
 
 sub links {
 	my $self = shift;
-	$self->_set_info unless ($self->{name});
-	return $self->{links};
+	$self->_set_info unless ($self->{inform}->{name});
+	return $self->{inform}->{links};
 }
 
 
@@ -1741,24 +1825,26 @@
 	return if ($rv != 200 || !$resbody);
 
 	my @lines = split(/[\r\n]/,$resbody);
-	
-	( $self->{name}, $self->{label}, $self->{dnum}, $self->{wnum}, $self->{size} ) =
-		split(/\t/, shift @lines, 5);
+
+	$self->{inform} = {};
+
+	( $self->{inform}->{name}, $self->{inform}->{label}, $self->{inform}->{dnum},
+		$self->{inform}->{wnum}, $self->{inform}->{size} ) = split(/\t/, shift @lines, 5);
 
 	return $resbody unless (@lines);
 
 	shift @lines;
 
 	while(my $admin = shift @lines) {
-		push @{$self->{admins}}, $admin;
+		push @{$self->{inform}->{admins}}, $admin;
 	}
-	
+
 	while(my $guest = shift @lines) {
-		push @{$self->{guests}}, $guest;
+		push @{$self->{inform}->{guests}}, $guest;
 	}
 
 	while(my $link = shift @lines) {
-		push @{$self->{links}}, $link;
+		push @{$self->{inform}->{links}}, $link;
 	}
 
 	return $resbody;