Merge lp:~zorba-coders/zorba/fix_bug_1124374 into lp:zorba

[Sorin Marian Nasoi]

- fix for lp:1124374; Updated XQDoc schema.

[lp:~zorba-coders/zorba/fix_bug_1124374]

11554. By sorin.marian.nasoi <email address hidden> on 2013-07-12

- fix for lp:1124374; also updated the XQDoc schema

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

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/fix_bug_1124374/+merge/174398

Stage "TestZorbaUbuntu" failed.
3 tests failed (8344 total tests run).

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

[lp:~zorba-coders/zorba/fix_bug_1124374]

11555. By sorin.marian.nasoi <email address hidden> on 2013-07-12

- updated expected results for XQDoc test-cases

[Zorba Build Bot (zorba-buildbot)]

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

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/fix_bug_1124374/+merge/174398 :
Votes: {'Approve': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398

Stage "CommitZorba" failed.

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

[Matthias Brantner (matthias-brantner)]

Could you please add a test for literals? I couldn't find one.

review: Needs Fixing

[lp:~zorba-coders/zorba/fix_bug_1124374]

11556. By sorin.marian.nasoi <email address hidden> on 2013-07-17

Merged lp:zorba trunk.

11557. By sorin.marian.nasoi <email address hidden> on 2013-07-17

- added a test for the XQDoc annotations of the functions and variables

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> Could you please add a test for literals? I couldn't find one.
Done: please see rev. 11557.

[Matthias Brantner (matthias-brantner)]

- I don't think the prefix and the namespace for an annotation are needed. One should be good enough because the namespaces are listed at the beginning of the document.
- Rename localname to just name
- Would it be possible to keep the numeric type (i.e. xs:integer, xs:decimal, or xs:double)
- It looks like the string literal ''no message delivered'' is missing the second ' at the beginning and the end in the annotation. Am I missing something?

review: Needs Fixing

[lp:~zorba-coders/zorba/fix_bug_1124374]

11558. By sorin.marian.nasoi <email address hidden> on 2013-08-12

Merged lp:zorba trunk after fixing conflicts.

11559. By sorin.marian.nasoi <email address hidden> on 2013-08-12

- removed the namespace and left only the prefix
- renamed 'localname' to 'local'
- added the correct numeric type (i.e. xs:integer, xs:decimal, or xs:double) instead of 'numeric'

[Zorba Build Bot (zorba-buildbot)]

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

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/fix_bug_1124374/+merge/174398

Stage "TestZorbaUbuntu" failed.
1 tests failed (8403 total tests run).

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

[lp:~zorba-coders/zorba/fix_bug_1124374]

11560. By sorin.marian.nasoi <email address hidden> on 2013-08-12

- fixed the test-case after the @localname attribute of the annotations was renamed to @local

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> - I don't think the prefix and the namespace for an annotation are needed. One
> should be good enough because the namespaces are listed at the beginning of
> the document.
Done in r11559.

> - Rename localname to just name
Done in r11559.

> - Would it be possible to keep the numeric type (i.e. xs:integer, xs:decimal,
> or xs:double)
Done in r11559.

> - It looks like the string literal ''no message delivered'' is missing the
> second ' at the beginning and the end in the annotation. Am I missing something?
Yes, I think you are missing the fact that the actual function annotation is:

declare %restxq:form-param("message","{$message}", "'no message delivered'", 5) function annotations:function()

and NOT:
declare %restxq:form-param("message","{$message}", "''no message delivered''", 5) function annotations:function()

In the annotations.xq test-case the module is given as text and that is why there is an escaping of the ' : does this makes sense?

[Zorba Build Bot (zorba-buildbot)]

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

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/fix_bug_1124374/+merge/174398 :
Votes: {'Approve': 1, 'Needs Fixing': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398

Stage "CommitZorba" failed.

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

[Matthias Brantner (matthias-brantner)]

Looks good. However, there is one minor thing which seems to be an existing bug but only now becomes important. The uri attribute of the annotation namespace element is empty:

<xqdoc:custom tag="namespaces">
 <xqdoc:namespace prefix="an" uri="" isSchema="false"/>

review: Needs Fixing

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> Looks good. However, there is one minor thing which seems to be an existing
> bug but only now becomes important. The uri attribute of the annotation
> namespace element is empty:
>
> <xqdoc:custom tag="namespaces">
> <xqdoc:namespace prefix="an" uri="" isSchema="false"/>

1) please give me more information in order to reproduce this SEPARATE BUG:

Here is the test/rbktExpQueryResults/zorbaxqdoc/annotations.xml.res:

<xqdoc:custom tag="namespaces">
<xqdoc:namespace prefix="annotations" uri="http://www.zorba-xquery.com/modules/xqdoc/annotations" isSchema="false"/>
<xqdoc:namespace prefix="restxq" uri="http://www.zorba-xquery.com/modules/xqdoc/test" isSchema="false"/>
</xqdoc:custom>

2) please provide this information in a SEPARATE BUG and approve this merge

