zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-978722_xqxq into lp:zorba/xqxq-module.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  William Candillon (wcandillon)
Related bugs:
  Bug #978722 in Zorba: "change annotation prefix from "ann" to "an""
  https://bugs.launchpad.net/zorba/+bug/978722

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-978722_xqxq/+merge/101525

fix for bug #978722 (change annotation prefix from "ann" to "an")
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-978722_xqxq/+merge/101525
Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-module.

=== modified file 'src/xqxq.xq'
--- src/xqxq.xq	2012-03-07 08:21:14 +0000
+++ src/xqxq.xq	2012-04-11 10:08:29 +0000
@@ -25,7 +25,7 @@
  :)
 module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "1.0";
@@ -52,7 +52,7 @@
  : of the query. For example, err:XPST0003 if the given XQuery program could
  : not be parsed.
  :)
-declare %ann:sequential function xqxq:prepare-main-module($main-module-text as xs:string) as 
+declare %an:sequential function xqxq:prepare-main-module($main-module-text as xs:string) as 
   xs:anyURI external;
 
 (:~
@@ -69,7 +69,7 @@
  : of the library module. For example, err:XPST0003 if the given XQuery library
  : module could not be parsed.
  :)
-declare %ann:sequential function xqxq:prepare-library-module($library-module-text as xs:string) as 
+declare %an:sequential function xqxq:prepare-library-module($library-module-text as xs:string) as 
   empty-sequence() external ;
 
 (:~
@@ -160,7 +160,7 @@
  : @error xqxq:NoQueryMatch if no query with the given identifier
  :   was prepared.
  :)
-declare %ann:sequential function xqxq:bind-context-item($query-key as xs:anyURI,
+declare %an:sequential function xqxq:bind-context-item($query-key as xs:anyURI,
   $dot as item()) as empty-sequence() external ;
 
 (:~
@@ -180,7 +180,7 @@
  : @error xqxq:UndeclaredVariable if the given variable is not declared
  :   in the query.
  :)
-declare %ann:sequential function xqxq:bind-variable($query-key as xs:anyURI,
+declare %an:sequential function xqxq:bind-variable($query-key as xs:anyURI,
   $var as xs:QName, $value as item()*) as empty-sequence() external ;
 
 
@@ -247,7 +247,7 @@
  :   given query.
  :
  :)
-declare %ann:sequential function xqxq:evaluate-sequential($query-key as
+declare %an:sequential function xqxq:evaluate-sequential($query-key as
   xs:string) as item()* external;
   
 (:~ 
@@ -263,5 +263,5 @@
  :   was prepared.
  :
  :)
-declare %ann:sequential function xqxq:delete-query($query-key as xs:anyURI) as
+declare %an:sequential function xqxq:delete-query($query-key as xs:anyURI) as
   empty-sequence() external;

=== modified file 'test/Queries/xqxq/evaluate-sequential.xq'
--- test/Queries/xqxq/evaluate-sequential.xq	2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/evaluate-sequential.xq	2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
 
 variable $query-key := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare %ann:sequential function local:foo() {
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   
   exit returning true();

=== modified file 'test/Queries/xqxq/evaluate-updating2.xq'
--- test/Queries/xqxq/evaluate-updating2.xq	2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/evaluate-updating2.xq	2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
 
 variable $query-key := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare %ann:sequential function local:foo() {
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   
   exit returning ();

=== modified file 'test/Queries/xqxq/evaluate3.xq'
--- test/Queries/xqxq/evaluate3.xq	2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/evaluate3.xq	2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
 
 variable $query-key := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare %ann:sequential function local:foo() {
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   
   exit returning ();

=== modified file 'test/Queries/xqxq/is-sequential.xq'
--- test/Queries/xqxq/is-sequential.xq	2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/is-sequential.xq	2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
 
 variable $query-key1 := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare %ann:sequential function local:foo() {
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   
   exit returning ();

=== modified file 'test/Queries/xqxq/is-updating.xq'
--- test/Queries/xqxq/is-updating.xq	2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/is-updating.xq	2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
 
 variable $query-key1 := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare %ann:sequential function local:foo() {
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   
   exit returning ();