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

[Paul J. Lucas]

Renamed this module, plus:
* Majorly cleaned-up.
* @deprecated functions removed.
* Renamed integrity_constraints to integrity-constraints.

Renamed this module, plus:
* Majorly cleaned-up.
* @deprecated functions removed.
* Renamed integrity_constraints to integrity-constraints.

https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/409/parsed_console to view the results.

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

11674. By Paul J. Lucas on 2013-10-09

Intermediate check-in.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/410/parsed_console to view the results.

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

11675. By Paul J. Lucas on 2013-10-09

Intermediate check-in.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/411/parsed_console to view the results.

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

11676. By Paul J. Lucas on 2013-10-10

Intermediate check-in.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

11677. By Paul J. Lucas on 2013-10-10

Intermediate check-in.

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Stage "TestZorbaUbuntu" failed.
2469 tests failed (8573 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/363/testReport/ to view the results.

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

11678. By Paul J. Lucas on 2013-10-10

Intermediate check-in.

11679. By Paul J. Lucas on 2013-10-10

Merge from trunk.

11680. By Paul J. Lucas on 2013-10-10

Intermediate check-in.

11681. By Paul J. Lucas on 2013-10-10

Intermediate check-in.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Stage "TestZorbaUbuntu" failed.
39 tests failed (8573 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/368/testReport/ to view the results.

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

11682. By Paul J. Lucas on 2013-10-10

Intermediate check-in.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Stage "TestZorbaUbuntu" failed.
2 tests failed (8573 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/369/testReport/ to view the results.

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

11683. By Paul J. Lucas on 2013-10-15

Merge from trunk.

11684. By Paul J. Lucas on 2013-10-16

Merge from trunk.

11685. By Paul J. Lucas on 2013-10-16

Merge from trunk.

11686. By Paul J. Lucas on 2013-10-17

Cosmetic change.

11687. By Paul J. Lucas on 2013-10-17

Fixed for w3c collections.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Stage "ZorbaVQ" failed.

Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/488/console to view the results.

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

11688. By Paul J. Lucas on 2013-10-17

Merge from trunk.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 :
Votes: {'Approve': 1}

https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412 :
Votes: {'Approve': 1, 'Pending': 1}

https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414 :
Votes: {'Approve': 1, 'Pending': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/237/console to view the results.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412
https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'doc/cxx/examples/context.cpp'
--- doc/cxx/examples/context.cpp	2013-09-17 21:12:49 +0000
+++ doc/cxx/examples/context.cpp	2013-10-17 02:02:41 +0000
@@ -375,7 +375,7 @@
       std::unique_ptr<std::stringstream> lQuery(new std::stringstream());
       (*lQuery)
         << "module namespace mymodule = 'http://zorba.io/mymodule';" << std::endl
-        << "import module namespace dml = 'http://www.zorba-xquery.com/modules/store/static/collections/dml';" << std::endl
+        << "import module namespace dml = 'http://zorba.io/modules/store/static/collections/dml';" << std::endl
         << "declare namespace an = 'http://zorba.io/annotations';" << std::endl
         << "declare variable $mymodule:var  := 'myvar';" << std::endl
         << "declare collection mymodule:collection;" << std::endl
@@ -409,7 +409,7 @@
     Zorba_CompilerHints_t hints;
     std::stringstream lProlog;
     lProlog << "import module namespace mymodule = 'http://zorba.io/mymodule';" << std::endl
-            << "import module namespace ddl = 'http://www.zorba-xquery.com/modules/store/static/collections/ddl';"
+            << "import module namespace ddl = 'http://zorba.io/modules/store/static/collections/ddl';"
             << std::endl
             << "declare function local:collections() { " << std::endl
             << "  ddl:declared-collections()" << std::endl

=== modified file 'doc/zorba/data_lifecycle.dox'
--- doc/zorba/data_lifecycle.dox	2013-09-17 03:48:02 +0000
+++ doc/zorba/data_lifecycle.dox	2013-10-17 02:02:41 +0000
@@ -39,32 +39,32 @@
   <tr>
     <td>Collections</td>
     <td>DDL</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_static_collections_ddl.html">http://www.zorba-xquery.com/modules/store/static/collections/ddl</a></td>
+    <td><a href="../modules/zorba.io_modules_store_static_collections_ddl.html">http://zorba.io/modules/store/static/collections/ddl</a></td>
   </tr>
   <tr>
     <td>Collections</td>
     <td>DML</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_static_collections_dml.html">http://www.zorba-xquery.com/modules/store/static/collections/dml</a></td>
-  </tr>
-  <tr>
-    <td>Indexes</td>
-    <td>DDL</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_static_indexes_ddl.html">http://www.zorba-xquery.com/modules/store/static/indexes/ddl</a></td>
-  </tr>
-  <tr>
-    <td>Indexes</td>
-    <td>DML</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_static_indexes_dml.html">http://www.zorba-xquery.com/modules/store/static/indexes/dml</a></td>
-  </tr>
-  <tr>
-    <td>Integrity Constraints</td>
-    <td>DDL</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_static_integrity_constraints_ddl.html">http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl</a></td>
-  </tr>
-  <tr>
-    <td>Integrity Constraints</td>
-    <td>DML</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_static_integrity_constraints_dml.html">http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml</a></td>
+    <td><a href="../modules/zorba.io_modules_store_static_collections_dml.html">http://zorba.io/modules/store/static/collections/dml</a></td>
+  </tr>
+  <tr>
+    <td>Indexes</td>
+    <td>DDL</td>
+    <td><a href="../modules/zorba.io_modules_store_static_indexes_ddl.html">http://zorba.io/modules/store/static/indexes/ddl</a></td>
+  </tr>
+  <tr>
+    <td>Indexes</td>
+    <td>DML</td>
+    <td><a href="../modules/zorba.io_modules_store_static_indexes_dml.html">http://zorba.io/modules/store/static/indexes/dml</a></td>
+  </tr>
+  <tr>
+    <td>Integrity Constraints</td>
+    <td>DDL</td>
+    <td><a href="../modules/zorba.io_modules_store_static_integrity_constraints_ddl.html">http://zorba.io/modules/store/static/integrity_constraints/ddl</a></td>
+  </tr>
+  <tr>
+    <td>Integrity Constraints</td>
+    <td>DML</td>
+    <td><a href="../modules/zorba.io_modules_store_static_integrity_constraints_dml.html">http://zorba.io/modules/store/static/integrity_constraints/dml</a></td>
   </tr>
 </table>
 
@@ -83,27 +83,27 @@
   <tr>
     <td>Collections</td>
     <td>DDL</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_dynamic_collections_ddl.html">http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl</a></td>
+    <td><a href="../modules/zorba.io_modules_store_dynamic_collections_ddl.html">http://zorba.io/modules/store/dynamic/collections/ddl</a></td>
   </tr>
   <tr>
     <td>Collections</td>
     <td>DML</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_dynamic_collections_dml.html">http://www.zorba-xquery.com/modules/store/dynamic/collections/dml</a></td>
+    <td><a href="../modules/zorba.io_modules_store_dynamic_collections_dml.html">http://zorba.io/modules/store/dynamic/collections/dml</a></td>
   </tr>
   <tr>
     <td>W3C Collections</td>
     <td>DDL</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_dynamic_collections_w3c_ddl.html">http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl</a></td>
+    <td><a href="../modules/zorba.io_modules_store_dynamic_collections_w3c_ddl.html">http://zorba.io/modules/store/dynamic/collections/w3c/ddl</a></td>
   </tr>
   <tr>
     <td>W3C Collections</td>
     <td>DML</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_dynamic_collections_w3c_dml.html">http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml</a></td>
+    <td><a href="../modules/zorba.io_modules_store_dynamic_collections_w3c_dml.html">http://zorba.io/modules/store/dynamic/collections/w3c/dml</a></td>
   </tr>
   <tr>
     <td>Documents</td>
     <td>DDL / DML</td>
-    <td><a href="../modules/www.zorba-xquery.com_modules_store_dynamic_documents.html">http://www.zorba-xquery.com/modules/store/dynamic/documents</a></td>
+    <td><a href="../modules/zorba.io_modules_store_dynamic_documents.html">http://zorba.io/modules/store/documents</a></td>
   </tr>
   <tr>
     <td>Unordered Maps</td>

=== modified file 'doc/zorba/link_crawler2.dox'
--- doc/zorba/link_crawler2.dox	2013-08-09 09:04:36 +0000
+++ doc/zorba/link_crawler2.dox	2013-10-17 02:02:41 +0000
@@ -18,7 +18,7 @@
 :)
 
 import module namespace http = "http://www.zorba-xquery.com/modules/http-client";
-import module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";
+import module namespace map = "http://zorba.io/modules/store/data-structures/unordered-map";
 import module namespace html = "http://www.zorba-xquery.com/modules/converters/html";
 import module namespace parse-xml = "http://www.zorba-xquery.com/modules/xml";
 import module namespace file = "http://expath.org/ns/file";

=== modified file 'doc/zorba/modules_top.dox'
--- doc/zorba/modules_top.dox	2013-09-17 03:48:02 +0000
+++ doc/zorba/modules_top.dox	2013-10-17 02:02:41 +0000
@@ -13,7 +13,7 @@
 
    - <a href="../modules/www.w3.org_2005_xpath-functions.html">xpath</a>
    - <a href="../modules/zorba.io_modules_node.html">XDM</a>
-   - <a href="../modules/www.zorba-xquery.com_modules_store_dynamic_collections_ddl.html">store</a>
+   - <a href="../modules/zorba.io_modules_store_dynamic_collections_ddl.html">store</a>
    - <a href="../modules/www.zorba-xquery.com_modules_introspection_sctx.html">introspection</a>
    - <a href="../modules/www.zorba-xquery.com_modules_reflection.html">reflection</a>
    - <a href="../modules/expath.org_ns_file.html">file</a>

=== modified file 'doc/zorba/options.dox'
--- doc/zorba/options.dox	2013-08-23 11:15:04 +0000
+++ doc/zorba/options.dox	2013-10-17 02:02:41 +0000
@@ -348,7 +348,7 @@
 \paragraph variadic_annotation Variadic Functions
 A function annotated with the <tt>%an:variadic</tt> annotation is a function of indefinite arity, i.e. one that accepts a variable number of arguments.  
 
-For example, the function to create an unordered map with an arbitrary number of key types (see module <a href="/documentation/zorba/2.9/modules/www.zorba-xquery.com_modules_store_data-structures_unordered-map.html">http://www.zorba-xquery.com/modules/store/data-structures/unordered-map</a>) is declared as follow:
+For example, the function to create an unordered map with an arbitrary number of key types (see module <a href="/documentation/zorba/2.9/modules/zorba.io_modules_store_data-structures_unordered-map.html">http://zorba.io/modules/store/data-structures/unordered-map</a>) is declared as follow:
 
 \code
 declare %an:variadic %an:sequential function map:create(
@@ -517,7 +517,7 @@
 <ul>
   <li><b>no-copy</b> In order to indicate that a node that should be inserted into a collection does not need to be copied before inserting it. Not copying a node improves performance. However, the user needs to make sure that the node does not have a parent and is not modified in any other expression. For example, in the following example snippet, the node refered to by <tt>$n</tt> will not be copied before insertion into the collection.
 \code
-import module namespace db = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
+import module namespace db = "http://zorba.io/modules/store/dynamic/collections/dml";
 
 declare namespace ext = "http://zorba.io/extensions";
 

=== modified file 'doc/zorba/web_crawler.dox'
--- doc/zorba/web_crawler.dox	2013-08-09 09:04:36 +0000
+++ doc/zorba/web_crawler.dox	2013-10-17 02:02:41 +0000
@@ -14,7 +14,7 @@
 
 \code
 import module namespace http = "http://www.zorba-xquery.com/modules/http-client";
-import module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";
+import module namespace map = "http://zorba.io/modules/store/data-structures/unordered-map";
 import module namespace html = "http://www.zorba-xquery.com/modules/converters/html";
 import module namespace parse-xml = "http://www.zorba-xquery.com/modules/xml";
 import module namespace file = "http://expath.org/ns/file";

=== modified file 'doc/zorba/xqddf.dox'
--- doc/zorba/xqddf.dox	2013-09-17 16:14:45 +0000
+++ doc/zorba/xqddf.dox	2013-10-17 02:02:41 +0000
@@ -14,12 +14,12 @@
 
 
 <ul>
-  <li><a href="../modules/www.zorba-xquery.com_modules_store_static_collections_dml.html">http://www.zorba-xquery.com/modules/store/static/collections/dml</a> (prefix: cdml)</li>
-  <li><a href="../modules/www.zorba-xquery.com_modules_store_static_collections_ddl.html">http://www.zorba-xquery.com/modules/store/static/collections/ddl</a> (prefix: cddl)</li>
-  <li><a href="../modules/www.zorba-xquery.com_modules_store_static_indexes_dml.html">http://www.zorba-xquery.com/modules/store/static/indexes/dml</a> (prefix: idml)</li>
-  <li><a href="../modules/www.zorba-xquery.com_modules_store_static_indexes_ddl.html">http://www.zorba-xquery.com/modules/store/static/indexes/ddl</a> (prefix: iddl)</li>
-  <li><a href="../modules/www.zorba-xquery.com_modules_store_static_integrity_constraints_dml.html">http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml</a> (prefix: icdml)</li>
-  <li><a href="../modules/www.zorba-xquery.com_modules_store_static_integrity_constraints_ddl.html">http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl</a> (prefix: icddl)</li>
+  <li><a href="../modules/zorba.io_modules_store_static_collections_dml.html">http://zorba.io/modules/store/static/collections/dml</a> (prefix: cdml)</li>
+  <li><a href="../modules/zorba.io_modules_store_static_collections_ddl.html">http://zorba.io/modules/store/static/collections/ddl</a> (prefix: cddl)</li>
+  <li><a href="../modules/zorba.io_modules_store_static_indexes_dml.html">http://zorba.io/modules/store/static/indexes/dml</a> (prefix: idml)</li>
+  <li><a href="../modules/zorba.io_modules_store_static_indexes_ddl.html">http://zorba.io/modules/store/static/indexes/ddl</a> (prefix: iddl)</li>
+  <li><a href="../modules/zorba.io_modules_store_static_integrity_constraints_dml.html">http://zorba.io/modules/store/static/integrity_constraints/dml</a> (prefix: icdml)</li>
+  <li><a href="../modules/zorba.io_modules_store_static_integrity_constraints_ddl.html">http://zorba.io/modules/store/static/integrity_constraints/ddl</a> (prefix: icddl)</li>
 </ul>
 
 As usual, these modules must be imported by any other module that wants to invoke any of the functions.
@@ -55,7 +55,7 @@
 For brevity, in the remaining of this document we will use the term "collection" to
 mean <a href="#collection">collection</a>. For backward compatibility with
 the W3C XQuery specification, Zorba retains some basic support for W3C
-collections (see <a href="../modules/www.zorba-xquery.com_modules_store_dynamic_collections_w3c_dml.html">http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml</a> and <a href="../modules/www.zorba-xquery.com_modules_store_dynamic_collections_w3c_ddl.html">http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl</a>).
+collections (see <a href="../modules/zorba.io_modules_store_dynamic_collections_w3c_dml.html">http://zorba.io/modules/store/dynamic/collections/w3c/dml</a> and <a href="../modules/zorba.io_modules_store_dynamic_collections_w3c_ddl.html">http://zorba.io/modules/store/dynamic/collections/w3c/ddl</a>).
 However, users are encouraged to use <a href="#collection">collections</a> instead.
 
 Zorba supports five kinds of operations on collections: <a
@@ -161,7 +161,7 @@
 \code
   (: "admin-script-1" :)
 
-  import module namespace cddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+  import module namespace cddl = "http://zorba.io/modules/store/static/collections/ddl";
 
   import module namespace news-data = "http://www.news.org/data";
 
@@ -222,7 +222,7 @@
 \code
   (: "user-script-1":)
 
-  import module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+  import module namespace cdml = "http://zorba.io/modules/store/static/collections/dml";
 
   import module namespace http = "http://www.zorba-xquery.com/modules/http-client";
 
@@ -257,7 +257,7 @@
 \code
   (: admin-script2 :)
 
-  import module namespace cddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+  import module namespace cddl = "http://zorba.io/modules/store/static/collections/ddl";
 
   import module namespace news-data = "http://www.news.org/data";
 
@@ -1010,7 +1010,7 @@
 
   module namespace news-data = "http://www.news.org/data";
 
-  import module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+  import module namespace cdml = "http://zorba.io/modules/store/static/collections/dml";
 
   import schema namespace news-schemas = "http://www.news.org/schemas";
 
@@ -1078,7 +1078,7 @@
 \code
   (: The "admin-script-3" script :)
 
-  import module namespace iddf = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";
+  import module namespace iddf = "http://zorba.io/modules/store/static/indexes/ddl";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1156,7 +1156,7 @@
 \code
   (: The "probe-1" query :)
 
-  import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
+  import module namespace idml = "http://zorba.io/modules/store/static/indexes/dml";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1167,7 +1167,7 @@
 \code
   (: The "probe-2" query :)
 
-  import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
+  import module namespace idml = "http://zorba.io/modules/store/static/indexes/dml";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1178,7 +1178,7 @@
 \code
   (: The "probe-3" query :)
 
-  import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
+  import module namespace idml = "http://zorba.io/modules/store/static/indexes/dml";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1189,7 +1189,7 @@
 \code
   (: The "no-probe-1" query :)
 
-  import module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+  import module namespace cdml = "http://zorba.io/modules/store/static/collections/dml";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1200,7 +1200,7 @@
 \code
   (: The "no-probe-2" query :)
 
-  import module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+  import module namespace cdml = "http://zorba.io/modules/store/static/collections/dml";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1215,7 +1215,7 @@
 \code
   (: The "probe-3" query :)
 
-  import module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+  import module namespace cdml = "http://zorba.io/modules/store/static/collections/dml";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1265,7 +1265,7 @@
 \code
   (: The "index-maintenance" query :)
 
-  import module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+  import module namespace cdml = "http://zorba.io/modules/store/static/collections/dml";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1286,7 +1286,7 @@
 \code
   (: The "admin-script-4" query :)
 
-  import module namespace iddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";
+  import module namespace iddl = "http://zorba.io/modules/store/static/indexes/ddl";
 
   import module namespace news-data = "http://www.news.org/data" at "news_data.xqlib";
 
@@ -1978,7 +1978,7 @@
 Each node in the sequence represents one key contained in the index and has the following structure:
 
 \code
- <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+ <key xmlns="http://zorba.io/modules/store/static/indexes/dml">
    <attribute value="key_1"/>
    ...
    <attribute value="key_n"/>
@@ -2461,4 +2461,4 @@
 \n <a name="ERRZDDY0034" id="ERRZDDY0034"></a>zerr:ZDDY0034, Index range-value
  probe has search keys with incompatible types
 </strong>
-*/
\ No newline at end of file
+*/

=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg	2013-10-16 21:47:22 +0000
+++ doc/zorba/xqdoc/images/modules.svg	2013-10-17 02:02:41 +0000
@@ -1364,63 +1364,63 @@
 </g>
 <!-- 14 -->
 <g id="node86" class="node"><title>14</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<a xlink:href="../zorba.io_modules_store_dynamic_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/dynamic/collections/ddl">
 <ellipse fill="white" stroke="white" cx="4258" cy="-385" rx="27" ry="18"/>
 <text text-anchor="middle" x="4258" y="-381.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 15 -->
 <g id="node88" class="node"><title>15</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<a xlink:href="../zorba.io_modules_store_dynamic_collections_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/dynamic/collections/dml">
 <ellipse fill="white" stroke="white" cx="4258" cy="-538" rx="27" ry="18"/>
 <text text-anchor="middle" x="4258" y="-534.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
 <!-- 18 -->
 <g id="node90" class="node"><title>18</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/collections/ddl">
+<a xlink:href="../zorba.io_modules_store_static_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/collections/ddl">
 <ellipse fill="white" stroke="white" cx="4613" cy="-660" rx="27" ry="18"/>
 <text text-anchor="middle" x="4613" y="-656.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 19 -->
 <g id="node92" class="node"><title>19</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_collections_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/collections/dml">
+<a xlink:href="../zorba.io_modules_store_static_collections_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/collections/dml">
 <ellipse fill="white" stroke="white" cx="4460" cy="-660" rx="27" ry="18"/>
 <text text-anchor="middle" x="4460" y="-656.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
 <!-- 16 -->
 <g id="node94" class="node"><title>16</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_w3c_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl">
+<a xlink:href="../zorba.io_modules_store_dynamic_collections_w3c_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/dynamic/collections/w3c/ddl">
 <ellipse fill="white" stroke="white" cx="4439" cy="-538" rx="27" ry="18"/>
 <text text-anchor="middle" x="4439" y="-534.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 16&#45;&gt;14 -->
 <g id="edge176" class="edge"><title>16-&gt;14</title>
-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<a xlink:title="FROM: http://zorba.io/modules/store/dynamic/collections/w3c/ddl, TO: http://zorba.io/modules/store/dynamic/collections/ddl">
 <path fill="none" stroke="black" d="M4422.71,-523.159C4415.73,-517.243 4407.48,-510.269 4400,-504 4358.64,-469.321 4310.26,-429.213 4281.98,-405.82"/>
 <polygon fill="black" stroke="black" points="4284.16,-403.079 4274.22,-399.403 4279.7,-408.473 4284.16,-403.079"/>
 </a>
 </g>
 <!-- 17 -->
 <g id="node96" class="node"><title>17</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_w3c_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml">
+<a xlink:href="../zorba.io_modules_store_dynamic_collections_w3c_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/dynamic/collections/w3c/dml">
 <ellipse fill="white" stroke="white" cx="4299" cy="-660" rx="27" ry="18"/>
 <text text-anchor="middle" x="4299" y="-656.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
 <!-- 17&#45;&gt;15 -->
 <g id="edge180" class="edge"><title>17-&gt;15</title>
-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<a xlink:title="FROM: http://zorba.io/modules/store/dynamic/collections/w3c/dml, TO: http://zorba.io/modules/store/dynamic/collections/dml">
 <path fill="none" stroke="black" d="M4293.3,-642.315C4286.51,-622.456 4275.1,-589.042 4267.09,-565.604"/>
 <polygon fill="black" stroke="black" points="4270.33,-564.262 4263.78,-555.931 4263.71,-566.525 4270.33,-564.262"/>
 </a>
 </g>
 <!-- 17&#45;&gt;16 -->
 <g id="edge178" class="edge"><title>17-&gt;16</title>
-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl">
+<a xlink:title="FROM: http://zorba.io/modules/store/dynamic/collections/w3c/dml, TO: http://zorba.io/modules/store/dynamic/collections/w3c/ddl">
 <path fill="none" stroke="black" d="M4321.35,-649.59C4337.36,-642.897 4359.45,-633.755 4379,-626 4388.28,-622.318 4392.61,-624.721 4400,-618 4415.27,-604.107 4425.28,-582.901 4431.33,-565.957"/>
 <polygon fill="black" stroke="black" points="4434.79,-566.654 4434.6,-556.061 4428.14,-564.459 4434.79,-566.654"/>
 </a>
@@ -1434,14 +1434,14 @@
 </g>
 <!-- 70&#45;&gt;14 -->
 <g id="edge246" class="edge"><title>70-&gt;14</title>
-<a xlink:title="FROM: http://zorba.io/modules/queue, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<a xlink:title="FROM: http://zorba.io/modules/queue, TO: http://zorba.io/modules/store/dynamic/collections/ddl">
 <path fill="none" stroke="black" d="M4087.04,-642.54C4104.5,-614.043 4141.78,-553.788 4175,-504 4197.06,-470.931 4223.68,-433.508 4240.71,-409.841"/>
 <polygon fill="black" stroke="black" points="4243.73,-411.64 4246.74,-401.483 4238.05,-407.544 4243.73,-411.64"/>
 </a>
 </g>
 <!-- 70&#45;&gt;15 -->
 <g id="edge248" class="edge"><title>70-&gt;15</title>
-<a xlink:title="FROM: http://zorba.io/modules/queue, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<a xlink:title="FROM: http://zorba.io/modules/queue, TO: http://zorba.io/modules/store/dynamic/collections/dml">
 <path fill="none" stroke="black" d="M4095.18,-644.869C4103.02,-638.903 4112.36,-631.971 4121,-626 4157.86,-600.53 4201.79,-573.132 4229.78,-556.03"/>
 <polygon fill="black" stroke="black" points="4231.91,-558.832 4238.63,-550.642 4228.27,-552.853 4231.91,-558.832"/>
 </a>
@@ -1455,14 +1455,14 @@
 </g>
 <!-- 72&#45;&gt;14 -->
 <g id="edge250" class="edge"><title>72-&gt;14</title>
-<a xlink:title="FROM: http://zorba.io/modules/stack, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<a xlink:title="FROM: http://zorba.io/modules/stack, TO: http://zorba.io/modules/store/dynamic/collections/ddl">
 <path fill="none" stroke="black" d="M4167.86,-642.334C4184,-596.452 4229.16,-468.005 4248.75,-412.312"/>
 <polygon fill="black" stroke="black" points="4252.08,-413.39 4252.09,-402.795 4245.47,-411.068 4252.08,-413.39"/>
 </a>
 </g>
 <!-- 72&#45;&gt;15 -->
 <g id="edge252" class="edge"><title>72-&gt;15</title>
-<a xlink:title="FROM: http://zorba.io/modules/stack, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<a xlink:title="FROM: http://zorba.io/modules/stack, TO: http://zorba.io/modules/store/dynamic/collections/dml">
 <path fill="none" stroke="black" d="M4174.55,-643.312C4191.1,-622.626 4220.35,-586.063 4239.45,-562.183"/>
 <polygon fill="black" stroke="black" points="4242.24,-564.307 4245.75,-554.312 4236.77,-559.935 4242.24,-564.307"/>
 </a>
@@ -1476,35 +1476,35 @@
 </g>
 <!-- 13 -->
 <g id="node105" class="node"><title>13</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_documents.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/documents">
+<a xlink:href="../zorba.io_modules_store_dynamic_documents.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/documents">
 <ellipse fill="white" stroke="white" cx="3804" cy="-660" rx="49.0941" ry="18"/>
 <text text-anchor="middle" x="3804" y="-656.3" font-family="Times,serif" font-size="14.00" fill="red">documents</text>
 </a>
 </g>
 <!-- 20 -->
 <g id="node108" class="node"><title>20</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_indexes_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/indexes/ddl">
+<a xlink:href="../zorba.io_modules_store_static_indexes_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/indexes/ddl">
 <ellipse fill="white" stroke="white" cx="3663" cy="-660" rx="27" ry="18"/>
 <text text-anchor="middle" x="3663" y="-656.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 21 -->
 <g id="node110" class="node"><title>21</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_indexes_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+<a xlink:href="../zorba.io_modules_store_static_indexes_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/indexes/dml">
 <ellipse fill="white" stroke="white" cx="3510" cy="-660" rx="27" ry="18"/>
 <text text-anchor="middle" x="3510" y="-656.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
 <!-- 22 -->
 <g id="node113" class="node"><title>22</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_integrity_constraints_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl">
+<a xlink:href="../zorba.io_modules_store_static_integrity_constraints_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/integrity_constraints/ddl">
 <ellipse fill="white" stroke="white" cx="3341" cy="-660" rx="27" ry="18"/>
 <text text-anchor="middle" x="3341" y="-656.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 23 -->
 <g id="node115" class="node"><title>23</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_integrity_constraints_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml">
+<a xlink:href="../zorba.io_modules_store_static_integrity_constraints_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/integrity_constraints/dml">
 <ellipse fill="white" stroke="white" cx="3188" cy="-660" rx="27" ry="18"/>
 <text text-anchor="middle" x="3188" y="-656.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
 </a>
@@ -2166,4 +2166,4 @@
 </a>
 </g>
 </g>
-</svg>
\ No newline at end of file
+</svg>

=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
--- doc/zorba/xqdoc/images/modules_new.svg	2013-10-16 22:24:04 +0000
+++ doc/zorba/xqdoc/images/modules_new.svg	2013-10-17 02:02:41 +0000
@@ -1370,63 +1370,63 @@
 </g>
 <!-- 6 -->
 <g id="node86" class="node"><title>6</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<a xlink:href="../zorba.io_modules_store_dynamic_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/dynamic/collections/ddl">
 <ellipse fill="white" stroke="white" cx="6457" cy="-407" rx="27" ry="18.3848"/>
 <text text-anchor="middle" x="6457" y="-403.4" font-family="Times Roman,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 7 -->
 <g id="node88" class="node"><title>7</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<a xlink:href="../zorba.io_modules_store_dynamic_collections_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/dynamic/collections/dml">
 <ellipse fill="white" stroke="white" cx="6459" cy="-571" rx="28.9914" ry="18.3848"/>
 <text text-anchor="middle" x="6459" y="-567.4" font-family="Times Roman,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
 <!-- 10 -->
 <g id="node90" class="node"><title>10</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/collections/ddl">
+<a xlink:href="../zorba.io_modules_store_static_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/collections/ddl">
 <ellipse fill="white" stroke="white" cx="6891" cy="-701" rx="27" ry="18.3848"/>
 <text text-anchor="middle" x="6891" y="-697.4" font-family="Times Roman,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 11 -->
 <g id="node92" class="node"><title>11</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_collections_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/collections/dml">
+<a xlink:href="../zorba.io_modules_store_static_collections_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/collections/dml">
 <ellipse fill="white" stroke="white" cx="6706" cy="-701" rx="28.9914" ry="18.3848"/>
 <text text-anchor="middle" x="6706" y="-697.4" font-family="Times Roman,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
 <!-- 8 -->
 <g id="node94" class="node"><title>8</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_w3c_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl">
+<a xlink:href="../zorba.io_modules_store_dynamic_collections_w3c_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/dynamic/collections/w3c/ddl">
 <ellipse fill="white" stroke="white" cx="6674" cy="-571" rx="27" ry="18.3848"/>
 <text text-anchor="middle" x="6674" y="-567.4" font-family="Times Roman,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 8&#45;&gt;6 -->
 <g id="edge173" class="edge"><title>8-&gt;6</title>
-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<a xlink:title="FROM: http://zorba.io/modules/store/dynamic/collections/w3c/ddl, TO: http://zorba.io/modules/store/dynamic/collections/ddl">
 <path fill="none" stroke="black" d="M6658.01,-555.967C6651.08,-549.633 6642.79,-542.287 6635,-536 6583.67,-494.557 6520.51,-450.268 6484.89,-425.87"/>
 <polygon fill="black" stroke="black" points="6486.69,-422.858 6476.45,-420.11 6482.74,-428.639 6486.69,-422.858"/>
 </a>
 </g>
 <!-- 9 -->
 <g id="node96" class="node"><title>9</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_w3c_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml">
+<a xlink:href="../zorba.io_modules_store_dynamic_collections_w3c_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/dynamic/collections/w3c/dml">
 <ellipse fill="white" stroke="white" cx="6513" cy="-701" rx="28.9914" ry="18.3848"/>
 <text text-anchor="middle" x="6513" y="-697.4" font-family="Times Roman,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
 <!-- 9&#45;&gt;7 -->
 <g id="edge177" class="edge"><title>9-&gt;7</title>
-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<a xlink:title="FROM: http://zorba.io/modules/store/dynamic/collections/w3c/dml, TO: http://zorba.io/modules/store/dynamic/collections/dml">
 <path fill="none" stroke="black" d="M6505.49,-682.924C6496.38,-660.998 6480.94,-623.818 6470.37,-598.372"/>
 <polygon fill="black" stroke="black" points="6473.51,-596.815 6466.44,-588.922 6467.05,-599.5 6473.51,-596.815"/>
 </a>
 </g>
 <!-- 9&#45;&gt;8 -->
 <g id="edge175" class="edge"><title>9-&gt;8</title>
-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl">
+<a xlink:title="FROM: http://zorba.io/modules/store/dynamic/collections/w3c/dml, TO: http://zorba.io/modules/store/dynamic/collections/w3c/ddl">
 <path fill="none" stroke="black" d="M6537.85,-691.343C6556.92,-684.052 6583.98,-673.974 6608,-666 6619.88,-662.057 6625.58,-666.241 6635,-658 6652.42,-642.757 6662.45,-618.201 6667.96,-599.059"/>
 <polygon fill="black" stroke="black" points="6671.36,-599.908 6670.51,-589.347 6664.59,-598.13 6671.36,-599.908"/>
 </a>
@@ -1440,14 +1440,14 @@
 </g>
 <!-- 53&#45;&gt;6 -->
 <g id="edge227" class="edge"><title>53-&gt;6</title>
-<a xlink:title="FROM: http://zorba.io/modules/queue, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<a xlink:title="FROM: http://zorba.io/modules/queue, TO: http://zorba.io/modules/store/dynamic/collections/ddl">
 <path fill="none" stroke="black" d="M6263.39,-683.153C6284.43,-652.861 6328.51,-589.462 6366,-536 6391.34,-499.867 6420.8,-458.155 6439.18,-432.176"/>
 <polygon fill="black" stroke="black" points="6442.27,-433.862 6445.19,-423.678 6436.56,-429.819 6442.27,-433.862"/>
 </a>
 </g>
 <!-- 53&#45;&gt;7 -->
 <g id="edge229" class="edge"><title>53-&gt;7</title>
-<a xlink:title="FROM: http://zorba.io/modules/queue, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<a xlink:title="FROM: http://zorba.io/modules/queue, TO: http://zorba.io/modules/store/dynamic/collections/dml">
 <path fill="none" stroke="black" d="M6274.11,-685.496C6283.36,-679.355 6294.14,-672.275 6304,-666 6347.14,-638.547 6397.75,-607.795 6429.1,-588.913"/>
 <polygon fill="black" stroke="black" points="6431.04,-591.837 6437.8,-583.683 6427.43,-585.838 6431.04,-591.837"/>
 </a>
@@ -1461,14 +1461,14 @@
 </g>
 <!-- 51&#45;&gt;6 -->
 <g id="edge223" class="edge"><title>51-&gt;6</title>
-<a xlink:title="FROM: http://zorba.io/modules/stack, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<a xlink:title="FROM: http://zorba.io/modules/stack, TO: http://zorba.io/modules/store/dynamic/collections/ddl">
 <path fill="none" stroke="black" d="M6359.51,-682.609C6377.2,-632.579 6426.29,-493.805 6447.28,-434.475"/>
 <polygon fill="black" stroke="black" points="6450.59,-435.603 6450.63,-425.009 6443.99,-433.269 6450.59,-435.603"/>
 </a>
 </g>
 <!-- 51&#45;&gt;7 -->
 <g id="edge225" class="edge"><title>51-&gt;7</title>
-<a xlink:title="FROM: http://zorba.io/modules/stack, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<a xlink:title="FROM: http://zorba.io/modules/stack, TO: http://zorba.io/modules/store/dynamic/collections/dml">
 <path fill="none" stroke="black" d="M6367.08,-683.737C6385.57,-661.052 6418.17,-621.077 6439.16,-595.331"/>
 <polygon fill="black" stroke="black" points="6441.93,-597.474 6445.54,-587.512 6436.5,-593.05 6441.93,-597.474"/>
 </a>
@@ -1482,35 +1482,35 @@
 </g>
 <!-- 5 -->
 <g id="node105" class="node"><title>5</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_documents.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/documents">
+<a xlink:href="../zorba.io_modules_store_dynamic_documents.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/documents">
 <ellipse fill="white" stroke="white" cx="5907" cy="-701" rx="65.0538" ry="18.3848"/>
 <text text-anchor="middle" x="5907" y="-697.4" font-family="Times Roman,serif" font-size="14.00" fill="red">documents</text>
 </a>
 </g>
 <!-- 12 -->
 <g id="node108" class="node"><title>12</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_indexes_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/indexes/ddl">
+<a xlink:href="../zorba.io_modules_store_static_indexes_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/indexes/ddl">
 <ellipse fill="white" stroke="white" cx="5734" cy="-701" rx="27" ry="18.3848"/>
 <text text-anchor="middle" x="5734" y="-697.4" font-family="Times Roman,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 13 -->
 <g id="node110" class="node"><title>13</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_indexes_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+<a xlink:href="../zorba.io_modules_store_static_indexes_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/indexes/dml">
 <ellipse fill="white" stroke="white" cx="5549" cy="-701" rx="28.9914" ry="18.3848"/>
 <text text-anchor="middle" x="5549" y="-697.4" font-family="Times Roman,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
 <!-- 14 -->
 <g id="node113" class="node"><title>14</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_integrity_constraints_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl">
+<a xlink:href="../zorba.io_modules_store_static_integrity_constraints_ddl.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/integrity_constraints/ddl">
 <ellipse fill="white" stroke="white" cx="5347" cy="-701" rx="27" ry="18.3848"/>
 <text text-anchor="middle" x="5347" y="-697.4" font-family="Times Roman,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
 <!-- 15 -->
 <g id="node115" class="node"><title>15</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_integrity_constraints_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml">
+<a xlink:href="../zorba.io_modules_store_static_integrity_constraints_dml.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/store/static/integrity_constraints/dml">
 <ellipse fill="white" stroke="white" cx="5162" cy="-701" rx="28.9914" ry="18.3848"/>
 <text text-anchor="middle" x="5162" y="-697.4" font-family="Times Roman,serif" font-size="14.00" fill="red">dml</text>
 </a>
@@ -2210,4 +2210,4 @@
 </a>
 </g>
 </g>
-</svg>
\ No newline at end of file
+</svg>

=== modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy'
--- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy	2013-10-16 21:47:22 +0000
+++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy	2013-10-17 02:02:41 +0000
@@ -29,8 +29,8 @@
 import module namespace dot   = "http://www.zorba-xquery.com/modules/image/graphviz";
 import module namespace xqd   = "http://zorba.io/modules/xqdoc";
 import module namespace fetch = "http://zorba.io/modules/fetch";
-import module namespace dml   = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
-import module namespace ddl   = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+import module namespace dml   = "http://zorba.io/modules/store/static/collections/dml";
+import module namespace ddl   = "http://zorba.io/modules/store/static/collections/ddl";
 import module namespace menu  = "http://www.zorba-xquery.com/modules/xqdoc/menu";
 import module namespace xqdoc-html  = "http://www.zorba-xquery.com/xqdoc-html" at "xqdoc-html.xqy";
 
@@ -116,7 +116,7 @@
         insert node <module uri="{$moduleURI}"
                             isCore="{data($module/@isCore)}"/> as last into $z:ZorbaManifest;
         
-        dml:apply-insert-nodes($z:collection, $xqdoc);
+        dml:apply-insert($z:collection, $xqdoc);
         
       }
     }
@@ -136,7 +136,7 @@
 
 declare %an:sequential function z:delete-collections()
 { 
-  dml:delete-nodes(dml:collection(xs:QName("z:collection")));
+  dml:delete(dml:collection(xs:QName("z:collection")));
   ddl:delete(xs:QName("z:collection"));
 };
 
@@ -481,4 +481,4 @@
   z:edges_modules(),"
   }"
   )
-};
\ No newline at end of file
+};

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-10-16 21:47:22 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-10-17 02:02:41 +0000
@@ -14,28 +14,6 @@
 
 # Subdirectories
 
-DECLARE_ZORBA_MODULE(FILE store/documents/dynamic.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/dynamic/documents")
-DECLARE_ZORBA_MODULE(FILE store/dynamic/collections/ddl.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl")
-DECLARE_ZORBA_MODULE(FILE store/dynamic/collections/dml.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml")
-DECLARE_ZORBA_MODULE(FILE store/dynamic/collections/w3c/ddl.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl")
-DECLARE_ZORBA_MODULE(FILE store/dynamic/collections/w3c/dml.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml")
-DECLARE_ZORBA_MODULE(FILE store/static/collections/ddl.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/static/collections/ddl")
-DECLARE_ZORBA_MODULE(FILE store/static/collections/dml.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/static/collections/dml")
-DECLARE_ZORBA_MODULE(FILE store/static/indexes/ddl.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/static/indexes/ddl")
-DECLARE_ZORBA_MODULE(FILE store/static/indexes/dml.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/static/indexes/dml")
-DECLARE_ZORBA_MODULE(FILE store/static/integrity_constraints/ddl.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl")
-DECLARE_ZORBA_MODULE(FILE store/static/integrity_constraints/dml.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml")
 DECLARE_ZORBA_MODULE(FILE xqdoc/batch.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/xqdoc/batch")
 DECLARE_ZORBA_MODULE(FILE xqdoc/html.xq VERSION 2.0

=== removed directory 'modules/com/zorba-xquery/www/modules/store'
=== removed directory 'modules/com/zorba-xquery/www/modules/store/data-structures'
=== removed directory 'modules/com/zorba-xquery/www/modules/store/documents'
=== modified file 'modules/store/CMakeLists.txt'
--- modules/store/CMakeLists.txt	2013-08-24 23:44:26 +0000
+++ modules/store/CMakeLists.txt	2013-10-17 02:02:41 +0000
@@ -14,3 +14,29 @@
 
 DECLARE_ZORBA_MODULE(FILE unordered-maps.xq VERSION 1.0
   URI "http://zorba.io/modules/unordered-maps")
+
+DECLARE_ZORBA_MODULE(FILE documents.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/documents")
+
+DECLARE_ZORBA_MODULE(FILE dynamic/collections/ddl.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/dynamic/collections/ddl")
+DECLARE_ZORBA_MODULE(FILE dynamic/collections/dml.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/dynamic/collections/dml")
+DECLARE_ZORBA_MODULE(FILE dynamic/collections/w3c/ddl.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/dynamic/collections/w3c/ddl")
+DECLARE_ZORBA_MODULE(FILE dynamic/collections/w3c/dml.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/dynamic/collections/w3c/dml")
+DECLARE_ZORBA_MODULE(FILE static/collections/ddl.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/static/collections/ddl")
+DECLARE_ZORBA_MODULE(FILE static/collections/dml.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/static/collections/dml")
+DECLARE_ZORBA_MODULE(FILE static/indexes/ddl.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/static/indexes/ddl")
+DECLARE_ZORBA_MODULE(FILE static/indexes/dml.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/static/indexes/dml")
+DECLARE_ZORBA_MODULE(FILE static/integrity-constraints/ddl.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/static/integrity-constraints/ddl")
+DECLARE_ZORBA_MODULE(FILE static/integrity-constraints/dml.xq VERSION 2.0
+  URI "http://zorba.io/modules/store/static/integrity-constraints/dml")
+
+# vim:set et sw=2 ts=2:

=== renamed file 'modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq' => 'modules/store/documents.xq'
--- modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq	2013-09-26 23:15:11 +0000
+++ modules/store/documents.xq	2013-10-17 02:02:41 +0000
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -20,100 +20,114 @@
  : This module defines a set of functions which manage documents that
  : are persisted in the store. Specifically, it contains functions
  : to put, remove, list, or retrieve documents.
- :
- : <p>Please refer to <a href="../zorba/data_lifecycle.html">our documentation</a> for 
- : more information about the lifecycle management and manipulation of documents.</p>
+ : <p/>
+ : Please refer to <a href="../zorba/data_lifecycle.html">our documentation</a>
+ : for more information about the lifecycle management and manipulation of
+ : documents.
  :
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
  : @see http://zorba.io/errors
- :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- :
  : @project Zorba/Data Store/Documents
  :)
-module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";
+module namespace doc = "http://zorba.io/modules/store/documents";
 
 declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "2.0";
 
-(:~
- : Adds a document to the store. The document is bound to the URI
- : given as first parameter. This URI is the name of the document and
- : can be used by the doc:document() function to retrieve
- : the document from the store.
- :
- : The semantics of the function is similar to the fn:put function. The difference
- : is that this function accepts only document nodes as parameters.
- : Please note that this function does not try to fetch the document from the
- : external resource identified by $uri. Instead, the file or http-client
- : modules can be used to retrieve the resource as string and fn:parse-xml can be used
- : to parse the string returning a document.
- :
- : @param $uri The URI of the document. If a relative URI is given, the URI
- :        is made absolute using the static base URI of the module.
- : @param $doc The document node to be added to the store.
- :
- : @return an empty XDM instance and a pending update list which, when
- :         applied, adds the given document to the store.
- :
- : @error zerr:ZAPI0020 if the store already contains a document for the given $uri.
- : @error err:FODC0004 if the given URI is not valid or couldn't be absolutized.
- :
- :)
-declare updating function doc:put(
-  $uri as xs:string,
-  $doc as document-node()) external;
-
-(:~
- : Removes the document with the given URI from the store.
- :
- : @param $uri The URI of the document to remove. If a relative URI is given,
- : the URI is made absolute using the static base URI of the module.
-
- : @return Returns an empty XDM instance and a pending update list which, when
- :         applied, removes the document bound to the given URI.
- :
- : @error zerr:ZXQD0002 if no document with the given URI exists in the store.
- : @error err:FODC0004 if the given URI is not valid or couldn't be absolutized.
- :)
-declare updating function doc:remove($uri as xs:string) external;
-
-(:~
- : Returns the document with the given URI from the store.
+(:===========================================================================:)
+
+(:~
+ : Retrieves a sequence of URIs of documents bound in the store.
+ :
+ : @return The list of URIs of the available documents in the store or the
+ : empty sequence if none.
+ :)
+declare function doc:available-documents()
+  as xs:string* external;
+
+(:~
+ : Gets the document with the given URI from the store.
  :
  : The difference to fn:doc is that this function does not attempt to retrieve
  : the resource from the file system or the web before returning it.
  : Its only responsibility is to return the document from the store that was
  : bound using fn:put or doc:put.
  :
- : @param $uri The URI of the document to retrieve. If a relative URI is given,
- : the URI is made absolute using the static base URI of the module.
- :
+ : @param $uri The URI of the document to retrieve.
+ : If a relative URI is given, the URI is made absolute using the static base
+ : URI of the module.
  : @return Returns the document bound to the given URI.
- :
  : @error zerr:ZXQD0002 if no document with the given URI exists in the store.
- : @error err:FODC0004 if the given URI is not valid or couldn't be absolutized.
- :)
-declare function doc:document($uri as xs:string) as document-node() external;
-
-(:~
- : Retrieves a sequence of URIs of documents bound in the store.
- :
- : @return The list of URIs of the available documents in the store. The empty
- :         sequence is returned if not document exists in the store.
- :)
-declare function doc:available-documents() as xs:string* external;
+ : @error err:FODC0004 if the given URI is not valid or couldn't be made
+ : absolute.
+ :)
+declare function doc:document( $uri as xs:string )
+  as document-node() external;
 
 (:~
  : Returns true if a document with the given URI exists in the store.
  :
- : @param $uri The URI of the document to check for. If a relative URI is given,
+ : @param $uri The URI of the document to check for.
+ : If a relative URI is given, the URI is made absolute using the static base
+ : URI of the module.
+ :
+ : @return Returns true if a document with the given URI exists in the store or
+ : false otherwise.
+ : @error err:FODC0004 if the given URI is not valid or couldn't be made
+ : absolute.
+ :)
+declare function doc:is-available-document( $uri as xs:string )
+  as xs:boolean external;
+
+(:~
+ : Adds a document to the store.
+ : The document is bound to the URI given as first parameter.
+ : This URI is the name of the document and can be used by the
+ : <code>doc:document()</code> function to retrieve the document from the
+ : store.
+ : <p/>
+ : The semantics of the function is similar to the <code>fn:put()</code>
+ : function.
+ : The difference is that this function accepts only document nodes as
+ : parameters.
+ : Please note that this function does not try to fetch the document from the
+ : external resource identified by the URI.
+ : Instead, the file or http-client modules can be used to retrieve the
+ : resource as string and <code>fn:parse-xml()</code> can be used to parse the
+ : string returning a document.
+ :
+ : @param $uri The URI of the document.
+ : If a relative URI is given, the URI is made absolute using the static base
+ : URI of the module.
+ : @param $doc The document node to be added to the store.
+ : @return An empty XDM instance and a pending update list that, when applied,
+ : adds the given document to the store.
+ : @error zerr:ZAPI0020 if the store already contains a document for the given
+ : URI.
+ : @error err:FODC0004 if the given URI is not valid or couldn't be made
+ : absolute.
+ :)
+declare updating function doc:put( $uri as xs:string,
+                                   $doc as document-node() )
+  external;
+
+(:~
+ : Removes the document with the given URI from the store.
+ :
+ : @param $uri The URI of the document to remove. If a relative URI is given,
  : the URI is made absolute using the static base URI of the module.
- :
- : @return Returns true if a document with the given URI exists in the store or false otherwise.
- :
- : @error err:FODC0004 if the given URI is not valid or couldn't be absolutized.
+ : @return Returns an empty XDM instance and a pending update list that, when
+ : applied, removes the document bound to the given URI.
+ : @error zerr:ZXQD0002 if no document with the given URI exists in the store.
+ : @error err:FODC0004 if the given URI is not valid or couldn't be made
+ : absolute.
  :)
-declare function doc:is-available-document($uri as xs:string) as xs:boolean external;
+declare updating function doc:remove( $uri as xs:string )
+  external;
+
+(:===========================================================================:)
+
+(: vim:set et sw=2 ts=2: :)

=== renamed directory 'modules/com/zorba-xquery/www/modules/store/dynamic' => 'modules/store/dynamic'
=== modified file 'modules/store/dynamic/collections/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq	2013-09-26 23:15:11 +0000
+++ modules/store/dynamic/collections/ddl.xq	2013-10-17 02:02:41 +0000
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -17,103 +17,89 @@
 :)
 
 (:~
- : This modules defines a set of functions for managing persistent, ordered, and
- : updatable collections.
- :
- : <p>Please refer to our documentation for <a href="../zorba/data_lifecycle.html">
- : more information</a> about the lifecycle management and the manipulation of such
- : collections.</p>
+ : This modules defines a set of functions for managing persistent, ordered,
+ : and updatable collections.
+ : <p/>
+ : Please refer to our documentation for
+ : <a href="../zorba/data_lifecycle.html">more information</a>
+ : about the lifecycle management and the manipulation of such collections.
  :
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
- : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/dml
+ : @see http://zorba.io/modules/store/dynamic/collections/dml
  : @see http://zorba.io/errors
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- :
  : @project Zorba/Data Store/Collections/Dynamic Data Definition
- :
  :)
-module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
+module namespace ddl = "http://zorba.io/modules/store/dynamic/collections/ddl";
 
 declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "2.0";
 
-
-(:~
- : The create function is an updating function which creates
- : the collection with the given expanded QName.
- :
- : @param $name The QName of the collection to create.
- :
- : @return The result of the function is an empty XDM instance and a 
- :         pending update list which, once applied, creates a collection
- :         with the given name.
- :
- : @error zerr:ZDDY0002 if a collection with the given expanded QName already
- :        exists.
- :
- :)
-declare updating function ddl:create($name as xs:QName) external;
-
-
-(:~
- : The create function is an updating function which creates
- : the collection with the given expanded QName. Moreover, it adds copies
- : of the sequence $content to the new collection.
- :
- : @param $name The QName of the collection to create.
- : @param $content The sequences of items (nodes and/or json items) that should
- :        be added to the new collection.
- :
- : @return The result of the function is an empty XDM instance and a 
- :         pending update list which, once applied, creates a collection
- :         with the given name and inserts the given items into it.
- :
- : @error zerr:ZDDY0002 if a collection with the given expanded QName already
- :        exists.
- :
+(:===========================================================================:)
+
+(:~
+ : Gets the QNames of the collections that are available, if any.
+ :
+ : @return A sequence comprising one QName for each available collection
+ : or an emtpy sequence if no collections are available.
+ :)
+declare function ddl:available-collections()
+  as xs:QName* external;
+
+(:~
+ : Creates a collection.
+ :
+ : @param $name The name of the collection to create.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : creates a collection with the given name.
+ : @error zerr:ZDDY0002 if a collection with <code>$name</code> already exists.
+ :)
+declare updating function ddl:create( $name as xs:QName )
+  external;
+
+(:~
+ : Creates a collection and adds the given sequence as content to the new
+ : collection.
+ :
+ : @param $name The name of the collection to create.
+ : @param $content The sequence of items (nodes or JSON items)
+ : to be added to the new collection.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : creates a collection with the given name and inserts the given items into
+ : it.
+ : @error zerr:ZDDY0002 if a collection with the given name already exists.
  : @see ddl:create
- : @see ddl:insert-nodes-last
- :
- :)
-declare updating function ddl:create($name as xs:QName, $content as item()*) external;
-
-
-(:~
- : The delete function is an updating function that removes
- : the collection with the given expanded QName.
- :
- : @param $name The QName of the collection to delete.
- :
- : @return The result of the function is an empty XDM instance and a pending
- :         update list which, once applied, deletes the collection with the given
- :         name.
- :
- : @error zerr:ZDDY0003 if the collection with the given name does not exist.
- : @error zerr:ZDDY0015 if any of the in-scope variables references an item that
- :        belongs to the collection with QName $name.
- :
- :)
-declare updating function ddl:delete($coll as xs:QName) external;
-
-
-(:~
- : The function returns true if a collection with the given QName is available.
+ : @see ddl:insert-last
+ :)
+declare updating function ddl:create( $name as xs:QName,
+                                      $content as item()* )
+  external;
+
+(:~
+ : Deletes the collection having the given name.
+ :
+ : @param $name The name of the collection to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the collection with the given name.
+ : @error zerr:ZDDY0003 if the collection identified by <code>$name</code> is
+ : not available.
+ : @error zerr:ZDDY0015 if any of the in-scope variables references an item
+ : that belongs to the collection with QName <code>$name</code>.
+ :)
+declare updating function ddl:delete( $name as xs:QName )
+  external;
+
+(:~
+ : Gets whether a collection with the given name is available.
  :
  : @param $name The QName of the collection that is being checked.
- :
  : @return true if the collection is available and false otherwise.
- :
- :)
-declare function ddl:is-available-collection($name as xs:QName) as xs:boolean external;
-
-
-(:~
- : The function returns a sequence of QNames of the collections that are
- : available. The sequence will be empty if there are no collections.
- :
- : @return A sequence of QNames, one for each available collection, or an emtpy sequence.
- :
- :)
-declare function ddl:available-collections() as xs:QName* external;
+ :)
+declare function ddl:is-available-collection( $name as xs:QName )
+  as xs:boolean external;
+
+(:===========================================================================:)
+
+(: vim:set et sw=2 ts=2: :)

=== modified file 'modules/store/dynamic/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq	2013-09-26 23:15:11 +0000
+++ modules/store/dynamic/collections/dml.xq	2013-10-17 02:02:41 +0000
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -17,22 +17,21 @@
 :)
 
 (:~
- : This modules provides a set of functions to modify a collection and retrieve the items
- : contained in a particular collection.
- :
- : <p>Please refer to our documentation for <a href="../zorba/data_lifecycle.html">
- : more information</a> about the lifecycle management and the manipulation of such
- : collections.</p>
+ : This modules provides a set of functions to modify a collection
+ : and retrieve the items contained in a particular collection.
+ : <p/>
+ : Please refer to our documentation for
+ : <a href="../zorba/data_lifecycle.html">more information</a>
+ : about the lifecycle management and the manipulation of such collections.
  : 
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
- : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl
+ : @see http://zorba.io/modules/store/dynamic/collections/ddl
  : @see http://zorba.io/errors
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- :
  : @project Zorba/Data Store/Collections/Dynamic Data Manipulation
  :)
-module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
+module namespace dml = "http://zorba.io/modules/store/dynamic/collections/dml";
 
 declare namespace zerr = "http://zorba.io/errors";
 declare namespace an = "http://zorba.io/annotations";
@@ -40,675 +39,306 @@
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "2.0";
 
-
-(:~
- : The insert-nodes-first function is an updating function that inserts copies of the
- : given nodes at the beginning of the collection.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- : @deprecated please use the cdml:insert-first#2 function
- :
- :)
-declare updating function 
-dml:insert-nodes-first($name as xs:QName, $content as node()*) external;
-
-
-(:~
- : The insert-first function is an updating function that inserts copies of the
- : given items (nodes or json items) at the beginning of the collection.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update
- :         list which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- :)
-declare updating function 
-dml:insert-first($name as xs:QName, $content as item()*) external;
-
-
-(:~
- : The insert-nodes-last function is an updating function that inserts copies of the
- : given nodes at the end of the collection.
- :
- : @param $name The name of the collection to which the nodes should  be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- : @deprecated please use the cdml:insert-last#2 function
- :
- :)
-declare updating function 
-dml:insert-nodes-last($name as xs:QName, $content as node()*) external;
-
-
-(:~
- : The insert-last function is an updating function that inserts copies of the
- : given items (nodes or json items) at the end of the collection.
- :
- : @param $name The name of the collection to which the items should  be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- :)
-declare updating function 
-dml:insert-last($name as xs:QName, $content as item()*) external;
-
-
-(:~
- : The insert-nodes-before function is an updating function that inserts
- : copies of the given nodes into a collection at the position directly preceding the
- : given target node.
- :
- : @param $name The name of the collection to which the nodes should  be added.
- : @param $target The node in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0011 if the target node is not contained in the collection.
- :
- : @deprecated please use the cdml:insert-before#3 function
- :
- :)
-declare updating function 
-dml:insert-nodes-before(
-  $name as xs:QName,
-  $target as node(),
-  $content as node()*) external;
-
-(:~
- : The insert-before function is an updating function that inserts copies of
- : the given items (nodes or json items) into a collection at the position 
- : directly preceding the given target item.
- :
- : @param $name The name of the collection to which the items should  be added.
- : @param $target The item in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0011 if the target item is not contained in the collection.
- :
- :)
-declare updating function 
-dml:insert-before($name as xs:QName, $target as item(), $content as item()*) external;
-
-
-(:~
- : The insert-nodes-after function is an updating function that inserts
- : copies of the given nodes into a collection at the position directly following the
- : given target node.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0011 if the target node is not contained in the collection.
- :
- : @deprecated please use the cdml:insert-after#3 function
- :
- :)
-declare updating function 
-dml:insert-nodes-after(
-  $name as xs:QName,
-  $pos as node(),
-  $content as node()*) external;
-
-
-(:~
- : The insert-after function is an updating function that inserts copies of
- : the given items (nodes and/or json items) into a collection at the position
- : directly following the given target item.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $target The item in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0011 if the target node is not contained in the collection.
- :
- :)
-declare updating function 
-dml:insert-after($name as xs:QName, $pos as item(), $content as item()*) external;
-
-
-(:~
- : This function does the same as the insert-nodes-first function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- : @see dml:insert-nodes-first
- :
- : @deprecated please use the cdml:apply-insert-first#2 function
- :
- :)
-declare %an:sequential function 
-dml:apply-insert-nodes-first(
-  $name as xs:QName,
-  $content as node()*) as node()* external;
-
-
-(:~
- : This function does the same as the insert-first function except it immediately
- : applies the resulting pending updates and returns the items that have been inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
+(:===========================================================================:)
+
+(:~
+ : Inserts copies of the given items (nodes or JSON items)
+ : into a collection at the position directly preceding the given target item.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The item in the collection before which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of items whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if <code>$target</code> is not in the collection.
+ :)
+declare updating function dml:insert-before( $name as xs:QName,
+                                             $target as item(),
+                                             $content as item()* )
+  external;
+
+(:~
+ : Inserts copies of the given items (nodes or JSON items)
+ : at the beginning of the collection.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare updating function dml:insert-first( $name as xs:QName,
+                                            $content as item()* )
+  external;
+
+(:~
+ : Inserts copies of the given items (nodes or JSON items)
+ : at the end of the collection.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare updating function dml:insert-last( $name as xs:QName,
+                                           $content as item()* )
+  external;
+
+(:~
+ : Inserts copies of the given items (nodes or JSON items)
+ : into a collection at the position directly following the given target item.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The item in the collection after which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of items whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if <code>$target</code> is not in the collection.
+ :)
+declare updating function dml:insert-after( $name as xs:QName,
+                                            $pos as item(),
+                                            $content as item()* )
+  external;
+
+(:~
+ : This function does the same thing as <code>insert-first()</code> except it
+ : immediately applies the resulting pending updates and returns the items that
+ : have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The sequence of items that have been inserted.
+ : @error zerr:ZDDY0003 if the collection is not available.
  : @see dml:insert-first
- :
- :)
-declare %an:sequential function 
-dml:apply-insert-first($name as xs:QName, $content as item()*) as item()* external;
-
-
-(:~
- : This function does the same as the insert-nodes-last function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- : @see dml:insert-nodes-last
- :
- : @deprecated please use the cdml:apply-insert-last#2 function
- :
- :)
-declare %an:sequential function dml:apply-insert-nodes-last(
-  $name as xs:QName,
-  $content as node()*) as node()* external;
-
-
-(:~
- : This function does the same as the insert-last function except it immediately
- : applies the resulting pending updates and returns the items that have been 
- : inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
+ :)
+declare %an:sequential function dml:apply-insert-first( $name as xs:QName,
+                                                        $content as item()* )
+  as item()* external;
+
+(:~
+ : This function does the same thing as <code>insert-last()</code> except it
+ : immediately applies the resulting pending updates and returns the items that
+ : have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The sequence of items that have been inserted.
+ : @error zerr:ZDDY0003 if the collection is not available.
  : @see dml:insert-last
- :
- :)
-declare %an:sequential function dml:apply-insert-last(
-  $name as xs:QName,
-  $content as item()*) as item()* external;
-
-
-(:~
- : This function does the same as the insert-nodes-before function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- : @see dml:insert-nodes-before
- :
- : @deprecated please use the cdml:apply-insert-before#3 function
- :
- :)
-declare %an:sequential function 
-dml:apply-insert-nodes-before(
-  $name as xs:QName,
-  $target as node(),
-  $content as node()*) as node()* external;
-
-
-(:~
- : This function does the same as the insert-before function except it immediately
- : applies the resulting pending updates and returns the items that have been 
- : inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $target The item in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
+ :)
+declare %an:sequential function dml:apply-insert-last( $name as xs:QName,
+                                                       $content as item()* )
+  as item()* external;
+
+(:~
+ : This function does the same thing as <code>insert-before()</code> except it
+ : immediately applies the resulting pending updates and returns the items that
+ : have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The item in the collection before which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The sequence of items that have been inserted.
+ : @error zerr:ZDDY0003 if the collection is not available.
  : @see dml:insert-before
- :
- :)
-declare %an:sequential function 
-dml:apply-insert-before(
-  $name as xs:QName,
-  $target as item(),
-  $content as item()*) as item()* external;
-
-
-(:~
- : This function does the same as the insert-nodes-after function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- : @see dml:insert-nodes-after
- :
- : @deprecated please use the cdml:apply-insert-after#3 function
- :
- :)
-declare %an:sequential function 
-dml:apply-insert-nodes-after(
-  $name as xs:QName,
-  $pos as node(),
-  $content as node()*) as node()* external;
-
-
-(:~
- : This function does the same as the insert-after function except it immediately
- : applies the resulting pending updates and returns the items that have been 
- : inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $target The item in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
+ :)
+declare %an:sequential function dml:apply-insert-before( $name as xs:QName,
+                                                         $target as item(),
+                                                         $content as item()* )
+  as item()* external;
+
+(:~
+ : This function does the same thing as <code>insert-after()</code> except it
+ : immediately applies the resulting pending updates and returns the items that
+ : have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The item in the collection after which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The sequence of items that have been inserted.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if <code>$target</code> is not in the collection.
  : @see dml:insert-after
- :
- :)
-declare %an:sequential function 
-dml:apply-insert-after(
-  $name as xs:QName,
-  $pos as item(),
-  $content as item()*) as item()* external;
-
-
-(:~
- : The delete-nodes function is an updating function that deletes zero of more
- : nodes from a collection. 
- :
- : @param $target the nodes in the collection that should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes from their collections.
- :
- : @error zerr:ZDDY0011 if any nodes in the $target sequence is not a member of
- :        a collection or not all nodes of the $target sequence belong to the same
- :        collection.
- :
- : @deprecated please use the cdml:delete#1 function
- :
- :)
-declare updating function 
-dml:delete-nodes($target as node()*) external;
-
-
-(:~
- : The delete function is an updating function that deletes zero of more items
- : (nodes and/or json items) from a collection. 
- :
- : @param $target the items in the collection that should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the items from their collections.
- :
- : @error zerr:ZDDY0011 if any item in the $target sequence is not a member of
- :        a collection or not all items of the $target sequence belong to the
- :        same collection.
- :
- :)
-declare updating function 
-dml:delete($target as item()*) external;
-
-
-(:~
- : The delete-node-first function is an updating function that deletes the
- : first node from a collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the first node from the collection.
- :
- : @error zerr:ZDDY0011 if the collection doesn't contain any node.
- :
- : @deprecated please use the cdml:delete-first#1 function
- :
- :)
-declare updating function 
-dml:delete-node-first($name as xs:QName) external;
-
-
-(:~
- : The delete-first function is an updating function that deletes the first item
- : from a collection.
- :
- : @param $name The name of the collection from which the first item should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the first item from the collection.
- :
- : @error zerr:ZDDY0011 if the collection doesn't contain any item.
- :
- :)
-declare updating function 
-dml:delete-first($name as xs:QName) external;
-
-
-(:~
- : The delete-nodes-first function is an updating function that deletes the
- : first n nodes from a collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- : @param $number The number of nodes that should be removed from the beginning of
- :        the collection.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes from the collection.
- :
- : @error zerr:ZDDY0011 if the collection doesn't contain the given number of nodes.
- :
- : @deprecated please use the cdml:delete-first#2 function
- :
- :)
-declare updating function 
-dml:delete-nodes-first($name as xs:QName, $number as xs:integer) external;
-
-
-(:~
- : The delete-first function is an updating function that deletes the first N
- : items from a collection.
- :
- : @param $name The name of the collection from which the first N items should be deleted.
- : @param $number The number N of items that should be removed from the beginning of
- :        the collection.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the items from the collection.
- :
- : @error zerr:ZDDY0011 if the collection doesn't contain the given number of items.
- :
- :)
-declare updating function 
-dml:delete-first($name as xs:QName, $number as xs:integer) external;
-
-
-(:~
- : The delete-node-last function is an updating function that deletes the
- : last node from a collection.
- :
- : @param $name The name of the collection from which the last node should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the last node from the collection.
- :
- : @error zerr:ZDDY0003 If available collections does not provide a mapping
- :        for the expanded QName $name.
- : @error zerr:ZDDY0011 if the collection doesn't contain any node.
- :
- : @deprecated please use the cdml:delete-last#1 function
- :
- :)
-declare updating function 
-dml:delete-node-last($name as xs:QName) external;
-
-
-(:~
- : The delete-last function is an updating function that deletes the last item
- : from a collection.
- :
- : @param $name The name of the collection from which the last item should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the last item from the collection.
- :
- : @error zerr:ZDDY0003 If available collections does not provide a mapping
- :        for the expanded QName $name.
- : @error zerr:ZDDY0011 if the collection doesn't contain any item.
- :
- :)
-declare updating function 
-dml:delete-last($name as xs:QName) external;
-
-
-(:~
- : The delete-nodes-last function is an updating function that deletes the
- : last n nodes from an ordered collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- : @param $number The number of nodes to delete.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the last n nodes.
- :
- : @error zerr:ZDDY0003 If available collections does not provide a mapping
- :        for the expanded QName $name.
- : @error zerr:ZDDY0011 if the collection doesn't contain the given number of nodes.
- :
- : @deprecated please use the cdml:delete-last#2 function
- :
- :)
-declare updating function 
-dml:delete-nodes-last($name as xs:QName, $number as xs:integer) external;
-
-
-(:~
- : The delete-last function is an updating function that deletes the last N 
- : items from an ordered collection.
- :
- : @param $name The name of the collection from which the lsat N items should be deleted.
- : @param $number The number N of items to delete.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the last N items.
- :
- : @error zerr:ZDDY0003 If available collections does not provide a mapping
- :        for the expanded QName $name.
- : @error zerr:ZDDY0011 if the collection doesn't contain the given number of items.
- :
- :)
-declare updating function 
-dml:delete-last($name as xs:QName, $number as xs:integer) external;
-
-
-(:~
- : The edit function is an updating function that edits the first supplied
- : item so as to make it look exactly like a copy of the second supplied item,
- : while retaining its original identity.
- :
- : @param $target The target item ,that must be edited.
- : @param $content The content item, that serves as an edit goal.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, performs the replacement.
- :
- : @error zerr:ZDDY0003 if the collection to which $target belongs is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection to which $target
- :        belongs is append-only, const, or queue.
- : @error zerr:ZDDY0017 if the $target item is not a member of a collection.
+ :)
+declare %an:sequential function dml:apply-insert-after( $name as xs:QName,
+                                                        $target as item(),
+                                                        $content as item()* )
+  as item()* external;
+
+(:~
+ : Gets the sequence of nodes or JSON items from a collection.
+ :
+ : @param $name The name of the collection.
+ : @return The sequence contained in the given collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare function dml:collection( $name as xs:QName )
+  as item()* external;
+
+(:~
+ : Gets the sequence of items (nodes or JSON items) from a collection.
+ :
+ : @param $name The name of the collection.
+ : @param $skip The number of collection items to skip.
+ : @return The sub-sequence contained in the given collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare function dml:collection( $name as xs:QName,
+                                 $skip as xs:integer )
+  as item()* external;
+
+(:~
+ : Gets the sequence of items (nodes or JSON items) from a collection.
+ : The parameters <code>$start</code> and <code>$skip</code> can be used to
+ : skip over items at the beginning of the collection.
+ : If both are given, both are applied: first, <code>$start</code> to skip to
+ : that item and then <code>$skip</code> to skip that additional number of
+ : items.
+ :
+ : @param $name The name of the collection.
+ : @param $start A reference to the first item to return.
+ : @param $skip The additional number of items to skip.
+ : @return The sub-sequence from the given collection.
+ : @error zerr:ZAPI0028 If the given URI is not a valid node position computed
+ : by the <code>np:node-position</code> function.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZSTR0066 If <code>$start</code> does not reference a node from
+ : the collection <code>$name</code>.
+ :)
+declare function dml:collection( $name as xs:QName, 
+                                 $start as xs:anyURI,
+                                 $skip as xs:integer )
+  as item()* external;
+
+(:~
+ : Gets the name of the collection the given item (node or JSON item) belongs
+ : to.
+ :
+ : @param $item The item for which to get the name of the collection.
+ : @return The name of the collection to which <code>$item</code> belongs.
+ : @error zerr:ZDDY0011 if <code>$item</code> does not belong to a collection.
+ :)
+declare function dml:collection-name( $item as item() )
+  as xs:QName external;
+
+(:~
+ : Deletes items (nodes or JSON items) from a collection.
+ :
+ : @param $items The items in the collection to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the items from their collections.
+ : @error zerr:ZDDY0011 if any item in <code>$items</code> is not a member of a
+ : collection or not all items belong to the same collection.
+ :)
+declare updating function dml:delete( $items as item()* )
+  external;
+
+(:~
+ : Deletes the first item from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the first item from the collection.
+ : @error zerr:ZDDY0011 if the collection is empty.
+ :)
+declare updating function dml:delete-first( $name as xs:QName )
+  external;
+
+(:~
+ : Deletes the first <i>N</i> items from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @param $number The number of items to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the items from the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if the collection contains less than
+ : <code>$number</code> items.
+ :)
+declare updating function dml:delete-first( $name as xs:QName,
+                                            $number as xs:integer )
+  external;
+
+(:~
+ : Deletes the last item from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the last item from the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if the collection is empty.
+ :)
+declare updating function dml:delete-last( $name as xs:QName )
+  external;
+
+(:~
+ : Deletes the last <i>N</i> items from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @param $number The number of items to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the last N items.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if the collection contains less than
+ : <code>$number</code> items.
+ :)
+declare updating function dml:delete-last( $name as xs:QName,
+                                           $number as xs:integer )
+  external;
+
+(:~
+ : Edits the first supplied item so as to make it look exactly like a copy of
+ : the second supplied item while retaining its original identity.
+ :
+ : @param $target The target item to be edited.
+ : @param $content The item that serves as an edit goal.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : performs the edit.
+ : @error zerr:ZDDY0003 if the collection to which <code>$target</code> belongs
+ : is not available.
+ : @error zerr:ZDDY0006 if the collection to which <code>$target</code> belongs
+ : is append-only, const, or queue.
+ : @error zerr:ZDDY0017 if <code>$target</code> is not a member of a collection.
  : @error zerr:ZDDY0037 if the collection is append-only.
  : @error zerr:ZDDY0038 if the collection is a queue.
- : @error zerr:ZDDY0039 if the $target item is not a root.
- : @error zerr:ZDDY0040 if the target cannot be updated to match the content (for
- :        example because the target is a node and the content is an object).
- :
- :)
-declare updating function 
-dml:edit($target as item(), $content as item()) external;
-
-
-(:~
- : The truncate function is an updating function that deletes the
- : entire contents of collection.
- :
- : @param $name The name of the collection whose content to delete
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :)
-declare updating function dml:truncate($name as xs:QName) external;
-
-
-(:~
- : The collection function returns the sequence of nodes and/or json items
- : that belong to the collection identified by the given name.
- :
- : @param $name The name of the collection.
- :
- : @return The sequence contained in the given collection.
- :
- : @error zerr:ZDDY0003 If available collections does not provide a mapping
- :        for the expanded QName $name.
- :
- :)
-declare function dml:collection($name as xs:QName) as item()* external;
-
-
-(:~
- : The collection function returns the sequence of nodes and/or json items
- : that belong to the collection identified by the given name.
- :
- : @param $name The name of the collection.
- : @param $skip The number of collection items to skip.
- :
- : @return The sequence contained in the given collection.
- :
- : @error zerr:ZDDY0003 If available collections does not provide a mapping
- :        for the expanded QName $name.
- :
- :)
-declare function
-dml:collection($name as xs:QName, $skip as xs:integer) as item()* external;
-
-
-(:~
- : The collection function returns the sequence of nodes and/or json items
- : that belong to the collection identified by the given name.
- : The parameters $start and $skip can be used to skip over some items at
- : the beginning of the collection. If both are given, both are applied:
- : first $start to skip to the referenced item and then $skip to skip an
- : additional number of items.
- :
- : @param $name The name of the collection.
- : @param $start A reference to the first item to return. All items before
-                 are skipped.
- : @param $skip The number of collection items to skip.
- :
- : @return The sequence contained in the given collection.
- :
- : @error zerr:ZAPI0028 If the given URI is not a valid node
- :        position computed by the <tt>np:node-position</tt> function. 
- : @error zerr:ZDDY0003 If available collections does not provide a mapping
- :        for the expanded QName $name.
- : @error zerr:ZSTR0066 If the passed reference $start does not reference
- :        a node from the collection identified by $name.
- :
- :)
-declare function
-dml:collection($name as xs:QName, 
-               $start as xs:anyURI,
-               $skip as xs:integer) as item()* external;
-
-
-(:~
- : The collection-name function returns the name of the collection the given
- : item (node or json item) belongs to.
- :
- : @param $item The item for which to get the name of the collection
- : @return The result of this function is a QName which identifies the collection
- :         to which the given item belongs to.
- :
- : @error zerr:ZDDY0011 if the given item does not belong to a collection.
- :
- :)
-declare function dml:collection-name($item as item()) as xs:QName external;
-
-
-(:~
- : The index-of function returns the position of the given item (node or 
- : json item) within its containing the collection.
- :
- : @param $item The item to retrieve the index from.
- :
- : @return Returns the position as xs:integer of the given item in the collection.
- :
- : @error zerr:ZDDY0011 if the item is not contained in any collection.
- :
- :)
-declare function dml:index-of($item as item()) as xs:integer external;
+ : @error zerr:ZDDY0039 if <code>$target</code> is not a root.
+ : @error zerr:ZDDY0040 if <code>$target</code> cannot be updated to match the
+ : content (for example, because the target is a node and the content is an
+ : object).
+ :)
+declare updating function dml:edit( $target as item(),
+                                    $content as item() )
+  external;
+
+(:~
+ : Gets the position of the given item (node or JSON item) within its
+ : collection.
+ :
+ : @param $item The item to get the index of.
+ : @return The position of <code>$item</code> in its collection.
+ : @error zerr:ZDDY0011 if <code>$item</code> does not belong to a collection.
+ :)
+declare function dml:index-of( $item as item() )
+  as xs:integer external;
+
+(:~
+ : Deletes the entire contents of a collection.
+ :
+ : @param $name The name of the collection whose contents to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the contents.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare updating function dml:truncate( $name as xs:QName )
+  external;
+
+(:===========================================================================:)
+
+(: vim:set et sw=2 ts=2: :)

=== modified file 'modules/store/dynamic/collections/w3c/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq	2013-09-26 23:15:11 +0000
+++ modules/store/dynamic/collections/w3c/ddl.xq	2013-10-17 02:02:41 +0000
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -17,146 +17,140 @@
 :)
 
 (:~
- : This modules defines a set of functions for managing persistent, ordered, and
- : updatable collections.
- :
- : <p>Such collections are identified by a URI as defined in the XQuery specification.
- : However, please note that we do not advice users to use collections identified by URIs.
- : Instead, we refer to the <a href="../zorba/data_lifecycle.html">data lifecycle
- : documentation</a>. It gives an overview over serveral ways to work with collections,
- : documents, and other data-structures.</p>
+ : This modules defines a set of functions for managing persistent, ordered,
+ : and updatable collections.
+ : <p/>
+ : Such collections are identified by a URI as defined in the XQuery
+ : specification.
+ : However, please note that we do not advise users to use collections
+ : identified by URIs.
+ : Instead, we refer to the
+ : <a href="../zorba/data_lifecycle.html">data lifecycle documentation</a>.
+ : It gives an overview of several ways to work with collections, documents,
+ : and other data-structures.
  :
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
- : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml
- : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl
- : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/dml
+ : @see http://zorba.io/modules/store/dynamic/collections/w3c/dml
+ : @see http://zorba.io/modules/store/dynamic/collections/ddl
+ : @see http://zorba.io/modules/store/dynamic/collections/dml
  : @see http://zorba.io/errors
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- :
  : @project Zorba/Data Store/Collections/W3C Data Definition
  :)
-module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl";
+module namespace ddl = "http://zorba.io/modules/store/dynamic/collections/w3c/ddl";
 
-import module namespace qddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
+import module namespace qddl = "http://zorba.io/modules/store/dynamic/collections/ddl";
 
 declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "2.0";
 
+(:===========================================================================:)
+
 (:~
- : Function used for internal purposes only. It converts a URI
- : given as string into a reserved QName. This QName is used
- : in the module to be able to store collections identified by
- : URIs using dynamic collections which are identified by QNames.
- :
- : @param $name URI to convert to a reserved QName.
- :
+ : THIS FUNCTION IS FOR INTERNAL USE ONLY.
+ : Converts a URI given as a string into a reserved QName.
+ : This QName is used in the module to be able to store collections identified
+ : by URIs using dynamic collections that are identified by QNames.
+ :
+ : @param $uri URI to convert to a reserved QName.
  : @return The reserved QName for the given URI.
- :
- :)
-declare function ddl:to-qname($name as xs:string) as xs:QName
-{
-  fn:QName($name, "zorba-internal-name-for-w3c-collections")
-};
-
-(:~
- : Function used for internal purposes only. It returns the namespace
- : component of the given QName.
- :
- : @param $name QName whose namespace component should be returned
- :
- : @return the namespace componentn of the given QName
- :)
-declare function ddl:from-qname($name as xs:QName) as xs:string
-{
-  fn:namespace-uri-from-QName($name)
-};
-
-(:~
- : The function returns true if a collection with the given URI is available
- : (i.e. has been created).
- :
- : @param $name The URI of the collection that is being checked.
- :
+ :)
+declare function ddl:to-qname( $uri as xs:string )
+  as xs:QName
+{
+  fn:QName( $uri, "zorba-internal-name-for-w3c-collections" )
+};
+
+(:~
+ : THIS FUNCTION IS FOR INTERNAL USE ONLY.
+ : Gets the namespace component of the given QName.
+ :
+ : @param $name The QName whose namespace component should be returned.
+ : @return The namespace component of <code>$name</code>
+ :)
+declare function ddl:from-qname( $name as xs:QName )
+  as xs:string
+{
+  fn:namespace-uri-from-QName( $name )
+};
+
+(:~
+ : Checks whether a collection with the given URI exists.
+ :
+ : @param $uri The URI of the collection to check.
  : @return true if the collection is available and false otherwise.
- :
  :)
-declare function ddl:is-available-collection($coll-name as xs:string) as xs:boolean
+declare function ddl:is-available-collection( $uri as xs:string )
+  as xs:boolean
 {
-  qddl:is-available-collection(ddl:to-qname($coll-name))
+  qddl:is-available-collection( ddl:to-qname( $uri ) )
 };
 
 (:~
  : The function returns a sequence of URIs of the collections that are
  : available. The sequence will be empty if there are no collections.
  :
- : @return A sequence of URIs, one for each available collection, or an emtpy sequence.
- :
+ : @return A sequence of URIs, one for each available collection, or an emtpy
+ : sequence.
  :)
-declare function ddl:available-collections() as xs:string* 
+declare function ddl:available-collections()
+  as xs:string* 
 {
   for $c in qddl:available-collections()
-  where fn:local-name-from-QName($c) eq "zorba-internal-name-for-w3c-collections"
-  return ddl:from-qname($c)
-};
-
-(:~
- : The create function is an updating function which creates
- : the collection with the given URI and the empty-sequence as contents.
- :
- : @param $name The URI of the collection to create.
- :
- : @return The result of the function is an empty XDM instance and a 
- :         pending update list which, once applied, creates a collection
- :         with the given name.
- :
- : @error zerr:ZDDY0002 if a collection with the given URI already exists.
- :
- :)
-declare updating function ddl:create($coll-name as xs:string) 
-{
-  qddl:create(ddl:to-qname($coll-name))
-};
-
-(:~
- : The create function is an updating function which creates
- : the collection with the given URI. Moreover, it adds copies
- : of the sequence $content to the new collection.
- :
- : @param $name The URI of the collection to create.
- : @param $content The sequences of nodes that should be added to the new collection.
- :
- : @return The result of the function is an empty XDM instance and a 
- :         pending update list which, once applied, creates a collection
- :         with the given name and inserts the given nodes into it.
- :
- : @error zerr:ZDDY0002 if a collection with the given URI already exists.
- :
- :)
-declare updating function ddl:create(
-  $coll-name as xs:string,
-  $content as node()*) 
-{
-  qddl:create(ddl:to-qname($coll-name), $content)
-};
-
-(:~
- : The delete function is an updating function that removes
- : the collection with the given URI.
- :
- : @param $name The URI of the collection to delete.
- :
- : @return The result of the function is an empty XDM instance and a pending
- :         update list which, once applied, deletes the collection with the given
- :         name.
- :
- : @error zerr:ZDDY0003 if the URI $name is not equal to any of the available collections.
- : @error zerr:ZDDY0015 if any of the in-scope variables references a node that
- :        belongs to the collection with the given URI.
- :
- :)
-declare updating function ddl:delete($coll-name as xs:string)
-{
-  qddl:delete(ddl:to-qname($coll-name))
-};
+  where fn:local-name-from-QName( $c )
+        eq "zorba-internal-name-for-w3c-collections"
+  return ddl:from-qname( $c )
+};
+
+(:~
+ : Creates the collection with the given URI.
+ :
+ : @param $uri The URI of the collection to create.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : creates a collection with the given URI.
+ : @error zerr:ZDDY0002 if a collection identified by <code>$uri</code> already
+ : exists.
+ :)
+declare updating function ddl:create( $uri as xs:string )
+{
+  qddl:create( ddl:to-qname( $uri ) )
+};
+
+(:~
+ : Creates the collection with the given URI and adds copies of the given
+ : sequence to the new collection.
+ :
+ : @param $uri The URI of the collection to create.
+ : @param $content The sequence of nodes to add to the new collection.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : creates a collection identified by <code>$uri</code> and inserts
+ : <code>$content</code> into it.
+ : @error zerr:ZDDY0002 if a collection identified by <code>$uri</code> already
+ : exists.
+ :)
+declare updating function ddl:create( $uri as xs:string,
+                                      $content as node()* )
+{
+  qddl:create( ddl:to-qname( $uri ), $content )
+};
+
+(:~
+ : Deletes the collection with the given URI.
+ :
+ : @param $uri The URI of the collection to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the collection identified by <code>$uri</code>.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0015 if any of the in-scope variables reference a node that
+ : belongs to the collection identified by <code>$uri</code>.
+ :)
+declare updating function ddl:delete( $uri as xs:string )
+{
+  qddl:delete( ddl:to-qname( $uri ) )
+};
+
+(:===========================================================================:)
+
+(: vim:set et sw=2 ts=2: :)

=== modified file 'modules/store/dynamic/collections/w3c/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq	2013-09-26 23:15:11 +0000
+++ modules/store/dynamic/collections/w3c/dml.xq	2013-10-17 02:02:41 +0000
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -17,30 +17,32 @@
 :)
 
 (:~
- : This modules provides a set of functions to modify a collection and retrieve the nodes
- : contained in a particular collection.
- :
- : <p>Such collections are identified by a URI as defined in the XQuery specification.
- : However, please note that we do not advice users to use collections identified by URIs.
- : Instead, we refer to the <a href="../zorba/data_lifecycle.html">data lifecycle
- : documentation</a>. It gives an overview over serveral ways to work with collections,
- : documents, and other data-structures.</p>
+ : This modules provides a set of functions to modify a collection and retrieve
+ : the nodes contained in a particular collection.
+ : <p/>
+ : Such collections are identified by a URI as defined in the XQuery
+ : specification.
+ : However, please note that we do not advice users to use collections
+ : identified by URIs.
+ : Instead, we refer to the
+ : <a href="../zorba/data_lifecycle.html">data lifecycle documentation</a>.
+ : It gives an overview of several ways to work with collections, documents,
+ : and other data-structures.
  :
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
- : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl
- : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl
- : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/dml
+ : @see http://zorba.io/modules/store/dynamic/collections/w3c/ddl
+ : @see http://zorba.io/modules/store/dynamic/collections/ddl
+ : @see http://zorba.io/modules/store/dynamic/collections/dml
  : @see http://zorba.io/errors
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- :
  : @project Zorba/Data Store/Collections/W3C Data Manipulation
  :)
-module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml";
-
-import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl";
-
-import module namespace qdml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
+module namespace dml = "http://zorba.io/modules/store/dynamic/collections/w3c/dml";
+
+import module namespace ddl = "http://zorba.io/modules/store/dynamic/collections/w3c/ddl";
+
+import module namespace qdml = "http://zorba.io/modules/store/dynamic/collections/dml";
 
 declare namespace zerr = "http://zorba.io/errors";
 declare namespace an = "http://zorba.io/annotations";
@@ -48,332 +50,274 @@
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "2.0";
 
-(:~
- : The insert-nodes-first function is an updating function that inserts copies of the
- : given nodes at the beginning of the collection.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- :)
-declare updating function dml:insert-nodes-first(
-  $name as xs:string,
-  $content as node()*)
-{
-  qdml:insert-nodes-first(ddl:to-qname($name), $content)
-};
-
-(:~
- : The insert-nodes-last function is an updating function that inserts copies of the
- : given nodes at the end of the collection.
- :
- : @param $name The name of the collection to which the nodes should  be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- :)
-declare updating function dml:insert-nodes-last(
-  $name as xs:string,
-  $content as node()*)
-{
-  qdml:insert-nodes-last(ddl:to-qname($name), $content)
-};
-
-(:~
- : The insert-nodes-before function is an updating function that inserts
- : copies of the given nodes into a collection at the position directly preceding the
- : given target node.
- :
- : @param $name The name of the collection to which the nodes should  be added.
- : @param $target The node in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0011 if the target node is not contained in the collection.
- :
- :)
-declare updating function dml:insert-nodes-before($name as xs:string,
-                                                    $target as node(),
-                                                    $content as node()*)
-{
-  qdml:insert-nodes-before(ddl:to-qname($name), $target, $content)
-};
-
-(:~
- : The insert-nodes-after function is an updating function that inserts
- : copies of the given nodes into a collection at the position directlry following the
- : given target node.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0011 if the target node is not contained in the collection.
- :
- :)
-declare updating function dml:insert-nodes-after($name as xs:string,
+(:===========================================================================:)
+
+(:~
+ : Inserts copies of the given nodes at the beginning of the collection.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of nodes whose copies will be inserted.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts <code>$content</code> into the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare updating function dml:insert-nodes-first( $name as xs:string,
+                                                  $content as node()* )
+{
+  qdml:insert-first( ddl:to-qname( $name ), $content )
+};
+
+(:~
+ : Inserts copies of the given nodes at the end of the collection.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of nodes whose copies will be inserted.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the nodes into the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare updating function dml:insert-nodes-last( $name as xs:string,
+                                                 $content as node()* )
+{
+  qdml:insert-last( ddl:to-qname( $name ), $content )
+};
+
+(:~
+ : Inserts copies of the given nodes into a collection at the position directly
+ : preceding the given target node.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The node in the collection before which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequences of nodes whose copies will be inserted.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the nodes into the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if <code>$target</code> node is not contained in the
+ : collection.
+ :)
+declare updating function dml:insert-nodes-before( $name as xs:string,
+                                                   $target as node(),
+                                                   $content as node()* )
+{
+  qdml:insert-before( ddl:to-qname( $name ), $target, $content )
+};
+
+(:~
+ : Inserts copies of the given nodes into a collection at the position
+ : directly following the given target node.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The node in the collection after which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of nodes whose copies will be inserted.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the nodes into the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if <code>$target</code> node is not contained in the
+ : collection.
+ :)
+declare updating function dml:insert-nodes-after( $name as xs:string,
                                                   $pos as node(),
-                                                  $content as node()*)
+                                                  $content as node()* )
 {
-  qdml:insert-nodes-after(ddl:to-qname($name), $pos, $content)
+  qdml:insert-after( ddl:to-qname( $name ), $pos, $content )
 };
 
-
 (:~
- : This function does the same as the insert-nodes function except
- : it immediately applies the resulting pending updates and returns the
+ : This function does the same as the <code>insert-nodes()</code> function
+ : except it immediately applies the resulting pending updates and returns the
  : nodes that have been inserted.
  :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of nodes whose copies will be inserted.
+ : @return The sequence of nodes that have been inserted.
+ : @error zerr:ZDDY0003 if the collection is not available.
  : @see dml:insert-nodes-first
- :
  :)
-declare %an:sequential function dml:apply-insert-nodes-first(
-  $name as xs:string,
-  $content as node()*) as node()*
+declare %an:sequential function
+dml:apply-insert-nodes-first( $name as xs:string, $content as node()* )
+  as node()*
 {
-  qdml:apply-insert-nodes-first(ddl:to-qname($name), $content)
+  qdml:apply-insert-first( ddl:to-qname( $name ), $content )
 };
 
 (:~
- : This function does the same as the insert-nodes-last function except
- : it immediately applies the resulting pending updates and returns the
+ : This function does the same as the <code>insert-nodes-last()</code> function
+ : except it immediately applies the resulting pending updates and returns the
  : nodes that have been inserted.
  :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of nodes whose copies will be inserted.
+ : @return The sequence of nodes that have been inserted.
+ : @error zerr:ZDDY0003 if the collection is not available.
  : @see dml:insert-nodes-last
- :
  :)
-declare %an:sequential function dml:apply-insert-nodes-last(
-  $name as xs:string,
-  $content as node()*) as node()*
+declare %an:sequential function
+dml:apply-insert-nodes-last( $name as xs:string, $content as node()* )
+  as node()*
 {
-  qdml:apply-insert-nodes-last(ddl:to-qname($name), $content)
+  qdml:apply-insert-last( ddl:to-qname( $name ), $content )
 };
 
 (:~
- : This function does the same as the insert-nodes-before function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
+ : This function does the same as the <code>insert-nodes-before()</code>
+ : function except it immediately applies the resulting pending updates and
+ : returns the nodes that have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The node in the collection before which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of nodes whose copies will be inserted.
+ : @return The sequence of nodes that have been inserted.
+ : @error zerr:ZDDY0003 if the collection is not available.
  : @see dml:insert-nodes-before
- :
  :)
-declare %an:sequential function dml:apply-insert-nodes-before(
-  $name as xs:string,
-  $target as node(),
-  $content as node()*) as node()*
+declare %an:sequential function
+dml:apply-insert-nodes-before( $name as xs:string,
+                               $target as node(),
+                               $content as node()* )
+  as node()*
 {
-  qdml:apply-insert-nodes-before(ddl:to-qname($name), $target, $content)
+  qdml:apply-insert-before( ddl:to-qname( $name ), $target, $content )
 };
 
 (:~
- : This function does the same as the insert-nodes-after function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
+ : This function does the same as the <code>insert-nodes-after()</code>
+ : function except it immediately applies the resulting pending updates and
+ : returns the nodes that have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The node in the collection after which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of nodes whose copies will be inserted.
+ : @return The sequence of nodes that have been inserted.
+ : @error zerr:ZDDY0003 if the collection is not available.
  : @see dml:insert-nodes-after
- :
- :)
-declare %an:sequential function dml:apply-insert-nodes-after(
-  $name as xs:string,
-  $pos as node(),
-  $content as node()*) as node()*
-{
-  qdml:apply-insert-nodes-after(ddl:to-qname($name), $pos, $content)
-};
-
-(:~
- : The delete-nodes function is an updating function that deletes zero of more
- : nodes from a collection. 
- :
- : @param $target the nodes in the collection that should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes from their collections.
- :
- : @error zerr:ZDDY0011 if any nodes in the $target sequence is not a member of a collection
- :        or not all nodes of the $target sequence belong to the same collection.
- :        the collection identified by the $name parameter.
- :
- :)
-declare updating function dml:delete-nodes($target as node()*)
-{
-  qdml:delete-nodes($target)
-};
-
-(:~
- : The delete-node-first function is an updating function that deletes the
- : first node from a collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the first node from the collection.
- :
- : @error zerr:ZDDY0011 if the collection doesn't contain any node.
- :
- :)
-declare updating function dml:delete-node-first($name as xs:string)
-{
-  qdml:delete-node-first(ddl:to-qname($name))
-};
-
-(:~
- : The delete-nodes-first function is an updating function that deletes the
- : first n nodes from a collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- : @param $number The number of nodes that should be removed from the beginning of
- :        the collection.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes from the collection.
- :
- : @error zerr:ZDDY0011 if the collection doesn't contain the given number of nodes.
- :)
-declare updating function dml:delete-nodes-first(
-  $name as xs:string,
-  $number as xs:integer)
-{
-  qdml:delete-nodes-first(ddl:to-qname($name), $number)
-};
-
-(:~
- : The delete-node-last function is an updating function that deletes the
- : last node from a collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the last node from the collection.
- :
- : @error zerr:ZDDY0009 If available collections does not provide a mapping
- :        for the URI $name.
- : @error zerr:ZDDY0011 if the collection doesn't contain any node.
- :)
-declare updating function dml:delete-node-last($name as xs:string)
-{
-  qdml:delete-node-last(ddl:to-qname($name))
-};
-
-(:~
- : The delete-nodes-last function is an updating function that deletes the
- : last n nodes from an ordered collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- : @param $number The number of nodes to delete.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the last n nodes.
- :
- : @error zerr:ZDDY0009 If available collections does not provide a mapping
- :        for the URI $name.
- : @error zerr:ZDDY0011 if the collection doesn't contain the given number of nodes.
- :)
-declare updating function dml:delete-nodes-last(
-  $name as xs:string,
-  $number as xs:integer)
-{
-  qdml:delete-nodes-last(ddl:to-qname($name), $number)
-};
-
-(:~
- : The index-of function return the index of the given node in the collection.
- :
- : @param node The node to retrieve the index from.
- :
- : @return Returns the position as xs:integer of the given node in the collection.
- :
- : @error zerr:ZDDY0011 if node is not contained in any collection.
- :
- :)
-declare function dml:index-of($node as node()) as xs:integer
-{
-  qdml:index-of($node)
-};
-
-(:~
- : The collection function returns the sequence of nodes of the collection
- : identified by the given name.
+ :)
+declare %an:sequential function
+dml:apply-insert-nodes-after( $name as xs:string,
+                              $pos as node(),
+                              $content as node()* )
+  as node()*
+{
+  qdml:apply-insert-after( ddl:to-qname( $name ), $pos, $content )
+};
+
+(:~
+ : Gets the sequence of nodes of the collection identified by the given name.
  :
  : @param $name The name of the collection.
- :
  : @return The sequence contained in the given collection.
- :
- : @error zerr:ZDDY0009 If available collections does not provide a mapping
- :        for the URI $name.
- :
- :)
-declare function dml:collection($name as xs:string) as node()*
-{
-  qdml:collection(ddl:to-qname($name))
-};
-
-(:~
- : This function returns the name of the collection the given node belongs
- : to.
- :
- : @param $node The node for which to get the name of the collection
- : @return The result of this function is a URI which identifies the collection
- :         to which the given node belongs to.
- :
- : @error zerr:ZDDY0011 if the given node does not belong to a collection.
- :
- :)
-declare function dml:collection-name($node as node()) as xs:string
-{
-  ddl:from-qname(qdml:collection-name($node))
-};
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare function dml:collection( $name as xs:string )
+  as node()*
+{
+  qdml:collection( ddl:to-qname( $name ) )
+};
+
+(:~
+ : Gets the name of the collection the given node belongs to.
+ :
+ : @param $node The node for which to get the name of the collection.
+ : @return The URI of the collection to which <code>$node</code> belongs.
+ : @error zerr:ZDDY0011 if <code>$node</code> does not belong to a collection.
+ :)
+declare function dml:collection-name( $node as node() )
+  as xs:string
+{
+  ddl:from-qname( qdml:collection-name( $node ) )
+};
+
+(:~
+ : Deletes nodes from a collection. 
+ :
+ : @param $nodes the nodes in the collection that should be deleted.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the nodes from their collections.
+ : @error zerr:ZDDY0011 if any nodes are not a member of a collection or not
+ : all nodes of belong to the same collection.
+ :)
+declare updating function dml:delete-nodes( $nodes as node()* )
+{
+  qdml:delete( $nodes )
+};
+
+(:~
+ : Deletes the first node from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the first node from the collection.
+ : @error zerr:ZDDY0011 if the collection is empty.
+ :)
+declare updating function dml:delete-node-first( $name as xs:string )
+{
+  qdml:delete-first( ddl:to-qname( $name ) )
+};
+
+(:~
+ : Deletes the first <i>N</i> nodes from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @param $number The number of nodes to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the nodes from the collection.
+ : @error zerr:ZDDY0011 if the collection contains less than
+ : <code>$number</code> items.
+ :)
+declare updating function dml:delete-nodes-first( $name as xs:string,
+                                                  $number as xs:integer )
+{
+  qdml:delete-first( ddl:to-qname( $name ), $number )
+};
+
+(:~
+ : Deletes the last node from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the last node from the collection.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if the collection is empty.
+ :)
+declare updating function dml:delete-node-last( $name as xs:string )
+{
+  qdml:delete-last( ddl:to-qname( $name ) )
+};
+
+(:~
+ : Deletes the last <i>N</i> nodes from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @param $number The number of nodes to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the last n nodes.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0011 if the collection contains less than
+ : <code>$number</code> items.
+ :)
+declare updating function dml:delete-nodes-last( $name as xs:string,
+                                                 $number as xs:integer )
+{
+  qdml:delete-last( ddl:to-qname( $name ), $number )
+};
+
+(:~
+ : Gets the index of the given node in the collection.
+ :
+ : @param $node The node to get the index of.
+ : @return Returns the position of <code>$node</code> in the collection.
+ : @error zerr:ZDDY0011 if <code>$node</code> is not contained in any
+ : collection.
+ :)
+declare function dml:index-of( $node as node() )
+  as xs:integer
+{
+  qdml:index-of( $node )
+};
+
+(:===========================================================================:)
+
+(: vim:set et sw=2 ts=2: :)

=== renamed directory 'modules/com/zorba-xquery/www/modules/store/static' => 'modules/store/static'
=== modified file 'modules/store/static/collections/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq	2013-09-26 23:15:11 +0000
+++ modules/store/static/collections/ddl.xq	2013-10-17 02:02:41 +0000
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -17,146 +17,128 @@
  :)
 
 (:~
- : This modules defines a set of functions for managing collections which are
+ : This modules defines a set of functions for managing collections that are
  : declared in the prolog of a module.
- : For example, it provides functions to create, delete, or introspect collections.
- :
- : <p>This module is part of <a href="../zorba/xqddf.html">Zorba's XQuery Data
+ : For example, it provides functions to create, delete, or introspect
+ : collections.
+ : <p/>
+ : This module is part of <a href="../zorba/xqddf.html">Zorba's XQuery Data
  : Definition Facility</a>. All the collections managed by this module
  : have to be pre-declared in the prolog of a module. Please refer to the
  : <a href="../zorba/data_lifecycle.html">general documentation</a>
- : for more information and examples.</p>
+ : for more information and examples.
  :
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
  : @see <a href="../zorba/xqddf.html">XQuery Data Definition Facility</a>
- : @see http://www.zorba-xquery.com/modules/store/static/collections/dml
- : @see http://www.zorba-xquery.com/modules/store/static/indexes/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/indexes/dml
- : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
+ : @see http://zorba.io/modules/store/static/collections/dml
+ : @see http://zorba.io/modules/store/static/indexes/ddl
+ : @see http://zorba.io/modules/store/static/indexes/dml
+ : @see http://zorba.io/modules/store/static/integrity-constraints/ddl
+ : @see http://zorba.io/modules/store/static/integrity-constraints/dml
  : @see http://zorba.io/errors
  :
  : @author Nicolae Brinza, Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- :
  : @project Zorba/Data Store/Collections/Static Data Definition
- :
  :)
-module namespace cddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+module namespace cddl = "http://zorba.io/modules/store/static/collections/ddl";
 
 declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "2.0";
 
-
-(:~
- : The create function is an updating function which creates
- : the collection with the given expanded QName.
- :
- : @param $name The QName of the collection to create.
- :
- : @return The result of the function is an empty XDM instance and a 
- :         pending update list which, once applied, creates a collection
- :         with the given name.
- :
- : @error zerr:ZDDY0001 if the expanded QName $name is not equal
- :        to any of the declared collections in the static context.
- : @error zerr:ZDDY0002 if a collection with the given expanded QName already
- :        exists.
- :
- :)
-declare updating function cddl:create($name as xs:QName) external;
-
-
-(:~
- : The create function is an updating function which creates
- : the collection with the given expanded QName. Moreover, it adds copies
- : of the sequence $content to the new collection.
- :
- : @param $name The QName of the collection to create.
- : @param $content The sequences of items (nodes and/or json items) that should
- :        be added to the new collection.
- :
- : @return The result of the function is an empty XDM instance and a 
- :         pending update list which, once applied, creates a collection
- :         with the given name and inserts the given items into it.
- :
- : @error zerr:ZDDY0001 if the expanded QName $name is not equal
- :        to any of the declared collections in the static context.
- : @error zerr:ZDDY0002 if a collection with the given expanded QName already
- :        exists.
- : @error zerr:ZDTY0001 if $content does not match the expected type
- :        (i.e. declared by the collection) according to the rules
- :        for SequenceType Matching.
- :
- :)
-declare updating function cddl:create($name as xs:QName, $content as item()*) external;
-
-
-(:~
- : The delete function is an updating function that deletes
- : the collection with the given expanded QName.
- :
- : @param $name The QName of the collection to delete.
- :
- : @return The result of the function is an empty XDM instance and a pending
- :         update list which, once applied, deletes the collection with the given
- :         name.
- :
- : @error zerr:ZDDY0001 if the expanded QName $name is not equal
- :        to any of the declared collections in the static context.
- : @error zerr:ZDDY0003 if the expanded QName $name is not equal
- :        to any of the available collections.
- : @error zerr:ZDDY0015 if any of the in-scope variables references an item that
- :        belongs to the collection with QName $name.
+(:===========================================================================:)
+
+(:~
+ : Gets the QNames of the collections that have been statically declared and
+ : are available, if any.
+:
+ : @return A sequence comprising one QName for each statically declared and
+ : available collection or an emtpy sequence if no such collections are
+ : available.
+ :)
+declare function cddl:available-collections()
+  as xs:QName* external;
+
+(:~
+ : Creates a collection.
+ :
+ : @param $name The of the collection to create.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : creates a collection with the given name.
+ : @error zerr:ZDDY0001 if <code>$name</code> is not equal to any of the
+ : declared collections in the static context.
+ : @error zerr:ZDDY0002 if a collection with <code>$name</code> already exists.
+ :)
+declare updating function cddl:create( $name as xs:QName ) external;
+
+(:~
+ : Creates a collection and adds the given sequence as content to the new
+ : collection.
+ :
+ : @param $name The name of the collection to create.
+ : @param $content The sequences of items (nodes or JSON items) to be added to
+ : the new collection.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : creates a collection with the given name and inserts the given items into
+ : it.
+ : @error zerr:ZDDY0001 if <code>$name</code> is not equal to any of the
+ : declared collections in the static context.
+ : @error zerr:ZDDY0002 if a collection with <code>$name</code> already exists.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type declared by the collection according to the rules for SequenceType
+ : Matching.
+ :)
+declare updating function cddl:create( $name as xs:QName,
+                                       $content as item()* )
+  external;
+
+(:~
+ : Gets the collections that have been declared in the prolog of the static
+ : context.
+ :
+ : @return A sequence of QNames, one for each collection created in the static
+ : context, or an emtpy sequence.
+ :)
+declare function cddl:declared-collections()
+  as xs:QName* external;
+
+(:~
+ : Deletes a collection.
+ :
+ : @param $name The collection to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the collection with the given name.
+ : @error zerr:ZDDY0001 if <code>$name</code> is not equal to any of the
+ : declared collections in the static context.
+ : @error zerr:ZDDY0003 if the collection identified by <code>$name</code> is
+ : not available.
  : @error zerr:ZDDY0013 if the domain or key expression of any of the available
- :        indexes access the collection with name $name.
- :
- :)
-declare updating function cddl:delete($name as xs:QName) external;
-
-
-(:~
- : The function returns true if a collection with the given QName is
- : statically declared and available (i.e. has been created).
- :
- : @param $name The QName of the collection that is being checked.
- :
- : @return true if the collection is statically declared and available,
- :   false otherwise.
- :
- :)
-declare function cddl:is-available-collection($name as xs:QName) as xs:boolean external;
-
-
-(:~
- : The function returns a sequence of QNames of the collections that are
- : statically declared and available. The sequence will be empty if there
- : are no such collections.
- :
- : @return A sequence of QNames, one for each statically declared and available
- :  collection, or an emtpy sequence.
- :
- :)
-declare function cddl:available-collections() as xs:QName*  external;
-
-
-(:~
- : The function returns true if a collection with the given
- : QName is declared in the prolog of the static context.
- :
- : @param $name The QName of the collection that is being checked.
- :
- : @return true if the collection is declared or false otherwise.
- :
- :)
-declare function cddl:is-declared-collection($name as xs:QName) as xs:boolean external;
-
-
-(:~
- : The function returns a sequence of QNames representing the collections that have
- : been declared in the prolog of the static context.
- :
- : @return A sequence of QNames, one for each created collection, or an emtpy sequence.
- :
- :)
-declare function cddl:declared-collections() as xs:QName*  external;
+ : indexes access the collection having <code>$name</code>.
+ : @error zerr:ZDDY0015 if any of the in-scope variables references an item
+ : that belongs to the collection having <code>$name</code>
+ :)
+declare updating function cddl:delete( $name as xs:QName )
+  external;
+
+(:~
+ : Gets whether a collection is statically declared and available.
+ :
+ : @param $name The name of the collection to check.
+ : @return true if the collection was statically declared and is available;
+ : false otherwise.
+ :)
+declare function cddl:is-available-collection( $name as xs:QName )
+  as xs:boolean external;
+
+(:~
+ : Gers whether a collection was declared in the prolog of the static context.
+ :
+ : @param $name The name of the collection to check.
+ : @return true if the collection was declared; false otherwise.
+ :)
+declare function cddl:is-declared-collection( $name as xs:QName )
+  as xs:boolean external;
+
+(:===========================================================================:)
+
+(: vim:set et sw=2 ts=2: :)

=== modified file 'modules/store/static/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq	2013-09-26 23:15:11 +0000
+++ modules/store/static/collections/dml.xq	2013-10-17 02:02:41 +0000
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -17,30 +17,30 @@
 :)
 
 (:~
- : This modules provides a set of functions to modify a collection and retrieve the items
- : contained in a particular collection.
- :
- : <p>This module is part of <a href="../zorba/xqddf.html">Zorba's XQuery Data
- : Definition Facility</a>. All the collections managed by this module
- : have to be pre-declared in the prolog of a module. Please refer to the
+ : This modules provides a set of functions to modify a collection
+ : and retrieve the items contained in a particular collection.
+ : <p/>
+ : This module is part of
+ : <a href="../zorba/xqddf.html">Zorba's XQuery Data Definition Facility</a>.
+ : All the collections managed by this module have to be pre-declared in the
+ : prolog of a module.
+ : Please refer to the
  : <a href="../zorba/data_lifecycle.html">general documentation</a>
- : for more information and examples.</p>
+ : for more information and examples.
  :
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
  : @see <a href="../zorba/xqddf.html">XQuery Data Definition Facility</a>
- : @see http://www.zorba-xquery.com/modules/store/static/collections/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/indexes/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/indexes/dml
- : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
+ : @see http://zorba.io/modules/store/static/collections/ddl
+ : @see http://zorba.io/modules/store/static/indexes/ddl
+ : @see http://zorba.io/modules/store/static/indexes/dml
+ : @see http://zorba.io/modules/store/static/integrity-constraints/ddl
+ : @see http://zorba.io/modules/store/static/integrity-constraints/dml
  : @see http://zorba.io/errors
  :
  : @author Nicolae Brinza, Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- :
  : @project Zorba/Data Store/Collections/Static Data Manipulation
- :
  :)
-module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+module namespace cdml = "http://zorba.io/modules/store/static/collections/dml";
 
 declare namespace an = "http://zorba.io/annotations";
 declare namespace zerr = "http://zorba.io/errors";
@@ -48,923 +48,430 @@
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "2.0";
 
-
-(:~
- : The insert-nodes function is an updating function that inserts copies of the
- : given nodes into a collection. 
- : Please note that the insertion position of the nodes in the collection is
- : not defined.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is append-only,
- :        const, or queue.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
- : @deprecated please use the cdml:insert#2 function
- :
- :)
-declare updating function 
-cdml:insert-nodes($name as xs:QName, $content as node()*) external;
-
-
-(:~
- : The insert function is an updating function that inserts copies of the given
- : items (nodes and/or json items) into a collection. Please note that the 
- : insertion position of the items in the collection is not defined.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is append-only,
- :        const, or queue.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType 
- :        Matching.
- :
- :)
-declare updating function 
-cdml:insert($name as xs:QName, $content as item()*) external;
-
-
-(:~
- : The insert-nodes-first function is an updating function that inserts copies
- : of the given nodes at the beginning of a collection. 
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is append-only,
- :        const, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
- : @deprecated please use the cdml:insert-first#2 function
- :
- :)
-declare updating function 
-cdml:insert-nodes-first($name as xs:QName, $content as node()*)  external;
-
-
-(:~
- : The insert-first function is an updating function that inserts copies of the
- : given items (nodes and/or json items) at the beginning of a collection. 
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is append-only,
- :        const, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
- :)
-declare updating function 
-cdml:insert-first($name as xs:QName, $content as item()*) external;
-
-
-(:~
- : The insert-nodes-last function is an updating function that inserts
- : copies of the given nodes at the end of a collection.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
- : @deprecated please use the cdml:insert-last#2 function
- :
- :)
-declare updating function 
-cdml:insert-nodes-last($name as xs:QName, $content as node()*)  external;
-
-
-(:~
- : The insert-last function is an updating function that inserts copies of the
- : given items (nodes and/or json items) at the end of a collection.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of itemss whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
- :)
-declare updating function 
-cdml:insert-last($name as xs:QName, $content as item()*)  external;
-
-
-(:~
- : The insert-nodes-before function is an updating function that inserts
- : copies of the given nodes into a collection at the position directly preceding the
- : given target node.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- : @error zerr:ZDDY0011 if the $target node is not a node that is contained in
- :        the collection $name.
- :
- : @deprecated please use the cdml:insert-before#3 function
- :
- :)
-declare updating function 
-cdml:insert-nodes-before(
-  $name as xs:QName,
-  $target as node(),
-  $content as node()*)  external;
-
-
-(:~
- : The insert-before function is an updating function that inserts copies of the
- : given items (nodes and/or json items) into a collection at the position 
- : directly preceding the given target item.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $target The item in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- : @error zerr:ZDDY0011 if the $target item is not an item that is contained in
- :        the collection $name.
- :
- :)
-declare updating function 
-cdml:insert-before($name as xs:QName, $target as item(), $content as item()*) external;
-
-
-(:~
- : The insert-nodes-after function is an updating function that inserts
- : copies of the given nodes into a collection at the position directlry following the
- : given target node.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the nodes into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- : @error zerr:ZDDY0011 if the $target node is not a node that is contained in
- :        the collection $name.
- :
- : @deprecated please use the cdml:insert-after#3 function
- :
- :)
-declare updating function 
-cdml:insert-nodes-after(
-  $name as xs:QName,
-  $target as node(),
-  $content as node()*)  external;
-
+(:===========================================================================:)
+
+(:~
+ : Gets the sequence of nodes or JSON items from a collection.
+ :
+ : @param $name The name of the collection.
+ : @return The seqnence of items from the collection.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare function cdml:collection( $name as xs:QName )
+  as item()* external;
+
+(:~
+ : Gets the sequence of nodes or JSON items from a collection.
+ :
+ : @param $name The name of the collection.
+ : @param $skip The initial number of items to skip.
+ : @return The (sub)sequence of items from the collection.
+ :
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare function cdml:collection( $name as xs:QName, $skip as xs:integer )
+  as item()* external;
+
+(:~
+ : Gets the sequence of items (nodes or JSON items) from a collection.
+ : The parameters <code>$start</code> and <code>$skip</code> can be used to
+ : skip over some items at the beginning of the collection.
+ : If both are given, both are applied:
+ : first <code>$start</code> to skip to the referenced item
+ : and then <code>$skip</code> to skip that additional number of items.
+ :
+ : @param $name The name of the collection.
+ : @param $start The reference to the first item to return.
+ : @param $skip The number of additional items to skip.
+ : @return The sub-sequence from the collection.
+ : @error zerr:ZAPI0028 If the given URI is not a valid node position computed
+ : by the <code>np:node-position</code> function.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZSTR0066 if <code>$start</code> does not reference a node from
+ : the collection.
+ :)
+declare function cdml:collection( $name as xs:QName, 
+                                  $start as xs:anyURI,
+                                  $skip as xs:integer )
+  as item()* external;
+
+(:~
+ : Inserts copies of the given items (nodes or JSON items) into a collection.
+ : Note that the insertion position of the items in the collection is not
+ : defined.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is append-only, const, or queue.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
+ :)
+declare updating function cdml:insert( $name as xs:QName,
+                                       $content as item()* )
+  external;
 
 (:~
  : The insert-after function is an updating function that inserts copies of the
- : given items (nodes and/or json items) into a collection at the position 
- : directlry following the given target item.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $target The item in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, inserts the items into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- : @error zerr:ZDDY0011 if the $target node is not a node that is contained in
- :        the collection $name.
- :
- :)
-declare updating function 
-cdml:insert-after($name as xs:QName, $target as item(), $content as item()*) external;
-
-
-(:~
- : This function does the same as the insert-nodes function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is append-only,
- :        const, or queue.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
- : @see cdml:insert-nodes
- :
- : @deprecated please use the cdml:apply-insert#2 function
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-nodes($name as xs:QName, $content as node()*) as node()* external;
-
-
-(:~
- : This function does the same as the insert function except it immediately applies
- : the resulting pending updates and returns the items that have been inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is append-only,
- :        const, or queue.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
+ : given items (nodes or JSON items) into a collection at the position 
+ : directly following the given target item.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The item in the collection after which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of items whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const, append-only, or queue.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
+ : @error zerr:ZDDY0011 if <code>$target</code> is not a node that is contained
+ : in the collection.
+ :)
+declare updating function cdml:insert-after( $name as xs:QName,
+                                             $target as item(),
+                                             $content as item()* )
+  external;
+
+(:~
+ : Inserts copies of the given items (nodes or JSON items) into a collection at
+ : the position directly preceding the given target item.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The item in the collection before which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of items whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const, append-only, or queue.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
+ : @error zerr:ZDDY0011 if <code>$target</code> is not an item that is
+ : contained in the collection.
+ :)
+declare updating function cdml:insert-before( $name as xs:QName,
+                                              $target as item(),
+                                              $content as item()* )
+  external;
+
+(:~
+ : Inserts copies of the given items (nodes or JSON items) at the beginning of
+ : a collection.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is append-only, const, or queue.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
+ :)
+declare updating function cdml:insert-first( $name as xs:QName,
+                                             $content as item()* )
+  external;
+
+(:~
+ : Inserts copies of the given items (nodes or JSON items) at the end of a
+ : collection.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of itemss whose copies to insert.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : inserts the items into the collection.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
+ :)
+declare updating function cdml:insert-last( $name as xs:QName,
+                                            $content as item()* )
+  external;
+
+(:~
+ : This function does the same thing as <code>insert()</code> except it
+ : immediately applies the resulting pending updates and returns the items that
+ : have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The sequence of items that have been inserted.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is append-only, const, or queue.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
  : @see cdml:insert
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert($name as xs:QName, $content as item()*) as item()* external;
-
-(:~
- : This function does the same as the insert-nodes-first function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is append-only,
- :        const, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type according to the
- :        rules for SequenceType Matching.
- :
- : @see cdml:insert-nodes-first
- :
- : @deprecated please use the cdml:apply-insert-first#2 function
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-nodes-first(
-  $name as xs:QName, 
-  $content as node()*) as node()* external;
-
-
-(:~
- : This function does the same as the insert-first function except it immediately
- : applies the resulting pending updates and returns the items that have been 
- : inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is append-only,
- :        const, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
+ :)
+declare %an:sequential function cdml:apply-insert( $name as xs:QName,
+                                                   $content as item()* )
+  as item()* external;
+
+(:~
+ : This function does the same thing as <code>insert-first()</code> except it
+ : immediately applies the resulting pending updates and returns the items that
+ : have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The Sequence of items that have been inserted.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection $name is append-only, const, or
+ : queue.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
  : @see cdml:insert-first
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-first($name as xs:QName, $content as item()*) as item()* external;
-
-(:~
- : This function does the same as the insert-nodes-last function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
- : @see cdml:insert-nodes-last
- :
- : @deprecated please use the cdml:apply-insert-last#2 function
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-nodes-last(
-  $name as xs:QName,
-  $content as node()*) as node()*  external;
-
-
-(:~
- : This function does the same as the insert-last function except it immediately
- : applies the resulting pending updates and returns the items that have been
- : inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
+ :)
+declare %an:sequential function cdml:apply-insert-first( $name as xs:QName,
+                                                         $content as item()* )
+  as item()* external;
+
+(:~
+ : This function does the same thing as <code>insert-last()</code> except it
+ : immediately applies the resulting pending updates and returns the items that
+ : have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The sequence of items that have been inserted.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
  : @see cdml:insert-last
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-last($name as xs:QName, $content as item()*) as item()*  external;
-
-
-(:~
- : This function does the same as the insert-nodes-before function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- : @error zerr:ZDDY0011 if the $target node is not a node that is contained in
- :        the collection $name.
- :
- : @see cdml:insert-nodes-before
- :
- : @deprecated please use the cdml:apply-insert-before#3 function
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-nodes-before(
-  $name as xs:QName,
-  $target as node(),
-  $content as node()*) as node()*  external;
-
-
-(:~
- : This function does the same as the insert-before function except it immediately
- : applies the resulting pending updates and returns the items that have been 
- : inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $target The item in the collection before which the $content
- :        sequence should be inserted.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- : @error zerr:ZDDY0011 if the $target item is not an item that is contained in
- :        the collection $name.
- :
+ :)
+declare %an:sequential function cdml:apply-insert-last( $name as xs:QName,
+                                                        $content as item()* )
+  as item()* external;
+
+(:~
+ : This function does the same thing as <code>insert-before()</code> except it
+ : immediately applies the resulting pending updates and returns the items that
+ : have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The item in the collection before which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The sequence of items that have been inserted.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection $name is const, append-only, or
+ : queue.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
+ : @error zerr:ZDDY0011 if <code>$target</code> is not an item that is
+ : contained in the collection.
  : @see cdml:insert-before
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-before(
-  $name as xs:QName,
-  $target as item(),
-  $content as item()*) as item()*  external;
-
-
-(:~
- : This function does the same as the insert-nodes-after function except
- : it immediately applies the resulting pending updates and returns the
- : nodes that have been inserted.
- :
- : @param $name The name of the collection to which the nodes should be added.
- : @param $target The node in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of nodes whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of nodes that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is 
- :        const, append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- : @error zerr:ZDDY0011 if the $target node is not a node that is contained in
- :        the collection $name.
- :
- : @see cdml:insert-nodes-after
- :
- : @deprecated please use the cdml:apply-insert-after#3 function
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-nodes-after(
-  $name as xs:QName,
-  $pos as node(),
-  $content as node()*) as node()*  external;
-
-
-(:~
- : This function does the same as the insert-after function except it immediately
- : applies the resulting pending updates and returns the items that have been 
- : inserted.
- :
- : @param $name The name of the collection to which the items should be added.
- : @param $target The item in the collection after which the $content
- :        sequence should be inserted.
- : @param $content The sequences of items whose copies should be added to the collection.
- :
- : @return The result of the function is the sequence of items that have been
- :         inserted into the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is 
- :        const, append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- : @error zerr:ZDDY0011 if the $target item is not an item that is contained in
- :        the collection $name.
- :
+ :)
+declare %an:sequential function cdml:apply-insert-before( $name as xs:QName,
+                                                          $target as item(),
+                                                          $content as item()* )
+  as item()* external;
+
+(:~
+ : This function does the same thing as the <code>insert-after()</code>
+ : function except it immediately applies the resulting pending updates and
+ : returns the items that have been inserted.
+ :
+ : @param $name The name of the collection to insert into.
+ : @param $target The item in the collection after which <code>$content</code>
+ : will be inserted.
+ : @param $content The sequence of items whose copies to insert.
+ : @return The sequence of items that have been inserted.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const, append-only, or queue.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type as specified in the collection declaration according to the rules for
+ : SequenceType Matching.
+ : @error zerr:ZDDY0011 if <code>$target</code> is not in the collection.
  : @see cdml:insert-after
- :
- :)
-declare %an:sequential function 
-cdml:apply-insert-after(
-  $name as xs:QName,
-  $pos as item(),
-  $content as item()*) as item()*  external;
-
-
-(:~
- : The delete-nodes function is an updating function that deletes zero of more
- : nodes from a collection. 
- :
- : @param $target the nodes in the collection that should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes from their collections.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0011 if any node in the $target sequence is not a member of a
- :        collection or not all nodes of the $target sequence belong to the same
- :        collection.
- :
- : @deprecated please use the cdml:delete#1 function
- :
- :)
-declare updating function 
-cdml:delete-nodes($target as node()*)  external;
-
-
-(:~
- : The delete function is an updating function that deletes zero of more items
- : (nodes and/or json items) from a collection. 
- :
- : @param $target the items in the collection that should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the items from their collections.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0011 if any item in the $target sequence is not a member of a
- :        collection or not all items of the $target sequence belong to the same
- :        collection.
- :
- :)
-declare updating function 
-cdml:delete($target as item()*)  external;
-
-
-(:~
- : The delete-node-first function is an updating function that deletes the
- : first node from an ordered collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the first node from the collection.
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is 
- :        const or append-only.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDDY0011 If the collection is empty.
- :
- : @deprecated please use the cdml:delete-first#1 function
- :
- :)
-declare updating function 
-cdml:delete-node-first($name as xs:QName) external;
-
-
-(:~
- : The delete-first function is an updating function that deletes the first 
- : item from an ordered collection.
- :
- : @param $name The name of the collection from which the first item should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the first item from the collection.
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is 
- :        const or append-only.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDDY0011 If the collection is empty.
- :
- :)
-declare updating function 
-cdml:delete-first($name as xs:QName) external;
-
-
-(:~
- : The delete-nodes-first function is an updating function that deletes the
- : first n nodes from an ordered collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- : @param $number The number of nodes that should be removed from the beginning of
- :        the collection.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes from the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is
- :        const or append-only.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDDY0011 If the collection contains less than $number nodes.
- :
- : @deprecated please use the cdml:delete-first#2 function
- :
- :)
-declare updating function 
-cdml:delete-nodes-first($name as xs:QName, $number as xs:integer)  external;
-
-
-(:~
- : The delete-first function is an updating function that deletes the first N
- : items from an ordered collection.
- :
- : @param $name The name of the collection from which the first N items should be deleted.
- : @param $number The number N of items that should be removed from the beginning of
- :        the collection.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the items from the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is
- :        const or append-only.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDDY0011 If the collection contains less than $number items.
- :
- :)
-declare updating function 
-cdml:delete-first($name as xs:QName, $number as xs:integer)  external;
-
-
-(:~
- : The delete-node-last function is an updating function that deletes the
- : last node from an ordered collection.
- :
- : @param $name The name of the collection from which the last node should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the last node from the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDDY0011 If the collection is empty.
- :
- : @deprecated please use the cdml:delete-last#1 function
- :)
-declare updating function 
-cdml:delete-node-last($name as xs:QName)  external;
-
-
-(:~
- : The delete-last function is an updating function that deletes the last item
- : from an ordered collection.
- :
- : @param $name The name of the collection from which the last item should be deleted.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the last item from the collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection $name is const,
- :        append-only, or queue.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDDY0011 If the collection is empty.
- :)
-declare updating function 
-cdml:delete-last($name as xs:QName)  external;
-
-
-(:~
- : The delete-nodes-last function is an updating function that deletes the
- : last n nodes from an ordered collection.
- :
- : @param $name The name of the collection from which the first node should be deleted.
- : @param $number The number of nodes to delete.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDDY0011 If the collection contains less than $number nodes.
- :
- : @deprecated please use the cdml:delete-last#2 function
- :
- :)
-declare updating function 
-cdml:delete-nodes-last($name as xs:QName, $number as xs:integer)  external;
-
-
-(:~
- : The delete-last function is an updating function that deletes the last N items
- : from an ordered collection.
- :
- : @param $name The name of the collection from which the last N items should be deleted.
- : @param $number The number of items to delete.
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the items.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZDDY0012 if the order property of the collection $name is unordered.
- : @error zerr:ZDDY0011 If the collection contains less than $number items.
- :
- :)
-declare updating function 
-cdml:delete-last($name as xs:QName, $number as xs:integer)  external;
-
-
-(:~
- : The edit function is an updating function that edits the first supplied
- : item so as to make it look exactly like a copy of the second supplied item,
- : while retaining its original identity.
- :
- : @param $target The target item ,that must be edited.
- : @param $content The content item, that serves as an edit goal.
- :
- : @return The result of the function is an empty XDM instance and a pending update list
- :         which, once applied, performs the edit.
- :
- : @error zerr:ZDDY0001 if the collection to which $target belongs is not declared.
- : @error zerr:ZDDY0003 if the collection to which $target belongs is not available.
- : @error zerr:ZDDY0006 if the modifier property of the collection to which $target
- :        belongs is append-only, const, or queue.
- : @error zerr:ZDDY0017 if the $target item is not a member of a collection.
+ :)
+declare %an:sequential function cdml:apply-insert-after( $name as xs:QName,
+                                                         $pos as item(),
+                                                         $content as item()* )
+  as item()* external;
+
+(:~
+ : Deletes items (nodes or JSON items) from a collection.
+ :
+ : @param $items The items in the collection to delete.
+ :
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the items from their collections.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const, append-only, or queue.
+ : @error zerr:ZDDY0011 if any item in <code>$items</code> is not a member of a
+ : collection or not all items belong to the same collection.
+ :)
+declare updating function cdml:delete( $items as item()* )
+  external;
+
+(:~
+ : Deletes the first item from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the first item from the collection.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const or append-only.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDDY0011 if the collection is empty.
+ :)
+declare updating function cdml:delete-first( $name as xs:QName )
+  external;
+
+(:~
+ : Deletes the first <i>N</i> items from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @param $number The number of items to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the items from the collection.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const or append-only.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDDY0011 if the collection contains less than
+ : <code>$number</code> items.
+ :)
+declare updating function cdml:delete-first( $name as xs:QName,
+                                             $number as xs:integer )
+  external;
+
+(:~
+ : Deletes the last item from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the last item from the collection.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0006 if the collection is const, append-only, or queue.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDDY0011 if the collection is empty.
+ :)
+declare updating function cdml:delete-last( $name as xs:QName )
+  external;
+
+(:~
+ : Deletes the last <i>N</i> items from a collection.
+ :
+ : @param $name The name of the collection to delete from.
+ : @param $number The number of items to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the items.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ : @error zerr:ZDDY0011 if the collection contains less than
+ : <code>$number</code> items.
+ :)
+declare updating function cdml:delete-last( $name as xs:QName,
+                                            $number as xs:integer )
+  external;
+
+(:~
+ : Edits the first supplied item so as to make it look exactly like a copy of
+ : the second supplied item while retaining its original identity.
+ :
+ : @param $target The target item to be edited.
+ : @param $content The item that serves as an edit goal.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : performs the edit.
+ : @error zerr:ZDDY0001 if the collection to which <code>$target</code> belongs
+ : is not declared.
+ : @error zerr:ZDDY0003 if the collection to which <code>$target</code> belongs
+ : is not available.
+ : @error zerr:ZDDY0006 if the collection to which <code>$target</code> belongs
+ : is append-only, const, or queue.
+ : @error zerr:ZDDY0017 if <code>$target</code> is not a member of a collection.
  : @error zerr:ZDDY0037 if the collection is append-only.
  : @error zerr:ZDDY0038 if the collection is a queue.
- : @error zerr:ZDDY0039 if the $target item is not a root.
- : @error zerr:ZDDY0040 if the target cannot be updated to match the content (for
- :        example because the target is a node and the content is an object).
- : @error zerr:ZDTY0001 if $content does not match the expected type (as specified
- :        in the collection declaration) according to the rules for SequenceType Matching.
- :
+ : @error zerr:ZDDY0039 if <code>$target</code> is not a root.
+ : @error zerr:ZDDY0040 if <code>$target</code> cannot be updated to match the
+ : content (for example, because the target is a node and the content is an
+ : object).
+ : @error zerr:ZDTY0001 if <code>$content</code> does not match the expected
+ : type (as specified in the collection declaration) according to the rules for
+ : SequenceType Matching.
  :)
-declare updating function 
-cdml:edit($target as item(), $content as item()) external;
-
+declare updating function cdml:edit( $target as item(),
+                                     $content as item() )
+  external;
 
 (:~
- : The truncate function is an updating function that deletes the
- : entire contents of collection.
- :
+ : Deletes the entire contents of collection.
  : Please note that applying this function can not be undone in case
  : an error happens during the application of the containing PUL.
  :
- : @param $name The name of the collection whose content to delete
- :
- : @return The result of this function is an empty XDM instance and a pending update
- :         list which, once applied, deletes the nodes.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- :)
-declare updating function 
-cdml:truncate($name as xs:QName) external;
-
-
-(:~
- : The collection function returns the sequence of nodes and/or json items
- : that belong to the collection identified by the given name.
- :
- : @param $name The name of the collection.
- :
- : @return The sequence contained in the given collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- :)
-declare function 
-cdml:collection($name as xs:QName) as item()*  external;
-
-
-(:~
- : The collection function returns the sequence of nodes and/or json items
- : that belong to the collection identified by the given name.
- :
- : @param $name The name of the collection.
- : @param $skip The number of collection items to skip.
- :
- : @return The sequence contained in the given collection.
- :
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- :
- :)
-declare function 
-cdml:collection($name as xs:QName, $skip as xs:integer) as item()*  external;
-
-
-(:~
- : The collection function returns the sequence of nodes and/or json items
- : that belong to the collection identified by the given name.
- : The parameters $start and $skip can be used to skip over some items at
- : the beginning of the collection. If both are given, both are applied:
- : first $start to skip to the referenced item and then $skip to skip an
- : additional number of items.
- :
- : @param $name The name of the collection.
- : @param $start The reference to the first item to return. All items before
-                 are skipped.
- : @param $skip The number of collection items to skip.
- :
- : @return The sequence contained in the given collection.
- :
- : @error zerr:ZAPI0028 If the given URI is not a valid node
- :        position computed by the <tt>np:node-position</tt> function. 
- : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
- : @error zerr:ZDDY0003 if the collection identified by $name is not available.
- : @error zerr:ZSTR0066 if the passed reference $start does not reference
- :        a node from the collection identified by $name.
- :
- :)
-declare function 
-cdml:collection($name as xs:QName, 
-                $start as xs:anyURI,
-                $skip as xs:integer) as item()* external;
-(:~
- : The collection-name function returns the name of the collection the given
- : item (node or json item) belongs to.
- :
- : @param $item The item for which to get the name of the collection
- : @return The result of this function is a QName which identifies the collection
- :         to which the given item belongs to.
- :
- : @error zerr:ZDDY0011 if the given item does not belong to a collection.
- :
- :)
-declare function 
-cdml:collection-name($item as item()) as xs:QName external;
-
-
-(:~
- : The index-of function returns the position of the given item (node or 
- : json item) within its containing collection.
- :
- : @param $node The item to retrieve the index for.
- :
- : @return Returns the position as xs:integer of the given item in the collection.
- :
- : @error zerr:ZDDY0011 if the item is not stored in any collection.
- : @error zerr:ZDDY0012 if the order property of the collection is unordered.
- :
- :)
-declare function 
-cdml:index-of($item as item()) as xs:integer external;
+ : @param $name The name of the collection whose content to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the nodes.
+ : @error zerr:ZDDY0001 if the collection is not declared.
+ : @error zerr:ZDDY0003 if the collection is not available.
+ :)
+declare updating function cdml:truncate( $name as xs:QName )
+  external;
+
+(:~
+ : Gets the name of the collection the given item (node or JSON item) belongs
+ : to.
+ :
+ : @param $item The item for which to get the name of its collection.
+ : @return The name of the collection to which the given item belongs.
+ : @error zerr:ZDDY0011 if <code>$item</code> does not belong to a collection.
+ :)
+declare function cdml:collection-name( $item as item() )
+  as xs:QName external;
+
+(:~
+ : Gets the position of the given item (node or JSON item) within its
+ : collection.
+ :
+ : @param $item The item to get the index of.
+ : @return The position of <code>$item</code> in its collection.
+ : @error zerr:ZDDY0011 if <code>$item</code> does not belong to a collection.
+ : @error zerr:ZDDY0012 if the collection is unordered.
+ :)
+declare function cdml:index-of( $item as item() )
+  as xs:integer external;
+
+(:===========================================================================:)
+
+(: vim:set et sw=2 ts=2: :)

=== modified file 'modules/store/static/indexes/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq	2013-09-26 23:15:11 +0000
+++ modules/store/static/indexes/ddl.xq	2013-10-17 02:02:41 +0000
@@ -17,103 +17,99 @@
 :)
 
 (:~
- : This modules defines a set of functions for managing indexes which are
+ : This modules defines a set of functions for managing indexes that are
  : declared in the prolog of a module.
- :
- : <p>This module is part of <a href="../zorba/xqddf.html">Zorba's XQuery Data
- : Definition Facility</a>. All the indexes managed by this module
- : have to be pre-declared in the prolog of a module. Please refer to the
+ : <p/>
+ : This module is part of
+ : <a href="../zorba/xqddf.html">Zorba's XQuery Data Definition Facility</a>.
+ : All the indexes managed by this module have to be pre-declared in the prolog
+ : of a module.
+ : Please refer to the
  : <a href="../zorba/data_lifecycle.html">general documentation</a>
- : for more information and examples.</p>
+ : for more information and examples.
  :
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
  : @see <a href="../zorba/xqddf.html">XQuery Data Definition Facility</a>
- : @see http://www.zorba-xquery.com/modules/store/static/indexes/dml
- : @see http://www.zorba-xquery.com/modules/store/static/collections/dml
- : @see http://www.zorba-xquery.com/modules/store/static/collections/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
+ : @see http://zorba.io/modules/store/static/indexes/dml
+ : @see http://zorba.io/modules/store/static/collections/dml
+ : @see http://zorba.io/modules/store/static/collections/ddl
+ : @see http://zorba.io/modules/store/static/integrity-constraints/ddl
+ : @see http://zorba.io/modules/store/static/integrity-constraints/dml
  : @see http://zorba.io/errors
  :
  : @author Nicolae Brinza, Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- :
  : @project Zorba/Data Store/Indexes/Static Data Definition
- :
  :)
-module namespace iddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";
+module namespace iddl = "http://zorba.io/modules/store/static/indexes/ddl";
 
 declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "2.0";
 
-(:~
- : The function returns true if an index with the given QName is available.
- : (i.e. has been created).
- :
- : @param $name The QName of the index that is being checked.
- :
- : @return true if the index is available and false otherwise.
- :)
-declare function iddl:is-available-index($name as xs:QName) as xs:boolean external;
+(:===========================================================================:)
 
 (:~
- : The function returns a sequence of QNames representing the indexes that are
- : available. The sequence will be empty if there are no indexes.
+ : Gets the available indexes.
  :
  : @return A sequence of QNames, one for each available index, or an empty
  : sequence if none are.
  :)
-declare function iddl:available-indexes() as xs:QName* external;
-
-(:~
- : The create function is an updating function which creates the
- : index with the given expanded QName and populates the index with its
- : values.
- :
- : @param $name The QName of the index to create.
- :
- : @return The result of the function is an empty XDM instance and a pending
- :         update list which, once applied, creates the index with the given
- :         name.
- :
- : @error zerr:ZDDY0021 if the expanded QName of $name is not equal  
- :        to the name of any resource in the statically known indexes.
- : @error zerr:ZDDY0022 if the index with the given name is already created.
- :)
-declare updating function iddl:create(
-  $name as xs:QName)  external;
-
-(:~
- : The delete function is an updating function that deletes
- : the index with the given expanded QName.
- :
- : @param $name The QName of the index to delete.
- :
- : @return The result of the function is an empty XDM instance and a pending
- :         update list which, once applied, deletes the index with the given name.
- :
- : @error zerr:ZDDY0009 If available indexes does not provide a mapping for
- :        the expanded QName $name.
- :
- :)
-declare updating function iddl:delete(
-  $name as xs:QName)  external;
-
-(:~
- : The function returns true if a index with the given
- : QName is declared in the prolog of the static context.
- :
- : @param $name The QName of the index that is being checked.
- :
- : @return true if the index is declared or false otherwise.
- :)
-declare function iddl:is-declared-index(
-  $name as xs:QName) as xs:boolean  external;
-
-(:~
- : The function returns a sequence of QNames representing the indexes that have
- : been declared in the prolog of the static context.
- :
- : @return A sequence of QNames, one for each created collection, or an emtpy sequence.
- :)
-declare function iddl:declared-indexes() as xs:QName*  external;
+declare function iddl:available-indexes()
+  as xs:QName* external;
+
+(:~
+ : Creates an index.
+ :
+ : @param $name The name of the index to create.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : creates the index with the given name.
+ :
+ : @error zerr:ZDDY0021 if <code>$name</code> is not equal to the name of any
+ : resource in the statically known indexes.
+ : @error zerr:ZDDY0022 if an index with <code>$name</code> already exists.
+ :)
+declare updating function iddl:create( $name as xs:QName )
+  external;
+
+(:~
+ : Gets a sequence of QNames representing the indexes that have been declared
+ : in the prolog of the static context.
+ :
+ : @return A sequence of QNames, one for each created collection, or an emtpy
+ : sequence.
+ :)
+declare function iddl:declared-indexes()
+  as xs:QName* external;
+
+(:~
+ : Deletes an index.
+ :
+ : @param $name The name of the index to delete.
+ : @return An empty XDM instance and a pending update list that, once applied,
+ : deletes the index with the given name.
+ : @error zerr:ZDDY0009 if the index does not exist.
+ :)
+declare updating function iddl:delete( $name as xs:QName )
+  external;
+
+(:~
+ : Gets whether an index exists.
+ :
+ : @param $name The name of the index that is being checked.
+ : @return true if the index is available; false otherwise.
+ :)
+declare function iddl:is-available-index( $name as xs:QName )
+  as xs:boolean external;
+
+(:~
+ : Gets whether an index has been declared in the prolog of the static context.
+ :
+ : @param $name The name of the index that is being checked.
+ : @return true if the index was declared; false otherwise.
+ :)
+declare function iddl:is-declared-index( $name as xs:QName )
+  as xs:boolean external;
+
+(:===========================================================================:)
+
+(: vim:set et sw=2 ts=2: :)

=== modified file 'modules/store/static/indexes/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq	2013-09-26 23:15:11 +0000
+++ modules/store/static/indexes/dml.xq	2013-10-17 02:02:41 +0000
@@ -1,7 +1,7 @@
 xquery version "3.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -19,353 +19,344 @@
 (:~
  : This module defines a set of functions to probe and refresh indexes which are
  : declared in the prolog of a module.
- :
- : <p>This module is part of <a href="../zorba/xqddf.html">Zorba's XQuery Data
- : Definition Facility</a>. All the indexes managed by this module
- : have to be pre-declared in the prolog of a library module. Please refer to the
+ : <p/>
+ : This module is part of
+ : <a href="../zorba/xqddf.html">Zorba's XQuery Data Definition Facility</a>.
+ : All the indexes managed by this module have to be pre-declared in the prolog
+ : of a library module.
+ : Please refer to the
  : <a href="../zorba/data_lifecycle.html">general documentation</a>
- : for more information and examples.</p>
+ : for more information and examples.
  :
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
  : @see <a href="../zorba/xqddf.html">XQuery Data Definition Facility</a>
- : @see http://www.zorba-xquery.com/modules/store/static/indexes/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/collections/dml
- : @see http://www.zorba-xquery.com/modules/store/static/collections/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl
- : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
+ : @see http://zorba.io/modules/store/static/indexes/ddl
+ : @see http://zorba.io/modules/store/static/collections/dml
+ : @see http://zorba.io/modules/store/static/collections/ddl
+ : @see http://zorba.io/modules/store/static/integrity-constraints/ddl
+ : @see http://zorba.io/modules/store/static/integrity-constraints/dml
  : @see http://zorba.io/errors
  :
  : @author Zorba Team
- :
  : @project Zorba/Data Store/Indexes/Static Data Manipulation
- :
  :)
-module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
+module namespace idml = "http://zorba.io/modules/store/static/indexes/dml";
 
+declare namespace an = "http://zorba.io/annotations";
 declare namespace zerr = "http://zorba.io/errors";
-declare namespace an = "http://zorba.io/annotations";
 
 declare namespace ver = "http://zorba.io/options/versioning";
-
 declare option ver:module-version "2.0";
 
+(:===========================================================================:)
+
 (:~
- : <p>The probe-index-point-value function retrieves from an index the domain 
- : nodes associated by value equality with a given <strong>search tuple</strong>.
- : The search tuple consists of a number of <strong>search keys</strong>, where
- : each search key is either an atomic item or the empty sequence.  The number
- : of search keys given must be equal to the number of keys declared for the 
- : index. Since the number of keys differs from one index to another, this 
- : function is variadic.</p>
- :
- : <p>The result of the function is either an error or the set of domain nodes for 
- : which the following xquery expression returns true:</p>
- :
- : <pre>
- : $key1 eq $node/keyExpr1 and ... and $keyM eq $node/keyExprM
- : </pre>