Changeset 2594

Timestamp:

03/09/10 22:28:15 (2 years ago)

Author:

karpet

Message:

add more tests, and make them pass

Location:

Search-Query-Dialect-KSx/trunk

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/Search/Query/Dialect/KSx.pm (modified) (10 diffs)
• lib/Search/Query/Dialect/KSx/Compiler.pm (modified) (1 diff)
• t/01-parser.t (modified) (1 diff)
• t/02-search.t (added)

Search-Query-Dialect-KSx/trunk/Changes

@@ -19 +19 @@
 0.05    xxx
         * refactor scoring via Compiler and Scorer.
+        * fix bugs with NOTQuery
+        * support NOTQuery around a RangeQuery
+        * preserve syntax of RangeQuerys on stringify()
+

Search-Query-Dialect-KSx/trunk/MANIFEST

@@ -11 +11 @@
 t/00-load.t
 t/01-parser.t
+t/02-search.t
 t/pod-coverage.t
 t/pod.t

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

@@ -94 +94 @@
     '+' => 'AND',
     ''  => 'OR',
-    '-' => 'NOT',
+    '-' => 'AND',
 );
 
@@ -181 +181 @@
         $op = '!' . $op unless $op =~ m/^!/;
     }
-    if ( $value =~ m/\*/ ) {
+    if ( $value =~ m/[\*\?]|\Q$wildcard/ ) {
         $op =~ s/:/~/g;
     }
@@ -196 +196 @@
         }
 
-        #warn dump [ $name, $op, $quote, $value ];
+        #warn "ks string: " . dump [ $name, $op, $prefix, $quote, $value ];
 
         # invert fuzzy
@@ -264 +264 @@
 =cut
 
+my %ks_class_map = (
+    '+' => 'AND',
+    ''  => 'OR',
+    '-' => 'NOT',
+);
+
 sub as_ks_query {
     my $self = shift;
@@ -271 +277 @@
     foreach my $prefix ( '+', '', '-' ) {
         my @clauses;
-        my $joiner = $op_map{$prefix};
+        my $joiner = $ks_class_map{$prefix};
         next unless exists $tree->{$prefix};
         for my $clause ( @{ $tree->{$prefix} } ) {
@@ -280 +286 @@
         my $ks_class = 'KinoSearch::Search::' . $joiner . 'Query';
 
-        push @q, @clauses == 1
-            ? $clauses[0]
-            : $ks_class->new( children => [ grep {defined} @clauses ] );
+        if ( @clauses == 1 ) {
+            if ( $prefix eq '-' ) {
+                push @q, $ks_class->new( negated_query => $clauses[0] );
+            }
+            else {
+                push @q, $clauses[0];
+            }
+        }
+        else {
+            if ( $prefix eq '-' ) {
+                my $and_not = KinoSearch::Search::ANDQuery->new(
+                    children => \@clauses );
+                push @q, $and_not;
+            }
+            else {
+                push @q,
+                    $ks_class->new( children => [ grep {defined} @clauses ] );
+            }
+        }
+
     }
 
@@ -326 +349 @@
     # normalize operator
     my $op = $clause->{op} || ":";
-    if ( $op eq '=' ) {
-        $op = ':';
-    }
+    $op =~ s/=/:/g;
     if ( $prefix eq '-' ) {
-        $op = '!' . $op;
-    }
-    if ( $value =~ m/\%/ ) {
+        $op = '!' . $op unless $op =~ m/^!/;
+    }
+    if ( $value =~ m/[\*\?]|\Q$wildcard/ ) {
         $op = $prefix eq '-' ? '!~' : '~';
     }
@@ -348 +369 @@
         }
 
-        #warn dump [ $name, $op, $quote, $value ];
+        #warn "as_ks_query: " . dump [ $name, $op, $prefix, $quote, $value ];
 
         # range is un-analyzed
@@ -375 +396 @@
             }
 
-            croak "NOT Range query not yet supported";
-            next FIELD;    # haha. never get here.
+            my $range_query = KinoSearch::Search::RangeQuery->new(
+                field         => $name,
+                lower_term    => $value->[0],
+                upper_term    => $value->[1],
+                include_lower => 1,
+                include_upper => 1,
+            );
+            push(
+                @buf,
+                KinoSearch::Search::NOTQuery->new(
+                    negated_query => $range_query
+                )
+            );
+            next FIELD;
         }
 
@@ -488 +521 @@
                     @buf,
                     KinoSearch::Search::NOTQuery->new(
-                        field => $name,
-                        term  => $term,
+                        negated_query => KinoSearch::Search::TermQuery->new(
+                            field => $name,
+                            term  => $term,
+                        )
                     )
                 );

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

@@ -89 +89 @@
         #carp "$term field:$field: term>$lex_term<";
         if ($include) {
-            next unless $lex_term =~ $regex;
+            last unless $lex_term =~ $regex;
         }
         else {

Search-Query-Dialect-KSx/trunk/t/01-parser.t

@@ -149 +149 @@
 
 #dump $range_not_query;
-is( $range_not_query, qq/NOT date:(1..3)/, "!range expanded" );
+is( $range_not_query, qq/NOT (date:(1..3))/, "!range expanded" );
 
 # operators