[lp:~zorba-coders/zorba/fix_bug_1124374]

11561. By sorin.marian.nasoi <email address hidden> on 2013-08-15

- merged lp:zorba trunk

11562. By sorin.marian.nasoi <email address hidden> on 2013-08-23

- merged lp:zorba trunk

11563. By sorin.marian.nasoi <email address hidden> on 2013-08-23

- updated annotations namespace

Unmerged revisions

11563. By sorin.marian.nasoi <email address hidden> on 2013-08-23

- updated annotations namespace

11562. By sorin.marian.nasoi <email address hidden> on 2013-08-23

- merged lp:zorba trunk

11561. By sorin.marian.nasoi <email address hidden> on 2013-08-15

- merged lp:zorba trunk

11560. By sorin.marian.nasoi <email address hidden> on 2013-08-12

- fixed the test-case after the @localname attribute of the annotations was renamed to @local

11559. By sorin.marian.nasoi <email address hidden> on 2013-08-12

- removed the namespace and left only the prefix
- renamed 'localname' to 'local'
- added the correct numeric type (i.e. xs:integer, xs:decimal, or xs:double) instead of 'numeric'

11558. By sorin.marian.nasoi <email address hidden> on 2013-08-12

Merged lp:zorba trunk after fixing conflicts.

11557. By sorin.marian.nasoi <email address hidden> on 2013-07-17

- added a test for the XQDoc annotations of the functions and variables

11556. By sorin.marian.nasoi <email address hidden> on 2013-07-17

Merged lp:zorba trunk.

11555. By sorin.marian.nasoi <email address hidden> on 2013-07-12

- updated expected results for XQDoc test-cases

11554. By sorin.marian.nasoi <email address hidden> on 2013-07-12

- fix for lp:1124374; also updated the XQDoc schema

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc.xsd'
--- modules/com/zorba-xquery/www/modules/xqdoc.xsd	2013-02-07 17:24:36 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc.xsd	2013-08-23 05:12:21 +0000
@@ -140,16 +140,22 @@
     </xsd:sequence>
   </xsd:complexType>
 
+  <xsd:complexType name="literal">
+    <xsd:attribute name="type" type="xsd:string" use="required"/>
+    <xsd:attribute name="value" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  
   <xsd:complexType name="annotation">
-     <xsd:attribute name="prefix" type="xsd:string" use="optional"/>
-     <xsd:attribute name="namespace" type="xsd:string" use="optional"/>
-     <xsd:attribute name="localname" type="xsd:string" use="optional"/>
-     <xsd:attribute name="value" type="xsd:string" use="optional"/>
+    <xsd:sequence>
+      <xsd:element name="literal" type="literal" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="prefix" type="xsd:string" use="optional"/>
+    <xsd:attribute name="local" type="xsd:string" use="optional"/>
   </xsd:complexType>
 
   <xsd:complexType name="annotations">
     <xsd:sequence>
-      <xsd:element name="annotation" type="annotation" minOccurs="1" maxOccurs="unbounded"/>      
+      <xsd:element name="annotation" type="annotation" minOccurs="1" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -203,6 +209,7 @@
             <xsd:element name="uri" type="uri"/>
             <xsd:element name="type" type="type" minOccurs="0"/>
             <xsd:element name="comment" type="comment" minOccurs="0"/>
+            <xsd:element name="annotations" type="annotations" minOccurs="0"/>
             <xsd:choice minOccurs="0" maxOccurs="unbounded">
               <xsd:element name="invoked" type="invoked" minOccurs="0" maxOccurs="unbounded"/>
               <xsd:element name="ref-variable" type="invoked" minOccurs="0" maxOccurs="unbounded"/>

