Changeset 2876

Timestamp:

07/08/10 22:45:27 (19 months ago)

Author:

karpet

Message:

fixes for term_expander

Location:

Search-Query/trunk

Files:

• lib/Search/Query/Parser.pm (modified) (2 diffs)
• t/07-term-expander.t (modified) (1 diff)

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

@@ -577 +577 @@
     }
 
+    my $query_class = $self->{query_class};
+
     $query->walk(
         sub {
@@ -589 +591 @@
                 $clause->value( $newterms[0] );
             }
+            elsif ( @newterms > 1 ) {
+
+                # turn $clause into a tree
+                my $class     = blessed($clause);
+                my $op        = $clause->op;
+                my $field     = $clause->field;
+                my $proximity = $clause->proximity;
+                my $quote     = $clause->quote;
+
+                #warn "before tree: " . dump $tree;
+
+                #warn "code clause: " . dump $clause;
+                my @subclauses;
+                for my $term (@newterms) {
+                    push(
+                        @subclauses,
+                        $class->new(
+                            field     => $field,
+                            op        => $op,
+                            value     => $term,
+                            quote     => $quote,
+                            proximity => $proximity,
+                        )
+                    );
+                }
+
+                # OR the fields together. TODO optional?
+
+                # we must bless here because
+                # our bool op keys are not methods.
+                my $subclause = bless( { "" => \@subclauses }, $query_class );
+                $subclause->init( %{ $self->query_class_opts },
+                    parser => $self );
+
+                $clause->op('()');
+                $clause->value($subclause);
+            }
             else {
-                $clause->value( '(' . join( ' OR ', @newterms ) . ')' );
+                $clause->value( $newterms[0] );
             }
 

Search-Query/trunk/t/07-term-expander.t

@@ -15 +15 @@
 
 ok( my $query = $parser->parse("foo=bar"), "parse foo=bar" );
-is( "$query", qq/+foo=(one OR two OR three OR bar)/, "query expanded" );
+my $expect = qq/+(foo=one foo=two foo=three foo=bar)/;
+is( "$query", $expect, "query expanded" );