Changeset 2541

Timestamp:

02/23/10 19:50:01 (2 years ago)

Author:

karpet

Message:

KSx does not expand all defined fields to be default when a default_field is not defined, since KS will search all fields by default

Location:

Search-Query/trunk

Files:

• lib/Search/Query/Dialect.pm (modified) (2 diffs)
• lib/Search/Query/Dialect/KSx.pm (modified) (3 diffs)
• lib/Search/Query/Parser.pm (modified) (1 diff)
• t/06-ks.t (modified) (3 diffs)

Search-Query/trunk/lib/Search/Query/Dialect.pm

@@ -14 +14 @@
 use Clone;
 
-__PACKAGE__->mk_accessors( qw( default_field parser ) );
+__PACKAGE__->mk_accessors(qw( default_field parser ));
 
 our $VERSION = '0.08';
@@ -209 +209 @@
     my $self = shift;
     my $field = $self->default_field || $self->parser->default_field;
-    if ( !$field ) {
+    if ( !defined $field ) {
         croak "must define a default_field";
     }

Search-Query/trunk/lib/Search/Query/Dialect/KSx.pm

@@ -63 +63 @@
     #carp dump $self;
     $self->{wildcard} = '*';
-    if ( $self->parser->fields ) {
-        $self->{default_field} ||= $self->parser->default_field
-            || [ sort keys %{ $self->parser->fields } ];
-    }
-    else {
-        $self->{default_field} ||= $self->parser->default_field
-            || 'swishdefault';
-    }
+
     if ( $self->{default_field} and !ref( $self->{default_field} ) ) {
         $self->{default_field} = [ $self->{default_field} ];
@@ -152 +145 @@
 
     # make sure we have a field
+    my $default_field = $self->default_field || $self->parser->default_field;
     my @fields
         = $clause->{field}
         ? ( $clause->{field} )
-        : ( @{ $self->_get_default_field } );
+        : ( @{ defined $default_field ? @$default_field : [] } );
 
     # what value
@@ -162 +156 @@
         ? $clause->{value}
         : $self->_doctor_value($clause);
+
+    # if we have no fields, we're done
+    return $value unless @fields;
 
     my $wildcard = $self->wildcard;

Search-Query/trunk/lib/Search/Query/Parser.pm

@@ -279 +279 @@
 =item default_field
 
-Applied to all terms where no field is defined. The default value is undef (no default).
+Applied to all terms where no field is defined. 
+The default value is undef (no default).
 
 =item default_op

Search-Query/trunk/t/06-ks.t

@@ -50 +50 @@
 ok( my $query5 = $parser2->parse("joe smith"), "query5" );
 
-is( $query5,
-    qq/(email:joe OR first_name:joe OR last_name:joe) OR (email:smith OR first_name:smith OR last_name:smith)/,
-    "query5 string"
-);
+is( $query5, qq/joe OR smith/, "query5 string" );
 
 ok( my $query6 = $parser2->parse(qq/"joe smith"/), "query6" );
 
-is( $query6,
-    qq/(email:"joe smith" OR first_name:"joe smith" OR last_name:"joe smith")/,
-    "query6 string"
-);
+is( $query6, qq/joe smith/, "query6 string" );
 
 ok( my $parser3 = Search::Query::Parser->new(
@@ -72 +66 @@
 ok( my $query7 = $parser3->parse('green'), "query7" );
 
-is( $query7, qq/(bar:green OR foo:green)/, "query7 string" );
+is( $query7, qq/green/, "query7 string" );
 
 ok( my $parser4 = Search::Query::Parser->new(
@@ -186 +180 @@
     "parse alias_for with no default field and no field specified"
 );
-is( $query_alias_for2, qq/field2:foo/, "query expanded omits aliases" );
+is( $query_alias_for2, qq/foo/, "query expanded omits aliases" );