=== modified file 'src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp	2013-07-01 18:59:06 +0000
+++ src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp	2013-08-23 05:12:21 +0000
@@ -137,8 +137,8 @@
 void print_annotations(AnnotationListParsenode* aAnn, store::Item_t aParent)
 {
   if (aAnn) {
-    store::Item_t lTypeName, lAnnotationsQName, lAnnotationQName;
-    store::Item_t lAnnotationsElem, lAnnotationElem;
+    store::Item_t lTypeName, lAnnotationsQName, lAnnotationQName, lLiteralQName;
+    store::Item_t lAnnotationsElem, lAnnotationElem, lLiteralElem;
 
     theFactory->createQName(lAnnotationsQName, theXQDocNS, theXQDocPrefix, "annotations");
     lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
@@ -159,40 +159,12 @@
       store::Item_t lAnnAttr;
       lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
 
-      AnnotationLiteralListParsenode* lLits = lAnn->get_literals().getp();
-
-      std::ostringstream lAttrValue;
-      if (lLits)
-      {
-        for (size_t j = 0; j < lLits->size(); ++j)
-        {
-          if (j > 0)
-            lAttrValue << " ";
-
-          exprnode* lLit = (*lLits)[j].getp();
-          StringLiteral* l = dynamic_cast<StringLiteral*>(lLit);
-          if (l)
-          {
-            lAttrValue << l->get_strval();
-          }
-          else
-          {
-            NumericLiteral* n = dynamic_cast<NumericLiteral*>(lLit);
-            assert(n);
-            lAttrValue << n->toString();
-          }
-        }
-      }
-      zstring lTmp( lAttrValue.str() );
-      store::Item_t lAttrValueItem;
-      theFactory->createString(lAttrValueItem, lTmp);
-
       store::Item_t lAttrPrefixItem, lAttrNamespaceItem, lAttrLocalnameItem;
 
       zstring lPrefix = lAnn->get_qname()->get_prefix();
       theFactory->createString(lAttrPrefixItem, lPrefix);
 
-      lTmp = lAnn->get_qname()->get_prefix();
+      zstring lTmp = lAnn->get_qname()->get_prefix();
       lTmp = theNamespaceMap[lTmp];
       theFactory->createString(lAttrNamespaceItem, lTmp);
 
@@ -201,12 +173,8 @@
 
       store::Item_t lPrefixQName;
       theFactory->createQName(lPrefixQName, "", "", "prefix");
-      store::Item_t lNamespaceQName;
-      theFactory->createQName(lNamespaceQName, "", "", "namespace");
-      store::Item_t lLocalnameQName;
-      theFactory->createQName(lLocalnameQName, "", "", "localname");
-      store::Item_t lValueQName;
-      theFactory->createQName(lValueQName, "", "", "value");
+      store::Item_t lLocalQName;
+      theFactory->createQName(lLocalQName, "", "", "local");
 
       lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
       theFactory->createAttributeNode(
@@ -215,18 +183,81 @@
 
       lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
       theFactory->createAttributeNode(
-        lNamespaceQName, lAnnotationElem, lNamespaceQName,
-        lTypeName, lAttrNamespaceItem);
-
-      lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
-      theFactory->createAttributeNode(
-        lLocalnameQName, lAnnotationElem, lLocalnameQName,
+        lLocalQName, lAnnotationElem, lLocalQName,
         lTypeName, lAttrLocalnameItem);
 
-      lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
-      theFactory->createAttributeNode(
-        lValueQName, lAnnotationElem, lValueQName,
-        lTypeName, lAttrValueItem);
+      AnnotationLiteralListParsenode* lLits = lAnn->get_literals().getp();
+
+      zstring lAttrValue;
+      zstring lAttrType;
+      if (lLits)
+      {
+        for (size_t j = 0; j < lLits->size(); ++j)
+        {
+          exprnode* lLit = (*lLits)[j].getp();
+          StringLiteral* l = dynamic_cast<StringLiteral*>(lLit);
+          if (l)
+          {
+            lAttrValue = l->get_strval();
+            lAttrType = "xs:string";
+          }
+          else
+          {
+            NumericLiteral* n = dynamic_cast<NumericLiteral*>(lLit);
+            assert(n);
+            lAttrValue = n->toString();
+            switch (n->get_type())
+            {
+              case ParseConstants::num_integer:
+              {
+                lAttrType = "xs:integer";
+                break;
+              }
+              case ParseConstants::num_decimal:
+              {
+                lAttrType = "xs:decimal";
+                break;
+              }
+              case ParseConstants::num_double:
+              {
+                lAttrType = "xs:double";
+                break;
+              }
+            }
+          }
+
+          theFactory->createQName(lLiteralQName, theXQDocNS, theXQDocPrefix, "literal");
+          lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
+
+          theFactory->createElementNode(
+              lLiteralElem, lAnnotationElem, lLiteralQName,
+              lTypeName, true, false, theNSBindings, theBaseURI);
+
+          store::Item_t lAttrTypeItem, lAttrValueItem;
+
+          theFactory->createString(lAttrTypeItem, lAttrType);
+          theFactory->createString(lAttrValueItem, lAttrValue);
+
+          lTmp = lAnn->get_qname()->get_localname();
+          theFactory->createString(lAttrLocalnameItem, lTmp);
+
+          store::Item_t lTypeQName;
+          theFactory->createQName(lTypeQName, "", "", "type");
+          store::Item_t lValueQName;
+          theFactory->createQName(lValueQName, "", "", "value");
+
+
+          lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
+          theFactory->createAttributeNode(
+            lTypeQName, lLiteralElem, lTypeQName,
+            lTypeName, lAttrTypeItem);
+
+          lTypeName = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
+          theFactory->createAttributeNode(
+            lValueQName, lLiteralElem, lValueQName,
+            lTypeName, lAttrValueItem);
+        }
+      }
     }
   }
 }

