[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Validation queue job bug-867027-2013-02-08T18-05-42.189Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867027-2013-02-08T18-05-42.189Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Validation queue job bug-867027-2013-02-08T02-59-35.99Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867027-2013-02-08T02-59-35.99Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug-867027-2013-02-08T02-16-36.507Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867027-2013-02-08T02-16-36.507Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug-867027-2013-02-08T02-02-45.912Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867027-2013-02-08T02-02-45.912Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug-867027-2013-02-08T00-17-47.56Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867027-2013-02-08T00-17-47.56Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-867027 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-867027 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-867027 into
lp:zorba.
Commit message:
Created new error codes to handle errors other than what XQST0059 was intended
for.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #867027 in Zorba: "XQST0059 error messages inconsistent"
https://bugs.launchpad.net/zorba/+bug/867027
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257
Created new error codes to handle errors other than what XQST0059 was intended
for.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-867027/+merge/147257
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-02-03 17:44:39 +
+++ ChangeLog 2013-02-08 00:14:22 +
@@ -15,6 +15,7 @@
collection).
Bug Fixes/Other Changes:
+ * Fixed bug #867027 (XQST0059 error messages inconsistent)
* Fixed bug #1095889 (Improve error message for xml-parsing error).
* NaN items are considered equal to each other during grouping
* Fixed bug #855481 (Too small time types on Windows).
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-01-23 17:24:44 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-02-08 00:14:22 +
@@ -422,6 +422,8 @@
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0013_FXCHARHEAP_EXCEPTION;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0014_OUT_OF_MEMORY;
+
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0016_RESERVED_MODULE_TARGET_NAMESPACE;
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0017_FILE_ACCESS_DISABLED;
@@ -446,6 +448,12 @@
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0032_ERROR_TRANSFORMING_XQUERYX_TO_XQUERY;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0033_SCHEMA_XML_ERROR;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0034_SCHEMA_ERROR;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0035_SCHEMA_UNEXPECTED_ERROR;
+
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0036_BREAKITERATOR_CREATION_FAILED;
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0037_INAPPROPRIATE_MODULE_VERSION;
=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2013-01-08 00:31:47 +
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2013-02-08 00:14:22 +
@@ -113,6 +113,10 @@
(:~
:)
+declare variable $zerr:ZXQP0014 as xs:QName := fn:QName($zerr:NS, "zerr:ZXQP0014");
+
+(:~
+:)
declare variable $zerr:ZXQP0016 as xs:QName := fn:QName($zerr:NS, "zerr:ZXQP0016");
(:~
@@ -161,6 +165,18 @@
(:~
:)
+declare variable $zerr:ZXQP0033 as xs:QName := fn:QName($zerr:NS, "zerr:ZXQP0033");
+
+(:~
+:)
+declare variable $zerr:ZXQP0034 as xs:QName := fn:QName($zerr:NS, "zerr:ZXQP0034");
+
+(:~
+:)
+declare variable $zerr:ZXQP0035 as xs:QName := fn:QName($zerr:NS, "zerr:ZXQP0035");
+
+(:~
+:)
declare variable $zerr:ZXQP0036 as xs:QName := fn:QName($zerr:NS, "zerr:ZXQP0036");
(:~
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2013-01-19 20:47:55 +
+++ modules/w3c/pregenerated/xqt-errors.xq 2013-02-08 00:14:22 +
@@ -420,8 +420,8 @@
(:~
:
- : It is a static error if a schema import binds a namespace prefix but does
- : not specify a target namespace other than a zero-length string.
+ : It is a static error if a schema import binds a namespace prefix but
+ : does not specify a target namespace other than a zero-length string.
:
: @see http://www.w3.org/2005/xqt-errors
:)
@@ -439,8 +439,8 @@
(:~
:
: It is a static error if an implementation is unable to process a schema
- : or module import by finding a schema or module with the specified target
- : namespace.
+ : or module import by finding a schema or module with the specified
+ : target namespace.
:
: @see http://www.w3.org/2005/xqt-errors
:)
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-01-29 06:01:31 +
+++ src/compiler/translator/translator.cpp 2013-02-08 00:14:22 +
@@ -2197,7 +2197,7 @@
}
if ( lStream == NULL ) {
- throw XQUERY_EXCEPTION(err::XQST0059, ERROR_PARAMS(lNsURI, lErrorMessage));
+ throw XQUERY_EXCEPTION(err::XQST0059, ERROR_PARAMS(lNsURI, "", lErrorMessage));
}
// If we got this far, we have a valid StreamResource.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-02-03 19:01:15 +
+++ src/diagnostics/diagnostic_en.xml 2013-02-08 00:14:22 +
@@ -572,27 +572,27 @@
- It is a static error if a schema import binds a namespace prefix but does
- not specify a target namespace other than a zero-length string.
+It is a static error if a schema import binds a namespace prefix but
+does not specify a target namespace other than a zero-length string.
empty target namespace
