From bbf1fb7346c159289fc392c25de4ea1ece7fe2bf Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@miketaylor.org.uk>
Date: Tue, 25 May 2010 16:37:55 +0200
Subject: [PATCH] Updated results for fixed queries and V1.2 relations

---
 test/regression/sections/02/12.xcql |    2 +-
 test/regression/sections/05/06.xcql |    2 +-
 test/regression/sections/09/01.xcql |   46 ++++++++++++-----------------------
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/test/regression/sections/02/12.xcql b/test/regression/sections/02/12.xcql
index a648cc5..b4bcf3b 100644
--- a/test/regression/sections/02/12.xcql
+++ b/test/regression/sections/02/12.xcql
@@ -1,7 +1,7 @@
 <searchClause>
   <index>dc.title</index>
   <relation>
-    <value>scr</value>
+    <value>any</value>
   </relation>
   <term>fish frog chicken</term>
 </searchClause>
diff --git a/test/regression/sections/05/06.xcql b/test/regression/sections/05/06.xcql
index 42029b0..4ffea29 100644
--- a/test/regression/sections/05/06.xcql
+++ b/test/regression/sections/05/06.xcql
@@ -18,7 +18,7 @@
     <searchClause>
       <index>dc.author</index>
       <relation>
-        <value>exact</value>
+        <value>==</value>
       </relation>
       <term>jones</term>
     </searchClause>
diff --git a/test/regression/sections/09/01.xcql b/test/regression/sections/09/01.xcql
index d0a5e52..f721ed0 100644
--- a/test/regression/sections/09/01.xcql
+++ b/test/regression/sections/09/01.xcql
@@ -1,55 +1,39 @@
 <triple>
   <boolean>
-    <value>prox</value>
+    <value>and</value>
   </boolean>
   <leftOperand>
     <triple>
       <boolean>
-        <value>and</value>
+        <value>or</value>
       </boolean>
       <leftOperand>
-        <triple>
-          <boolean>
-            <value>or</value>
-          </boolean>
-          <leftOperand>
-            <searchClause>
-              <index>cql.serverChoice</index>
-              <relation>
-                <value>=</value>
-              </relation>
-              <term>any</term>
-            </searchClause>
-          </leftOperand>
-          <rightOperand>
-            <searchClause>
-              <index>cql.serverChoice</index>
-              <relation>
-                <value>=</value>
-              </relation>
-              <term>all:stem</term>
-            </searchClause>
-          </rightOperand>
-        </triple>
+        <searchClause>
+          <index>cql.serverChoice</index>
+          <relation>
+            <value>=</value>
+          </relation>
+          <term>any</term>
+        </searchClause>
       </leftOperand>
       <rightOperand>
         <searchClause>
-          <index>all</index>
+          <index>cql.serverChoice</index>
           <relation>
-            <value>exact</value>
+            <value>=</value>
           </relation>
-          <term>any</term>
+          <term>all:stem</term>
         </searchClause>
       </rightOperand>
     </triple>
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>prox</index>
+      <index>all contains</index>
       <relation>
-        <value>=</value>
+        <value>any</value>
       </relation>
-      <term>fuzzy</term>
+      <term>prox proxfuzzy</term>
     </searchClause>
   </rightOperand>
 </triple>
-- 
1.7.10.4