=== added file 'test/rbkt/ExpQueryResults/zorba/xqdoc/annotations.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqdoc/annotations.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqdoc/annotations.xml.res	2013-08-23 05:12:21 +0000
@@ -0,0 +1,1 @@
+<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0"><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="library"><xqdoc:uri>http://zorba.io/annotations</xqdoc:uri><xqdoc:name></xqdoc:name><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="annotations" uri="http://zorba.io/annotations" isSchema="false"/><xqdoc:namespace prefix="restxq" uri="http://www.zorba-xquery.com/modules/xqdoc/test" isSchema="false"/></xqdoc:custom></xqdoc:module><xqdoc:imports/><xqdoc:variables><xqdoc:variable><xqdoc:uri>annotations:variable</xqdoc:uri><xqdoc:annotations><xqdoc:annotation prefix="restxq" local="form-param"><xqdoc:literal type="xs:string" value="message"/><xqdoc:literal type="xs:string" value="{$message}"/><xqdoc:literal type="xs:string" value="'no message delivered'"/><xqdoc:literal type="xs:integer" value="5"/></xqdoc:annotation></xqdoc:annotations></xqdoc:variable></xqdoc:variables><xqdoc:collections/><xqdoc:indexes/><xqdoc:functions><xqdoc:function arity="0"><xqdoc:name>annotations:function</xqdoc:name><xqdoc:annotations><xqdoc:annotation prefix="restxq" local="form-param"><xqdoc:literal type="xs:string" value="message"/><xqdoc:literal type="xs:string" value="{$message}"/><xqdoc:literal type="xs:string" value="'no message delivered'"/><xqdoc:literal type="xs:integer" value="5"/></xqdoc:annotation></xqdoc:annotations><xqdoc:signature>declare %restxq:form-param(message {$message} 'no message delivered' 5) function annotations:function() as xs:string</xqdoc:signature><xqdoc:return><xqdoc:type>xs:string</xqdoc:type></xqdoc:return></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
\ No newline at end of file

