Changeset 2590

Timestamp:

03/09/10 16:39:14 (2 years ago)

Author:

karpet

Message:

preserve range queries as ranges

Location:

Search-Query-Dialect-KSx/trunk

Files:

• lib/Search/Query/Dialect/KSx.pm (modified) (2 diffs)
• t/01-parser.t (modified) (2 diffs)

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

@@ -223 +223 @@
             }
 
-            # we support only numbers at this point
-            for my $v (@$value) {
-                if ( $v =~ m/\D/ ) {
-                    croak "non-numeric range values are not supported: $v";
-                }
-            }
-
-            my @range = ( $value->[0] .. $value->[1] );
-            push( @buf,
-                join( '', $name, ':', '(', join( ' OR ', @range ), ')' ) );
+            push(
+                @buf,
+                join( '',
+                    $name, ':', '(', $value->[0], '..', $value->[1], ')' )
+            );
 
         }
@@ -242 +237 @@
             }
 
-            # we support only numbers at this point
-            for my $v (@$value) {
-                if ( $v =~ m/\D/ ) {
-                    croak "non-numeric range values are not supported: $v";
-                }
-            }
-
-            my @range = ( $value->[0] .. $value->[1] );
-            push( @buf,
-                join( '', '-', $name, ':', '( ', join( ' ', @range ), ' )' )
+            push(
+                @buf,
+                join( '',
+                    $name, '!:', '(', $value->[0], '..', $value->[1], ')' )
             );
         }

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

@@ -143 +143 @@
 #dump $range_query;
 
-is( $range_query,
-    qq/date:(1 OR 2 OR 3 OR 4 OR 5 OR 6 OR 7 OR 8 OR 9 OR 10)/,
-    "range expanded"
-);
+is( $range_query, qq/date:(1..10)/, "range expanded" );
 
 ok( my $range_not_query = $range_parser->parse("date!=( 1..3 )"),
@@ -152 +149 @@
 
 #dump $range_not_query;
-is( $range_not_query, qq/-date:( 1 2 3 )/, "!range exanded" );
+is( $range_not_query, qq/date!:(1..3)/, "!range expanded" );
 
 # operators