X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fregression%2Fqueries.raw;h=6075e697db8e4eb7506dc0bb93370ce7deeb55a4;hb=b306a0bee75d8a4cc9eef354a217fe8d335b36e8;hp=d66155784ddac9e7793f0c80b33fc5f64a2188ba;hpb=e65abb32074bc06d07f5c3c4acb28103c1f9faf2;p=cql-java-moved-to-github.git

diff --git a/test/regression/queries.raw b/test/regression/queries.raw
index d661557..6075e69 100644
--- a/test/regression/queries.raw
+++ b/test/regression/queries.raw
@@ -7,13 +7,13 @@ comp.os.linux
 xml:element
 "<xml:element>"
 "="
-"prox/>=/5/word"
+"prox/distance<3/unit=word"
 ("cat")
 ((dog))
 all
 prox
 
-# index relation term
+# Index Relation Term
 
 title = "fish"
 title exact fish
@@ -26,7 +26,12 @@ dc.title any/stem fish
 dc.fish all/stem/fuzzy "fish chips"
 (title any frog)
 ((dc.title any/stem "frog pond"))
-dc.title scr "fish frog chicken"
+dc.title any "fish frog chicken"
+dc.title =/rel.algorithm=CORI squid
+author any/f.foo/b.bar>1 "sanderson taylor"
+numberOfLegs <= 4
+numberOfLegs <> 4
+title == jaws
 
 # Simple Boolean
 
@@ -48,14 +53,17 @@ bath.author any fish and dc.title all "cat dog"
 # Prox
 
 cat prox hat
-cat prox/=/3/word/ordered hat
-cat prox//3 hat
-"fish food" prox///sentence and
-title all "chips frog" prox/>=/5 exact
-(dc.author exact "jones" prox/</5/element title >= "smith")
+cat prox/distance=3/unit=word/ordered hat
+cat prox/distance<3 hat
+"fish food" prox/unit=sentence and
+title all "chips frog" prox/distance<=5 exact
+(dc.author == "jones" prox/distance>5/unit=element title >= "smith")
 ((cat prox hat))
+a and/rel.SumOfScores b
+a and/rel.algorithm=CORI b
+
+# Special Characters
 
-# Special characters
 (cat^)
 "cat"
 "^cat says \"fish\""
@@ -63,7 +71,7 @@ title all "chips frog" prox/>=/5 exact
 cat?dog
 (("^cat*fishdog\"horse?"))
 
-# Nesting Parens
+# Nesting Parentheses
 
 (((cat or dog) or horse) and frog)
 (cat and dog) or (horse and frog)
@@ -71,30 +79,34 @@ cat?dog
 
 # Prefix Maps
 
-> foo="http://www.loc.gov/zing/cql/dc-indexes/" foo.title="fish"
+> foo="http://www.loc.gov/zing/cql/dc-indexes/" dc.title="fish"
 > "http://www.loc.gov/zing/cql/dc-indexes/" title="fish"
-> foo="http://www.loc.gov/zing/cql/dc-indexes" > ccg = "http://srw.o-r-g.org/indexSets/ccg/" foo.title="fish" and ccg.force=3
+> foo="http://www.loc.gov/zing/cql/dc-indexes" > ccg = "http://srw.o-r-g.org/cql/indexSets/ccg/" foo.title="fish" and ccg.force=3
 
-# Lame searches
+# Lame Searches
 
-any or all:stem and all exact any prox prox=fuzzy
+any or all:stem and all contains any prox proxfuzzy
 (((((((((any)))))))))
 ""
 > any > any = exact any > any
-
-# Invalid searches [should error]
-
->
-===
-cat or
-index any 
-index any/wrong term
-a prox/wrong b
-()
-(a
-index any fish)
-(cat any dog or ())
-title = ("illegal parentheses")
-"quoted" any "illegal quotes"
-> illegal="urn:missingQuery"
-"fish" and > illegal="urn:invalidPrefixLocation" "chips"
+sortby sortby sortby
+sortby sortby sortby sortby sortby
+
+# Sorting
+
+kernighan sortby title
+kernighan and ritchie sortby title
+dc.creator=kernighan sortby dc.title
+dc.creator=kernighan sortby numberOfLegs/cql.number
+dc.creator=kernighan sortby dc.title/sort.respectCase
+dc.creator=kernighan sortby dc.title/sort.respectCase/sort.descending
+dc.creator=kernighan sortby dc.date dc.title
+dc.creator=kernighan sortby dc.date/sort.missingOmit
+dc.creator=kernighan sortby dc.date/sort.missingValue=1970
+>dc="http://deepcustard.org/1.0" blah sortby dc.custardDepth
+>ns1="http://uri1" >ns2="http://uri2" whatever sortby ns1.key/a/b/c=1 ns2.key2
+(>dc=x b=c) sortby d
+b=(>dc=x c) sortby d
+(>dc=x c1 and c2) sortby d
+>dc="http://deepcustard.org" (>dc="http://dublincore.org" dc.title=jaws) sortby dc.custardDepth
+>dc="http://deepcustard.org" (fish or >dc="http://dublincore.org" dc.title=jaws) sortby dc.custardDepth