=== modified file 'test/rbkt/ExpQueryResults/zorba/xqdoc/collindex.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqdoc/collindex.xml.res	2013-08-09 07:33:21 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqdoc/collindex.xml.res	2013-08-23 05:12:21 +0000
@@ -1,128 +1,7 @@
-<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0">
-  <xqdoc:control>
-    <xqdoc:date/>
-    <xqdoc:version>1.0</xqdoc:version>
-  </xqdoc:control>
-  <xqdoc:module type="library">
-    <xqdoc:uri>http://www.zorba-xquery.com/collindex</xqdoc:uri>
-    <xqdoc:name>collindex.xqlib</xqdoc:name>
-    <xqdoc:custom tag="namespaces">
-      <xqdoc:namespace prefix="an" uri="" isSchema="false"/>
-      <xqdoc:namespace prefix="cache" uri="http://www.28msec.com/modules/http/util/cache" isSchema="false"/>
-      <xqdoc:namespace prefix="cil" uri="http://www.zorba-xquery.com/collindex" isSchema="false"/>
-      <xqdoc:namespace prefix="ddl" uri="http://www.zorba-xquery.com/modules/store/static/collections/ddl" isSchema="false"/>
-      <xqdoc:namespace prefix="dml" uri="http://www.zorba-xquery.com/modules/store/static/collections/dml" isSchema="false"/>
-      <xqdoc:namespace prefix="functx" uri="http://www.functx.com" isSchema="false"/>
-      <xqdoc:namespace prefix="idml" uri="http://www.zorba-xquery.com/modules/store/static/indexes/dml" isSchema="false"/>
-      <xqdoc:namespace prefix="req" uri="http://www.28msec.com/modules/http/request" isSchema="false"/>
-      <xqdoc:namespace prefix="resp" uri="http://www.28msec.com/modules/http/response" isSchema="false"/>
-    </xqdoc:custom>
-  </xqdoc:module>
-  <xqdoc:imports>
-    <xqdoc:import type="library">
-      <xqdoc:uri>http://www.functx.com</xqdoc:uri>
-    </xqdoc:import>
-    <xqdoc:import type="library">
-      <xqdoc:uri>http://www.28msec.com/modules/http/request</xqdoc:uri>
-    </xqdoc:import>
-    <xqdoc:import type="library">
-      <xqdoc:uri>http://www.28msec.com/modules/http/response</xqdoc:uri>
-    </xqdoc:import>
-    <xqdoc:import type="library">
-      <xqdoc:uri>http://www.28msec.com/modules/http/util/cache</xqdoc:uri>
-    </xqdoc:import>
-    <xqdoc:import type="library">
-      <xqdoc:uri>http://www.zorba-xquery.com/modules/store/static/collections/ddl</xqdoc:uri>
-    </xqdoc:import>
-    <xqdoc:import type="library">
-      <xqdoc:uri>http://www.zorba-xquery.com/modules/store/static/collections/dml</xqdoc:uri>
-    </xqdoc:import>
-    <xqdoc:import type="library">
-      <xqdoc:uri>http://www.zorba-xquery.com/modules/store/static/indexes/dml</xqdoc:uri>
-    </xqdoc:import>
-  </xqdoc:imports>
-  <xqdoc:variables>
-    <xqdoc:variable>
-      <xqdoc:uri>cil:entries</xqdoc:uri>
-      <xqdoc:invoked arity="1">
-        <xqdoc:uri>http://www.w3.org/2001/XMLSchema</xqdoc:uri>
-        <xqdoc:name>QName</xqdoc:name>
-      </xqdoc:invoked>
-    </xqdoc:variable>
-    <xqdoc:variable>
-      <xqdoc:uri>cil:idx</xqdoc:uri>
-      <xqdoc:invoked arity="1">
-        <xqdoc:uri>http://www.w3.org/2001/XMLSchema</xqdoc:uri>
-        <xqdoc:name>QName</xqdoc:name>
-      </xqdoc:invoked>
-    </xqdoc:variable>
-  </xqdoc:variables>
-  <xqdoc:collections>
-    <xqdoc:collection>
-      <xqdoc:name>entries</xqdoc:name>
-      <xqdoc:type>element(el)*</xqdoc:type>
-      <xqdoc:comment>
-        <xqdoc:description> some comment
-</xqdoc:description>
-      </xqdoc:comment>
-      <xqdoc:annotations>
-        <xqdoc:annotation prefix="an" namespace="" localname="ordered" value=""/>
-      </xqdoc:annotations>
-    </xqdoc:collection>
-    <xqdoc:collection>
-      <xqdoc:name>entries2</xqdoc:name>
-      <xqdoc:comment>
-        <xqdoc:description> some comment2
-</xqdoc:description>
-      </xqdoc:comment>
-      <xqdoc:annotations>
-        <xqdoc:annotation prefix="an" namespace="" localname="ordered" value=""/>
-      </xqdoc:annotations>
-    </xqdoc:collection>
-    <xqdoc:collection>
-      <xqdoc:name>entries3</xqdoc:name>
-      <xqdoc:type>element(el)*</xqdoc:type>
-      <xqdoc:comment>
-        <xqdoc:description> some comment3
-</xqdoc:description>
-      </xqdoc:comment>
-    </xqdoc:collection>
-    <xqdoc:collection>
-      <xqdoc:name>entries4</xqdoc:name>
-      <xqdoc:comment>
-        <xqdoc:description> some comment4
-</xqdoc:description>
-      </xqdoc:comment>
-    </xqdoc:collection>
-  </xqdoc:collections>
-  <xqdoc:indexes>
-    <xqdoc:index>
-      <xqdoc:name>idx</xqdoc:name>
-      <xqdoc:source>
-        <xqdoc:uri>http://www.zorba-xquery.com/collindex</xqdoc:uri>
-        <xqdoc:name>entries</xqdoc:name>
-      </xqdoc:source>
-      <xqdoc:comment>
-        <xqdoc:description> some comment5
-</xqdoc:description>
-      </xqdoc:comment>
-      <xqdoc:annotations>
-        <xqdoc:annotation prefix="an" namespace="" localname="automatic" value=""/>
-        <xqdoc:annotation prefix="an" namespace="" localname="unique" value=""/>
-        <xqdoc:annotation prefix="an" namespace="" localname="value-equality" value=""/>
-      </xqdoc:annotations>
-    </xqdoc:index>
-    <xqdoc:index>
-      <xqdoc:name>idx</xqdoc:name>
-      <xqdoc:source>
-        <xqdoc:uri>http://www.zorba-xquery.com/collindex</xqdoc:uri>
-        <xqdoc:name>entries</xqdoc:name>
-      </xqdoc:source>
-      <xqdoc:comment>
-        <xqdoc:description> some comment6
-</xqdoc:description>
-      </xqdoc:comment>
-    </xqdoc:index>
-  </xqdoc:indexes>
-  <xqdoc:functions/>
-</xqdoc:xqdoc>
+<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0"><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="library"><xqdoc:uri>http://www.zorba-xquery.com/collindex</xqdoc:uri><xqdoc:name>collindex.xqlib</xqdoc:name><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="an" uri="" isSchema="false"/><xqdoc:namespace prefix="cache" uri="http://www.28msec.com/modules/http/util/cache" isSchema="false"/><xqdoc:namespace prefix="cil" uri="http://www.zorba-xquery.com/collindex" isSchema="false"/><xqdoc:namespace prefix="ddl" uri="http://www.zorba-xquery.com/modules/store/static/collections/ddl" isSchema="false"/><xqdoc:namespace prefix="dml" uri="http://www.zorba-xquery.com/modules/store/static/collections/dml" isSchema="false"/><xqdoc:namespace prefix="functx" uri="http://www.functx.com" isSchema="false"/><xqdoc:namespace prefix="idml" uri="http://www.zorba-xquery.com/modules/store/static/indexes/dml" isSchema="false"/><xqdoc:namespace prefix="req" uri="http://www.28msec.com/modules/http/request" isSchema="false"/><xqdoc:namespace prefix="resp" uri="http://www.28msec.com/modules/http/response" isSchema="false"/></xqdoc:custom></xqdoc:module><xqdoc:imports><xqdoc:import type="library"><xqdoc:uri>http://www.functx.com</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.28msec.com/modules/http/request</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.28msec.com/modules/http/response</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.28msec.com/modules/http/util/cache</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.zorba-xquery.com/modules/store/static/collections/ddl</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.zorba-xquery.com/modules/store/static/collections/dml</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.zorba-xquery.com/modules/store/static/indexes/dml</xqdoc:uri></xqdoc:import></xqdoc:imports><xqdoc:variables><xqdoc:variable><xqdoc:uri>cil:entries</xqdoc:uri><xqdoc:invoked arity="1"><xqdoc:uri>http://www.w3.org/2001/XMLSchema</xqdoc:uri><xqdoc:name>QName</xqdoc:name></xqdoc:invoked></xqdoc:variable><xqdoc:variable><xqdoc:uri>cil:idx</xqdoc:uri><xqdoc:invoked arity="1"><xqdoc:uri>http://www.w3.org/2001/XMLSchema</xqdoc:uri><xqdoc:name>QName</xqdoc:name></xqdoc:invoked></xqdoc:variable></xqdoc:variables><xqdoc:collections><xqdoc:collection><xqdoc:name>entries</xqdoc:name><xqdoc:type>element(el)*</xqdoc:type><xqdoc:comment><xqdoc:description> some comment
+</xqdoc:description></xqdoc:comment><xqdoc:annotations><xqdoc:annotation prefix="an" local="ordered"/></xqdoc:annotations></xqdoc:collection><xqdoc:collection><xqdoc:name>entries2</xqdoc:name><xqdoc:comment><xqdoc:description> some comment2
+</xqdoc:description></xqdoc:comment><xqdoc:annotations><xqdoc:annotation prefix="an" local="ordered"/></xqdoc:annotations></xqdoc:collection><xqdoc:collection><xqdoc:name>entries3</xqdoc:name><xqdoc:type>element(el)*</xqdoc:type><xqdoc:comment><xqdoc:description> some comment3
+</xqdoc:description></xqdoc:comment></xqdoc:collection><xqdoc:collection><xqdoc:name>entries4</xqdoc:name><xqdoc:comment><xqdoc:description> some comment4
+</xqdoc:description></xqdoc:comment></xqdoc:collection></xqdoc:collections><xqdoc:indexes><xqdoc:index><xqdoc:name>idx</xqdoc:name><xqdoc:source><xqdoc:uri>http://www.zorba-xquery.com/collindex</xqdoc:uri><xqdoc:name>entries</xqdoc:name></xqdoc:source><xqdoc:comment><xqdoc:description> some comment5
+</xqdoc:description></xqdoc:comment><xqdoc:annotations><xqdoc:annotation prefix="an" local="automatic"/><xqdoc:annotation prefix="an" local="unique"/><xqdoc:annotation prefix="an" local="value-equality"/></xqdoc:annotations></xqdoc:index><xqdoc:index><xqdoc:name>idx</xqdoc:name><xqdoc:source><xqdoc:uri>http://www.zorba-xquery.com/collindex</xqdoc:uri><xqdoc:name>entries</xqdoc:name></xqdoc:source><xqdoc:comment><xqdoc:description> some comment6
+</xqdoc:description></xqdoc:comment></xqdoc:index></xqdoc:indexes><xqdoc:functions/></xqdoc:xqdoc>
\ No newline at end of file

