Merge lp:~zorba-coders/zorba/bug-1005995 into lp:zorba

[Till Westmann]

modify fn:path to add support for fragments

modify fn:path to add support for fragments

[Till Westmann (tillw)]

review: Approve

[Till Westmann (tillw)]

Since I needed this, I've added the fragment support to fn:path.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1005995-2012-06-28T00-06-57.561Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1005995-2012-06-28T00-06-57.561Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending.

[Matthias Brantner (matthias-brantner)]

looks good but addition to ChangeLog is missing

review: Needs Fixing

[lp:~zorba-coders/zorba/bug-1005995]

10899. By Till Westmann on 2012-06-28

update change log

Unmerged revisions

=== modified file 'ChangeLog'
--- ChangeLog	2012-06-27 14:07:46 +0000
+++ ChangeLog	2012-06-28 04:24:22 +0000
@@ -8,6 +8,7 @@
   * New XQuery 3.0 functions
     - fn:parse-xml-fragment#1
   * Added support for transient maps to the http://www.zorba-xquery.com/modules/store/data-structures/unordered-map module.
+  * Added support for fragments to fn:path
 
 Optimizations:
   * Small optimization of comparison operations.

=== modified file 'src/runtime/nodes/nodes_impl.cpp'
--- src/runtime/nodes/nodes_impl.cpp	2012-06-18 10:06:47 +0000
+++ src/runtime/nodes/nodes_impl.cpp	2012-06-28 04:24:22 +0000
@@ -653,95 +653,87 @@
 bool FnPathIterator::nextImpl(store::Item_t& result, PlanState& planState) const
 {
   store::Item_t inNode;
+  store::Item_t swap;
   store::Item_t nodeName;
-  store::NsBindings nsBindings;
   zstring path;
   zstring temp;
   zstring zNamespace;
   zstring zLocalName;
   zstring zPosition;
-  bool rootIsDocument = false;
 
   PlanIteratorState* state;
   DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
 
   if (consumeNext(inNode, theChildren[0], planState))
   {
-    do
-    { 
+    while (inNode->getParent())
+    {
+      temp = path;
+      path = "/";
+
       switch (inNode->getNodeKind())
       {
-        case store::StoreConsts::documentNode:
-          temp = path;
-          path = "/";
-          path += temp;
-          rootIsDocument = true;
-          break;
         case store::StoreConsts::elementNode:
           nodeName = inNode->getNodeName();
           zNamespace = nodeName->getNamespace();
           zLocalName = nodeName->getLocalName();
           zPosition = ztd::to_string(getNodePosition(inNode));
-          temp = path;
-          path = "\""+zNamespace+"\":"+zLocalName+"["+zPosition.c_str()+"]";
-          path += temp;
+          path += "\""+zNamespace+"\":"+zLocalName+"["+zPosition+"]";
           break;
         case store::StoreConsts::attributeNode:
           nodeName = inNode->getNodeName();
           zNamespace =nodeName->getNamespace();
           zLocalName = nodeName->getLocalName();
+          path += "@";
           if(zNamespace != "")
           {
-            temp = path;
-            path = "@\""+zNamespace+"\":"+zLocalName;
-            path += temp;
-          }
-          else
-          {
-            temp = path;
-            path = "@"+zLocalName;
-            path += temp;
-          }
+            path += "\""+zNamespace+"\":";
+          }
+          path += zLocalName;
           break;
         case store::StoreConsts::textNode:
           zPosition = ztd::to_string(getNodePosition(inNode));
-          temp = path;
-          path = "text()["+zPosition+"]";
-          path += temp;
+          path += "text()["+zPosition+"]";
           break;
         case store::StoreConsts::commentNode:
           zPosition = ztd::to_string(getNodePosition(inNode));
-          temp = path;
-          path = "comment()["+zPosition+"]";
-          path += temp;
+          path += "comment()["+zPosition+"]";
+          break;
+        case store::StoreConsts::piNode:
+          nodeName = inNode->getNodeName();
+          zLocalName = nodeName->getLocalName();
+          zPosition = ztd::to_string(getNodePosition(inNode));
+          path += "processing-instruction("+zLocalName+")["+zPosition+"]";
           break;
         default:
-          if(inNode->isProcessingInstruction())
-          {
-            nodeName = inNode->getNodeName();
-            zLocalName = nodeName->getLocalName();
-            zPosition = ztd::to_string(getNodePosition(inNode));
-            temp = path;
-            path = "processing-instruction("+zLocalName+")["+zPosition+"]";
-            path += temp;
-          }
+          // this is either a documentNode which should always be a root
+          // node (and not end up here) or it is something very strange
+          ZORBA_ASSERT(false);
           break;
       }
-      inNode = inNode->getParent();
-      
-      if(inNode && inNode->getNodeKind() != store::StoreConsts::documentNode)
+      path += temp;
+
+      swap = inNode->getParent();
+      inNode = swap;
+    }
+
+    // only the root node is left and there we've got some special
+    // cases in the spec
+    if (inNode->getNodeKind() == store::StoreConsts::documentNode)
+    {
+      if (path.empty())
       {
-        temp = path;
         path = "/";
-        path += temp;
       }
-
-    } while (inNode);
-
-    if(rootIsDocument)
-      STACK_PUSH(GENV_ITEMFACTORY->createString(result, path), state);
+    }
     else
-      throw XQUERY_EXCEPTION(err::FODC0001, ERROR_PARAMS("fn:path"), ERROR_LOC(loc));
+    {
+      temp = path;
+      path = "\"http://www.w3.org/2005/xpath-functions\":root()";
+      path += temp;
+    }
+
+    STACK_PUSH(GENV_ITEMFACTORY->createString(result, path), state);
   }
 
   STACK_END (state);