Can create mappings off of xml attributes.

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

Hide file tree

Showing 5 changed files with 60 additions and 4 deletions.
diff --git a/config/endpoints.xqy b/config/endpoints.xqy
@@ -135,6 +135,7 @@ declare variable $endpoints:ENDPOINTS as element(rest:options) :=
         <http method="POST">
             <param name="key" required="false"/>
             <param name="element" required="false"/>
+            <param name="attribute" required="false"/>
             <param name="mode" required="true"/>
         </http>
         <http method="DELETE"/>

diff --git a/data/lib/index-config.xqy b/data/lib/index-config.xqy
@@ -56,6 +56,16 @@ declare function config:setXMLMap(
     prop:set(concat("index-", $name), concat("map/xmlelement/", $name, "/", $element, "/", $mode))
 };
 
+declare function config:setXMLMap(
+    $name as xs:string,
+    $element as xs:string,
+    $attribute as xs:string,
+    $mode as xs:string
+) as empty-sequence()
+{
+    prop:set(concat("index-", $name), concat("map/xmlattribute/", $name, "/", $element, "/", $attribute, "/", $mode))
+};
+
 declare function config:setJSONRange(
     $name as xs:string,
     $key as xs:string,
@@ -331,6 +341,12 @@ declare function config:get(
                     <element>{ $bits[4] }</element>,
                     <mode>{ $bits[5] }</mode>
                 )
+                else if($bits[2] = "xmlattribute")
+                then (
+                    <element>{ $bits[4] }</element>,
+                    <attribute>{ $bits[5] }</attribute>,
+                    <mode>{ $bits[6] }</mode>
+                )
                 else ()
             }
         </index>

diff --git a/data/lib/manage.xqy b/data/lib/manage.xqy
@@ -135,6 +135,20 @@ declare function manage:createXMLMap(
     return config:setXMLMap($name, $element, $mode)
 };
 
+declare function manage:createXMLMap(
+    $name as xs:string,
+    $element as xs:string,
+    $attribute as xs:string,
+    $mode as xs:string
+) as empty-sequence()
+{
+    let $test := manage:validateIndexName($name)
+    let $test := manage:validateElementName($element)
+    let $test := manage:validateAttributeName($attribute)
+    let $test := manage:validateMode($mode)
+    return config:setXMLMap($name, $element, $attribute, $mode)
+};
+
 declare function manage:deleteMap(
     $name as xs:string
 ) as empty-sequence()
@@ -154,16 +168,23 @@ declare function manage:getMap(
         if($type = "json")
         then json:object((
             "name", $name,
-            "type", $type,
             "key", string($index/key),
             "mode", $mode
         ))
-        else json:object((
+        else if($type = "xmlelement")
+        then json:object((
+            "name", $name,
+            "element", string($index/element),
+            "mode", $mode
+        ))
+        else if($type = "xmlattribute")
+        then json:object((
             "name", $name,
-            "type", $type,
             "element", string($index/element),
+            "attribute", string($index/attribute),
             "mode", $mode
         ))
+        else ()
 };
 
 declare function manage:getAllMaps(

diff --git a/data/manage/map.xqy b/data/manage/map.xqy
@@ -30,6 +30,7 @@ let $params := rest:process-request(endpoints:request("/data/manage/map.xqy"))
 let $name := map:get($params, "name")
 let $key := map:get($params, "key")
 let $element := map:get($params, "element")
+let $attribute := map:get($params, "attribute")
 let $mode := map:get($params, "mode")
 let $requestMethod := xdmp:get-request-method()
 
@@ -49,6 +50,8 @@ return
         else try {
             if(exists($key))
             then manage:createJSONMap($name, $key, $mode)
+            else if(exists($element) and exists($attribute))
+            then manage:createXMLMap($name, $element, $attribute, $mode)
             else if(exists($element))
             then manage:createXMLMap($name, $element, $mode)
             else ()

diff --git a/test/js/indexmgmt-tests.js b/test/js/indexmgmt-tests.js
@@ -264,14 +264,23 @@ mljson.addIndexes = function(callback) {
         {
             "type": "map",
             "name": "map6",
+            "element": "testns:element1",
+            "attribute": "mapattr",
+            "mode": "equals",
+            "shouldSucceed": true,
+            "purpose": "XML contains map with valid namespace and attribute"
+        },
+        {
+            "type": "map",
+            "name": "map7",
             "element": "invalidns:element1",
             "mode": "equals",
             "shouldSucceed": false,
             "purpose": "XML contains map with invalid namespace"
         },
         {
             "type": "map",
-            "name": "map7",
+            "name": "map8",
             "key": "name1",
             "mode": "invalidmode",
             "shouldSucceed": false,
@@ -446,6 +455,9 @@ mljson.addIndexes = function(callback) {
             if(config.element !== undefined) {
                 equals(config.element, server.element, "Index element matches");
             }
+            if(config.attribute !== undefined) {
+                equals(config.attribute, server.attribute, "Index attribute matches");
+            }
             equals(config.mode, server.mode, "Index mode matches");
         }
         else if(config.type === "range") {
@@ -631,6 +643,9 @@ mljson.addIndexes = function(callback) {
                 if(index.element !== undefined) {
                     data.element = index.element;
                 }
+                if(index.attribute !== undefined) {
+                    data.attribute = index.attribute;
+                }
                 data.mode = index.mode;
             }
             else if(index.type === "field") {