=== modified file 'test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res	2013-08-09 08:27:30 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res	2013-08-23 05:12:21 +0000
@@ -1,1 +1,1 @@
-<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0"><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="main"><xqdoc:uri>local.xqlib</xqdoc:uri><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://zorba.io/annotations" isSchema="false"/><xqdoc:namespace prefix="xqd" uri="http://www.zorba-xquery.com/modules/xqdoc" isSchema="false"/><xqdoc:namespace prefix="xqds" uri="http://www.xqdoc.org/1.0" isSchema="true"/></xqdoc:custom></xqdoc:module><xqdoc:imports><xqdoc:import type="schema"><xqdoc:uri>http://www.xqdoc.org/1.0</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.zorba-xquery.com/modules/xqdoc</xqdoc:uri></xqdoc:import></xqdoc:imports><xqdoc:variables/><xqdoc:collections/><xqdoc:indexes/><xqdoc:functions><xqdoc:function arity="1"><xqdoc:name>local:remove-date</xqdoc:name><xqdoc:annotations><xqdoc:annotation namespace="http://zorba.io/annotations" localname="sequential" prefix="ann" value=""/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function local:remove-date($xqdoc)</xqdoc:signature><xqdoc:parameters><xqdoc:parameter><xqdoc:name>xqdoc</xqdoc:name></xqdoc:parameter></xqdoc:parameters></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
+<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0"><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="main"><xqdoc:uri>local.xqlib</xqdoc:uri><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://zorba.io/annotations" isSchema="false"/><xqdoc:namespace prefix="xqd" uri="http://www.zorba-xquery.com/modules/xqdoc" isSchema="false"/><xqdoc:namespace prefix="xqds" uri="http://www.xqdoc.org/1.0" isSchema="true"/></xqdoc:custom></xqdoc:module><xqdoc:imports><xqdoc:import type="schema"><xqdoc:uri>http://www.xqdoc.org/1.0</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.zorba-xquery.com/modules/xqdoc</xqdoc:uri></xqdoc:import></xqdoc:imports><xqdoc:variables/><xqdoc:collections/><xqdoc:indexes/><xqdoc:functions><xqdoc:function arity="1"><xqdoc:name>local:remove-date</xqdoc:name><xqdoc:annotations><xqdoc:annotation prefix="ann" local="sequential"/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function local:remove-date($xqdoc)</xqdoc:signature><xqdoc:parameters><xqdoc:parameter><xqdoc:name>xqdoc</xqdoc:name></xqdoc:parameter></xqdoc:parameters></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
\ No newline at end of file

