--- trunk/Estraier.pm	2006/01/06 23:29:58	59
+++ trunk/Estraier.pm	2006/01/07 02:40:57	62
@@ -205,7 +205,8 @@
 
 sub attr_names {
 	my $self = shift;
-	croak "attr_names return array, not scalar" if (! wantarray);
+	return unless ($self->{attrs});
+	#croak "attr_names return array, not scalar" if (! wantarray);
 	return sort keys %{ $self->{attrs} };
 }
 
@@ -221,8 +222,8 @@
 sub attr {
 	my $self = shift;
 	my $name = shift;
-
-	return $self->{'attrs'}->{ $name };
+	return unless (defined($name) && $self->{attrs});
+	return $self->{attrs}->{ $name };
 }
 
 
@@ -236,8 +237,8 @@
 
 sub texts {
 	my $self = shift;
-	confess "texts return array, not scalar" if (! wantarray);
-	return @{ $self->{dtexts} };
+	#confess "texts return array, not scalar" if (! wantarray);
+	return @{ $self->{dtexts} } if ($self->{dtexts});
 }
 
 
@@ -251,7 +252,7 @@
 
 sub cat_texts {
 	my $self = shift;
-	return join(' ',@{ $self->{dtexts} });
+	return join(' ',@{ $self->{dtexts} }) if ($self->{dtexts});
 }
 
 
@@ -460,7 +461,7 @@
 sub attrs {
 	my $self = shift;
 	#croak "attrs return array, not scalar" if (! wantarray);
-	return @{ $self->{attrs} };
+	return @{ $self->{attrs} } if ($self->{attrs});
 }
 
 
@@ -524,9 +525,7 @@
 	my $self = {@_};
 	bless($self, $class);
 
-	foreach my $f (qw/uri attrs snippet keywords/) {
-		croak "missing $f for ResultDocument" unless defined($self->{$f});
-	}
+	croak "missing uri for ResultDocument" unless defined($self->{uri});
 
 	$self ? return $self : return undef;
 }
@@ -1176,7 +1175,7 @@
 
 	my $rv = $self->shuttle_url( $self->{url} . '/search',
 		'application/x-www-form-urlencoded',
-		$self->cond_to_query( $cond ),
+		$self->cond_to_query( $cond, $depth ),
 		\$resbody,
 	);
 	return if ($rv != 200);
@@ -1270,7 +1269,7 @@
 
 Return URI encoded string generated from Search::Estraier::Condition
 
-  my $args = $node->cond_to_query( $cond );
+  my $args = $node->cond_to_query( $cond, $depth );
 
 =cut
 
@@ -1279,6 +1278,7 @@
 
 	my $cond = shift || return;
 	croak "condition must be Search::Estraier::Condition, not '$cond->isa'" unless ($cond->isa('Search::Estraier::Condition'));
+	my $depth = shift;
 
 	my @args;
 
@@ -1306,7 +1306,7 @@
 		push @args, 'options=' . $options;
 	}
 
-	push @args, 'depth=' . $self->{depth} if ($self->{depth});
+	push @args, 'depth=' . $depth if ($depth);
 	push @args, 'wwidth=' . $self->{wwidth};
 	push @args, 'hwidth=' . $self->{hwidth};
 	push @args, 'awidth=' . $self->{awidth};