Juan Zacarias has proposed merging lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba.
Commit message: Updated node-position module to Zorba 3.0 format. Requested reviews: Chris Hillery (ceejatec) Related bugs: Bug #1189795 in Zorba: "Update core module "node-position"" https://bugs.launchpad.net/zorba/+bug/1189795 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105 Updated node-position module to Zorba 3.0 format. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/zorba/xqdoc/images/modules.svg' --- doc/zorba/xqdoc/images/modules.svg 2013-06-25 03:55:20 +0000 +++ doc/zorba/xqdoc/images/modules.svg 2013-07-04 22:33:25 +0000 @@ -2045,7 +2045,7 @@ </g> <!-- 8 --> <g id="node213" class="node"><title>8</title> -<a xlink:href="../modules_zorba_xquery_data_model_node_Node Position.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node-position";> +<a xlink:href="../modules_zorba_xquery_data_model_node_Node Position.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/node-position";> <ellipse fill="white" stroke="white" cx="1293" cy="-172" rx="59.2173" ry="18"/> <text text-anchor="middle" x="1293" y="-168.3" font-family="Times,serif" font-size="14.00" fill="red">node-position</text> </a> === modified file 'doc/zorba/xqdoc/images/modules_new.svg' --- doc/zorba/xqdoc/images/modules_new.svg 2013-06-25 03:55:20 +0000 +++ doc/zorba/xqdoc/images/modules_new.svg 2013-07-04 22:33:25 +0000 @@ -2045,7 +2045,7 @@ </g> <!-- 8 --> <g id="node213" class="node"><title>8</title> -<a xlink:href="../modules_zorba_xquery_data_model_node_Node Position.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node-position";> +<a xlink:href="../modules_zorba_xquery_data_model_node_Node Position.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/node-position";> <ellipse fill="white" stroke="white" cx="1293" cy="-172" rx="59.2173" ry="18"/> <text text-anchor="middle" x="1293" y="-168.3" font-family="Times,serif" font-size="14.00" fill="red">node-position</text> </a> === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-06-28 02:33:07 +0000 +++ modules/CMakeLists.txt 2013-07-04 22:33:25 +0000 @@ -18,6 +18,7 @@ ADD_SUBDIRECTORY(xqxq) ADD_SUBDIRECTORY(w3c) ADD_SUBDIRECTORY(full-text) +ADD_SUBDIRECTORY(nodes) # Add external module projects - any subdirectories of a directory # named "zorba_modules" as a sibling to the main Zorba source === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-06-28 02:33:07 +0000 +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-07-04 22:33:25 +0000 @@ -62,8 +62,6 @@ URI "http://www.zorba-xquery.com/modules/node-reference";) DECLARE_ZORBA_MODULE(FILE reference.xq VERSION 1.0 URI "http://www.zorba-xquery.com/modules/reference";) -DECLARE_ZORBA_MODULE(FILE node-position.xq VERSION 2.0 - URI "http://www.zorba-xquery.com/modules/node-position";) DECLARE_ZORBA_MODULE(FILE node.xq VERSION 2.0 URI "http://www.zorba-xquery.com/modules/node";) DECLARE_ZORBA_MODULE(FILE item.xq VERSION 1.0 === added directory 'modules/nodes' === added file 'modules/nodes/CMakeLists.txt' --- modules/nodes/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ modules/nodes/CMakeLists.txt 2013-07-04 22:33:25 +0000 @@ -0,0 +1,2 @@ +DECLARE_ZORBA_MODULE(FILE node-position.xq VERSION 2.0 + URI "http://zorba.io/modules/node-position";) \ No newline at end of file === renamed file 'modules/com/zorba-xquery/www/modules/node-position.xq' => 'modules/nodes/node-position.xq' --- modules/com/zorba-xquery/www/modules/node-position.xq 2013-06-15 16:20:18 +0000 +++ modules/nodes/node-position.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -xquery version "1.0"; +jsoniq version "1.0"; (: : Copyright 2006-2011 The FLWOR Foundation. : @@ -16,28 +16,28 @@ :) (:~ - : This module provides a function (np:node-position) that, given a node, + : <p>This module provides a function (np:node-position) that, given a node, : returns positional information about the node in the form of an xs:anyURI : item. The module also defines functions that use such positional information : to determine: (1) positional relationships between two nodes (e.g. if one : is the ancestor of another) and (2) positional properties of a single node - : (e.g. its level in the tree). - : - : Within this module, the term "node position" will be used to refer to an - : xs:anyURI item that is returned by the np:node-position function. + : (e.g. its level in the tree).</p> + : <p/> + : <p>Within this module, the term "node position" will be used to refer to an + : xs:anyURI item that is returned by the np:node-position function.</p> : : @author Federico Cavalieri, Markos Zaharioudakis : : @project Zorba/XQuery Data Model/Node/Node Position :) -module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +module namespace np = "http://zorba.io/modules/node-position";; declare namespace ver = "http://www.zorba-xquery.com/options/versioning";; declare option ver:module-version "2.0"; (:~ - : Return a URI item containing positional information for a given node. - : + : <p>Return a URI item containing positional information for a given node.</p> + : <p/> : <p>Within a snapshot, each has a different positional URI. However, : different nodes in different snapshots might have the same URI.</p> : @@ -51,14 +51,14 @@ ) as xs:anyURI external; (:~ - : Determines whether the node position given as second argument is - : an ancestor of the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : an ancestor of the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is an ancestor of the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is an ancestor of the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential descendant node position : @param $n-pos2 the potential ancestor node position @@ -74,14 +74,14 @@ $pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : a descendant of the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : a descendant of the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is a descendant of the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is a descendant of the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential ancestor node position : @param $n-pos2 the potential descendant node position @@ -97,22 +97,22 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument belongs - : to the subtree rooted at the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument belongs + : to the subtree rooted at the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that : is, within snapshot S, the second node belongs to the subtree rooted at the : first. Otherwise, the result of the function does not imply anything about - : the positional relationship of the two nodes. - : - : This function differs from np:descendant-of in the way it treats attribute + : the positional relationship of the two nodes.</p> + : <p/> + : <p>This function differs from np:descendant-of in the way it treats attribute : nodes. np:descendant-of follows the XQuery/XPath specification for the : descendant axis, and as a result, it does not consider attributes as : descendants of any nodes; it will always return false if $n-pos2 was : obtained from an attribute node.In contrast, np:in-subtree-of will return : true if $n-pos2 was obtained from an attribute node that appeared in the - : subtree of the node that $n-pos1 was obtained from. + : subtree of the node that $n-pos1 was obtained from.</p> : : @param $n-pos1 the potential subtree root node position : @param $n-pos2 the potential node in the subtree node position @@ -128,14 +128,14 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : the parent of the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : the parent of the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is the parent of the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is the parent of the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential child node position : @param $n-pos2 the potential parent node position @@ -151,14 +151,14 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : a child of the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : a child of the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is a child of the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is a child of the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential parent node position : @param $n-pos2 the potential child node position @@ -174,14 +174,14 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : an attribute of the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : an attribute of the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is an attribute of the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is an attribute of the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential parent node position : @param $n-pos2 the potential attribute node position @@ -197,14 +197,14 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : a following-sibling of the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : a following-sibling of the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is a following-sibling of the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is a following-sibling of the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential preceding-sibling node position : @param $n-pos2 the potential following-sibling node position @@ -220,14 +220,14 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : a preceding-sibling of the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : a preceding-sibling of the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is a preceding-sibling of the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is a preceding-sibling of the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential following-sibling node position : @param $n-pos2 the potential preceding-sibling node position @@ -243,13 +243,13 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether two node positions are siblings. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether two node positions are siblings.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is a sibling of the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is a sibling of the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 a node position : @param $n-pos2 a node position @@ -265,14 +265,14 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : following the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : following the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is following the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is following the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential preceding node position : @param $n-pos2 the potential following node position @@ -289,14 +289,15 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : following in document order the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : following in document order the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that : is, within snapshot S, the second node is following in document order the - : first. Otherwise, the result of the function does not imply anything about - : the positional relationship of the two nodes. + : first.</p> + : <p>Otherwise, the result of the function does not imply anything about + : the positional relationship of the two nodes.</p> : : @param $n-pos1 the potential preceding node position : @param $n-pos2 the potential following node position @@ -312,14 +313,14 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : preceding the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : preceding the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the second node is preceding the first. - : Otherwise, the result of the function does not imply anything about the - : positional relationship of the two nodes. + : is, within snapshot S, the second node is preceding the first.</p> + : <p>Otherwise, the result of the function does not imply anything about the + : positional relationship of the two nodes.</p> : : @param $n-pos1 the potential following node position : @param $n-pos2 the potential preceding node position @@ -336,14 +337,15 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether the node position given as second argument is - : preceding in document order the node position given as first argument. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether the node position given as second argument is + : preceding in document order the node position given as first argument.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that : is, within snapshot S, the second node is preceding in document order the - : first. Otherwise, the result of the function does not imply anything about - : the positional relationship of the two nodes. + : first.</p> + : <p>Otherwise, the result of the function does not imply anything about + : the positional relationship of the two nodes.</p> : : @param $n-pos1 the potential following node position : @param $n-pos2 the potential preceding node position @@ -359,15 +361,15 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Computes the level of a node position in its tree. - : - : Note: The root node of a tree is at level one. - : - : The result of the function applies to the corresponding node as well, + : <p>Computes the level of a node position in its tree.</p> + : <p/> + : <p>Note: The root node of a tree is at level one.</p> + : <p/> + : <p>The result of the function applies to the corresponding node as well, : that is, within the snapshot in which the position was computed, the node - : level is the returned one. - : The result of the function does not imply anything about the - : node level in other snapshots. + : level is the returned one.</p> + : <p>The result of the function does not imply anything about the + : node level in other snapshots.</p> : : @param $n-pos the node position of the node whose level should be : determined. @@ -381,7 +383,7 @@ $n-pos as xs:anyURI) as xs:integer external; (:~ - : Determines whether a node position corresponds to an attribute node. + : <p>Determines whether a node position corresponds to an attribute node.</p> : : @param $n-pos the potential attribute node position : @@ -395,7 +397,7 @@ $n-pos1 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether a node position corresponds to a comment node. + : <p>Determines whether a node position corresponds to a comment node.</p> : : @param $n-pos the potential comment node position : @@ -409,7 +411,7 @@ $n-pos1 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether a node position corresponds to a document node. + : <p>Determines whether a node position corresponds to a document node.</p> : : @param $n-pos the potential document node position : @@ -423,7 +425,7 @@ $n-pos1 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether a node position corresponds to an element node. + : <p>Determines whether a node position corresponds to an element node.</p> : : @param $n-pos the potential element node position : @@ -437,8 +439,8 @@ $n-pos1 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether a node position corresponds to an processing-instruction - : node. + : <p>Determines whether a node position corresponds to an processing-instruction + : node.</p> : : @param $n-pos the potential processing-instruction node position : @@ -452,7 +454,7 @@ $n-pos1 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether a node position corresponds to a text node. + : <p>Determines whether a node position corresponds to a text node.</p> : : @param $n-pos the potential text node position : @@ -466,13 +468,13 @@ $n-pos1 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether two node positions belong to the same tree. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether two node positions belong to the same tree.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the two nodes belong to the same tree. - : Otherwise, the result of the function does not imply anything about - : the positional relationship of the two nodes. + : is, within snapshot S, the two nodes belong to the same tree.</p> + : <p>Otherwise, the result of the function does not imply anything about + : the positional relationship of the two nodes.</p> : : @param $n-pos1 a node position : @param $n-pos2 a node position @@ -488,7 +490,7 @@ $n-pos2 as xs:anyURI) as xs:boolean external; (:~ - : Determines whether a node position belongs to a collection. + : <p>Determines whether a node position belongs to a collection.</p> : : @param $n-pos the node position : @@ -502,13 +504,13 @@ $n-pos as xs:anyURI) as xs:boolean external; (:~ - : Determines whether two node positions belong to the same collection. - : - : If the two positions were obtained within the same snapshot S, then the + : <p>Determines whether two node positions belong to the same collection.</p> + : <p/> + : <p>If the two positions were obtained within the same snapshot S, then the : result of the function applies to the corresponding nodes as well, that - : is, within snapshot S, the two nodes belong to the same collection. - : Otherwise, the result of the function does not imply anything about - : the positional relationship of the two nodes. + : is, within snapshot S, the two nodes belong to the same collection.</p> + : <p>Otherwise, the result of the function does not imply anything about + : the positional relationship of the two nodes.</p> : : @param $n-pos1 a node position : @param $n-pos2 a node position === modified file 'src/context/static_context.cpp' --- src/context/static_context.cpp 2013-06-26 02:30:04 +0000 +++ src/context/static_context.cpp 2013-07-04 22:33:25 +0000 @@ -367,7 +367,7 @@ const char* static_context::ZORBA_NODEPOS_FN_NS = -"http://www.zorba-xquery.com/modules/node-position";; +"http://zorba.io/modules/node-position";; const char* static_context::ZORBA_STORE_DYNAMIC_COLLECTIONS_DDL_FN_NS = === modified file 'src/functions/pregenerated/func_node_position.cpp' --- src/functions/pregenerated/func_node_position.cpp 2013-03-05 23:11:50 +0000 +++ src/functions/pregenerated/func_node_position.cpp 2013-07-04 22:33:25 +0000 @@ -277,7 +277,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_node_position, - (createQName("http://www.zorba-xquery.com/modules/node-position","","node-position";), + (createQName("http://zorba.io/modules/node-position","","node-position";), GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_NODE_POSITION_1); @@ -289,7 +289,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_ancestor_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","ancestor-of";), + (createQName("http://zorba.io/modules/node-position","","ancestor-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -302,7 +302,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_following_sibling_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","following-sibling-of";), + (createQName("http://zorba.io/modules/node-position","","following-sibling-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -315,7 +315,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_following_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","following-of";), + (createQName("http://zorba.io/modules/node-position","","following-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -328,7 +328,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_in_subtree_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","in-subtree-of";), + (createQName("http://zorba.io/modules/node-position","","in-subtree-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -341,7 +341,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_descendant_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","descendant-of";), + (createQName("http://zorba.io/modules/node-position","","descendant-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -354,7 +354,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_preceding_sibling_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","preceding-sibling-of";), + (createQName("http://zorba.io/modules/node-position","","preceding-sibling-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -367,7 +367,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_preceding_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","preceding-of";), + (createQName("http://zorba.io/modules/node-position","","preceding-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -380,7 +380,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_child_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","child-of";), + (createQName("http://zorba.io/modules/node-position","","child-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -393,7 +393,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_attribute_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","attribute-of";), + (createQName("http://zorba.io/modules/node-position","","attribute-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -406,7 +406,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_parent_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","parent-of";), + (createQName("http://zorba.io/modules/node-position","","parent-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -419,7 +419,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_preceding_in_document_order_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","preceding-in-document-order-of";), + (createQName("http://zorba.io/modules/node-position","","preceding-in-document-order-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -432,7 +432,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_following_in_document_order_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","following-in-document-order-of";), + (createQName("http://zorba.io/modules/node-position","","following-in-document-order-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -445,7 +445,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_level, - (createQName("http://www.zorba-xquery.com/modules/node-position","","level";), + (createQName("http://zorba.io/modules/node-position","","level";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.INTEGER_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_LEVEL_1); @@ -457,7 +457,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_is_attribute, - (createQName("http://www.zorba-xquery.com/modules/node-position","","is-attribute";), + (createQName("http://zorba.io/modules/node-position","","is-attribute";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_IS_ATTRIBUTE_1); @@ -469,7 +469,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_is_comment, - (createQName("http://www.zorba-xquery.com/modules/node-position","","is-comment";), + (createQName("http://zorba.io/modules/node-position","","is-comment";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_IS_COMMENT_1); @@ -481,7 +481,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_is_document, - (createQName("http://www.zorba-xquery.com/modules/node-position","","is-document";), + (createQName("http://zorba.io/modules/node-position","","is-document";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_IS_DOCUMENT_1); @@ -493,7 +493,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_is_element, - (createQName("http://www.zorba-xquery.com/modules/node-position","","is-element";), + (createQName("http://zorba.io/modules/node-position","","is-element";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_IS_ELEMENT_1); @@ -505,7 +505,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_is_processing_instruction, - (createQName("http://www.zorba-xquery.com/modules/node-position","","is-processing-instruction";), + (createQName("http://zorba.io/modules/node-position","","is-processing-instruction";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_IS_PROCESSING_INSTRUCTION_1); @@ -517,7 +517,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_is_text, - (createQName("http://www.zorba-xquery.com/modules/node-position","","is-text";), + (createQName("http://zorba.io/modules/node-position","","is-text";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_IS_TEXT_1); @@ -529,7 +529,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_sibling_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","sibling-of";), + (createQName("http://zorba.io/modules/node-position","","sibling-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -542,7 +542,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_in_same_tree_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","in-same-tree-of";), + (createQName("http://zorba.io/modules/node-position","","in-same-tree-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), @@ -555,7 +555,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_in_collection, - (createQName("http://www.zorba-xquery.com/modules/node-position","","in-collection";), + (createQName("http://zorba.io/modules/node-position","","in-collection";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), FunctionConsts::FN_ZORBA_POS_IN_COLLECTION_1); @@ -567,7 +567,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_pos_in_same_collection_of, - (createQName("http://www.zorba-xquery.com/modules/node-position","","in-same-collection-of";), + (createQName("http://zorba.io/modules/node-position","","in-same-collection-of";), GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.ANY_URI_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE), === modified file 'src/runtime/spec/mappings.xml' --- src/runtime/spec/mappings.xml 2013-06-25 23:53:54 +0000 +++ src/runtime/spec/mappings.xml 2013-07-04 22:33:25 +0000 @@ -28,7 +28,7 @@ define="ZORBA_REF_FN_NS" prefix="fn-reference"/> - <zorba:namespace uri="http://www.zorba-xquery.com/modules/node-position"; + <zorba:namespace uri="http://zorba.io/modules/node-position"; define="ZORBA_NODEPOS_FN_NS" prefix="fn-zorba-pos"/> === modified file 'test/rbkt/Queries/zorba/nodes/position_1.xq' --- test/rbkt/Queries/zorba/nodes/position_1.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/nodes/position_1.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";; === modified file 'test/rbkt/Queries/zorba/nodes/position_1_parsed.xq' --- test/rbkt/Queries/zorba/nodes/position_1_parsed.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/nodes/position_1_parsed.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";; === modified file 'test/rbkt/Queries/zorba/nodes/position_2.xq' --- test/rbkt/Queries/zorba/nodes/position_2.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/nodes/position_2.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";; === modified file 'test/rbkt/Queries/zorba/nodes/position_2_parsed.xq' --- test/rbkt/Queries/zorba/nodes/position_2_parsed.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/nodes/position_2_parsed.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";; === modified file 'test/rbkt/Queries/zorba/nodes/position_3.xq' --- test/rbkt/Queries/zorba/nodes/position_3.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/nodes/position_3.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; declare function local:test-types($s-info) { === modified file 'test/rbkt/Queries/zorba/nodes/position_3_parsed.xq' --- test/rbkt/Queries/zorba/nodes/position_3_parsed.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/nodes/position_3_parsed.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; declare function local:test-types($s-info) { === modified file 'test/rbkt/Queries/zorba/nodes/position_4.xq' --- test/rbkt/Queries/zorba/nodes/position_4.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/nodes/position_4.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; declare function local:get-ordpath($struct) { === modified file 'test/rbkt/Queries/zorba/nodes/position_4_parsed.xq' --- test/rbkt/Queries/zorba/nodes/position_4_parsed.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/nodes/position_4_parsed.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; declare function local:get-ordpath($struct) { === modified file 'test/rbkt/Queries/zorba/nodes/position_err.xq' --- test/rbkt/Queries/zorba/nodes/position_err.xq 2013-06-25 03:55:20 +0000 +++ test/rbkt/Queries/zorba/nodes/position_err.xq 2013-07-04 22:33:25 +0000 @@ -1,4 +1,4 @@ -import module namespace np = "http://www.zorba-xquery.com/modules/node-position";; +import module namespace np = "http://zorba.io/modules/node-position";; declare namespace err="http://www.w3.org/2005/xqt-errors";;
-- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