=== modified file 'test/rbkt/ExpQueryResults/zorba/xqdoc/no_global_var.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqdoc/no_global_var.xml.res	2013-08-09 08:27:30 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqdoc/no_global_var.xml.res	2013-08-23 05:12:21 +0000
@@ -1,1 +1,1 @@
-<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0"><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="library"><xqdoc:uri>foo:bar</xqdoc:uri><xqdoc:name>no_global_var.xqlib</xqdoc:name><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://zorba.io/annotations" isSchema="false"/><xqdoc:namespace prefix="foo" uri="foo:bar" isSchema="false"/></xqdoc:custom></xqdoc:module><xqdoc:imports/><xqdoc:variables><xqdoc:variable><xqdoc:uri>foo:foo</xqdoc:uri></xqdoc:variable></xqdoc:variables><xqdoc:collections></xqdoc:collections><xqdoc:indexes></xqdoc:indexes><xqdoc:functions><xqdoc:function arity="0"><xqdoc:name>foo:bar</xqdoc:name><xqdoc:annotations><xqdoc:annotation namespace="http://zorba.io/annotations" localname="sequential" prefix="ann" value=""/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function foo:bar()</xqdoc:signature><xqdoc:invoked arity="2"><xqdoc:uri>http://www.w3.org/2005/xpath-functions</xqdoc:uri><xqdoc:name>concat</xqdoc:name></xqdoc:invoked></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
+<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0"><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="library"><xqdoc:uri>foo:bar</xqdoc:uri><xqdoc:name>no_global_var.xqlib</xqdoc:name><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://zorba.io/annotations" isSchema="false"/><xqdoc:namespace prefix="foo" uri="foo:bar" isSchema="false"/></xqdoc:custom></xqdoc:module><xqdoc:imports/><xqdoc:variables><xqdoc:variable><xqdoc:uri>foo:foo</xqdoc:uri></xqdoc:variable></xqdoc:variables><xqdoc:collections/><xqdoc:indexes/><xqdoc:functions><xqdoc:function arity="0"><xqdoc:name>foo:bar</xqdoc:name><xqdoc:annotations><xqdoc:annotation prefix="ann" local="sequential"/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function foo:bar()</xqdoc:signature><xqdoc:invoked arity="2"><xqdoc:uri>http://www.w3.org/2005/xpath-functions</xqdoc:uri><xqdoc:name>concat</xqdoc:name></xqdoc:invoked></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
\ No newline at end of file

