Can now use attribute maps in query strings.

marklogic-community · Aug 13, 2011 · 9b0557e · 9b0557e
1 parent 42c7f13
commit 9b0557e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/data/lib/search.xqy b/data/lib/search.xqy
@@ -193,15 +193,21 @@ declare function search:mapValueToQuery(
         then xs:QName($index/element)
         else ()
     return
-        if($index/mode = "equals")
+        if($index/structure = "xmlattribute")
         then
-            if($value = ("true", "false"))
-            then cts:or-query((
-                cts:element-value-query($QName, $value),
-                cts:element-attribute-value-query($QName, xs:QName("boolean"), $value)
-            ))
-            else cts:element-value-query($QName, $value)
-        else cts:element-word-query($QName, $value)
+            if($index/mode = "equals")
+            then cts:element-attribute-value-query($QName, xs:QName($index/attribute), $value)
+            else cts:element-attribute-word-query($QName, xs:QName($index/attribute), $value)
+        else
+            if($index/mode = "equals")
+            then
+                if($value = ("true", "false"))
+                then cts:or-query((
+                    cts:element-value-query($QName, $value),
+                    cts:element-attribute-value-query($QName, xs:QName("boolean"), $value)
+                ))
+                else cts:element-value-query($QName, $value)
+            else cts:element-word-query($QName, $value)
 };
 
 declare function search:fieldValueToQuery(

diff --git a/test/js/query-string-parser-tests.js b/test/js/query-string-parser-tests.js