=== added file 'test/rbkt/Queries/zorba/xqdoc/annotations.xq'
--- test/rbkt/Queries/zorba/xqdoc/annotations.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqdoc/annotations.xq	2013-08-23 05:12:21 +0000
@@ -0,0 +1,32 @@
+xquery version "3.0";
+
+import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
+
+import schema namespace xqdoc = "http://www.xqdoc.org/1.0";
+
+declare copy-namespaces preserve, inherit;
+
+declare namespace ann = "http://zorba.io/annotations";
+
+declare %ann:sequential function local:remove-date($xqdoc)
+{
+  let $date := $xqdoc//xqdoc:date[1]
+  return
+	replace value of node $date with "";
+  exit returning $xqdoc;
+};
+
+local:remove-date(xqd:xqdoc-content(
+'
+  xquery version "3.0";
+  
+  module namespace annotations = "http://zorba.io/annotations";
+  
+  declare namespace restxq = "http://www.zorba-xquery.com/modules/xqdoc/test";
+  
+  declare %restxq:form-param("message","{$message}", "''no message delivered''", 5) variable $annotations:variable := ("tt");
+  
+  declare %restxq:form-param("message","{$message}", "''no message delivered''", 5) function annotations:function()
+  as xs:string
+  { "test" };
+'))
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq'
--- test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq	2013-08-09 09:20:54 +0000
+++ test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq	2013-08-23 05:12:21 +0000
@@ -137,7 +137,7 @@
     let $module := $xqdoc/xqdoc:module
     return
       string-join(for $function in $xqdoc/xqdoc:functions/xqdoc:function
-      where not(exists($function//xqdoc:annotation[@localname = 'private']))
+      where not(exists($function//xqdoc:annotation[@local = 'private']))
       return local:test-function($module, $function),"")
 };
 
@@ -204,7 +204,7 @@
     let $moduleUri := $module/xqdoc:uri
     return
       string-join(for $variable in $xqdoc/xqdoc:variables/xqdoc:variable
-      where not(exists($variable//xqdoc:annotation[@localname = 'private']))
+      where not(exists($variable//xqdoc:annotation[@local = 'private']))
       return local:test-variable($module, $variable),"")
 };