[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1109853-2013-02-03T10-46-09.123Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Validation queue job bug1109853-2013-02-03T10-46-09.123Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba. Commit message: Updated FOTS snapshot tp 3rd of February. Requested reviews: Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 Updated FOTS snapshot tp 3rd of February. -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2012-12-21 13:51:06 + +++ test/fots/CMakeLists.txt 2013-02-03 11:27:20 + @@ -99,7 +99,6 @@ EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00975 1070533) EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00976 1070533) EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00976a 1070533) -EXPECTED_FOTS_FAILURE (CRASH fn-unparsed-text-lines fn-unparsed-text-lines-052 1073175) EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog001 0) EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog002 0) @@ -261,8 +260,6 @@ EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-018 0) EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-en141 0) EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-en151 0) -EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-025 0) -EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-026 0) EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-030 0) EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-031 0) EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-033 0) @@ -280,7 +277,7 @@ EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-058 0) EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-059 0) EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-060 0) -EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-061 0) +EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-063 0) EXPECTED_FOTS_FAILURE (fn-format-number numberformat14 0) EXPECTED_FOTS_FAILURE (fn-format-number numberformat15 0) EXPECTED_FOTS_FAILURE (fn-format-number numberformat34 0) @@ -296,7 +293,11 @@ EXPECTED_FOTS_FAILURE (fn-format-number numberformat64 0) EXPECTED_FOTS_FAILURE (fn-format-number numberformat70 0) EXPECTED_FOTS_FAILURE (fn-format-number numberformat71 0) +EXPECTED_FOTS_FAILURE (fn-format-number numberformat81 0) +EXPECTED_FOTS_FAILURE (fn-format-number numberformat83 0) EXPECTED_FOTS_FAILURE (fn-format-number numberformat86 0) +EXPECTED_FOTS_FAILURE (fn-format-number numberformat87 0) +EXPECTED_FOTS_FAILURE (fn-format-number numberformat88 0) EXPECTED_FOTS_FAILURE (fn-format-time format-time-002g 0) EXPECTED_FOTS_FAILURE (fn-format-time format-time-002h 0) EXPECTED_FOTS_FAILURE (fn-format-time format-time-002i 0) @@ -367,14 +368,6 @@ EXPECTED_FOTS_FAILURE (fn-iri-to-uri fn-iri-to-uri-18A 0) EXPECTED_FOTS_FAILURE (fn-last last-11 0) EXPECTED_FOTS_FAILURE (fn-last last-24 0) -EXPECTED_FOTS_FAILURE (fn-local-name-from-QName LocalNameFromQNameFunc001 0) -EXPECTED_FOTS_FAILURE (fn-local-name-from-QName LocalNameFromQNameFunc002 0) -EXPECTED_FOTS_FAILURE (fn-local-name-from-QName LocalNameFromQNameFunc003 0) -EXPECTED_FOTS_FAILURE (fn-local-name-from-QName LocalNameFromQNameFunc004 0) -EXPECTED_FOTS_FAILURE (fn-local-name-from-QName LocalNameFromQNameFunc005 0) -EXPECTED_FOTS_FAILURE (fn-local-name-from-QName LocalNameFromQNameFunc018 0) -EXPECTED_FOTS_FAILURE (fn-local-name-from-QName LocalNameFromQNameFunc019 0) -EXPECTED_FOTS_FAILURE (fn-local-name-from-QName LocalNameFromQNameFunc020 0) EXPECTED_FOTS_FAILURE (fn-matches caselessmatch10 0) EXPECTED_FOTS_FAILURE (fn-matches caselessmatch11 0) EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 0) @@ -484,14 +477,6 @@ EXPECTED_FOTS_FAILURE (fn-matches.re re00994 0) EXPECTED_FOTS_FAILURE (fn-matches.re re00998 0) EXPECTED_FOTS_FAILURE (fn-matches.re re00999 0) -EXPECTED_FOTS_FAILURE (fn-namespace-uri-from-QName NamespaceURIFromQNameFunc001 0) -EXPECTED_FOTS_FAILURE (fn-namespace-uri-from-QName NamespaceURIFromQNameFunc002 0) -EXPECTED_FOTS_FAILURE (fn-namespace-uri-from-QName NamespaceURIFromQNameFunc003 0) -EXPECTED_FOTS_FAILURE (fn-namespace-uri-from-QName NamespaceURIFromQNameFunc004 0) -EXPECTED_FOTS_FAILURE (fn-namespace-uri-from-QName NamespaceURIFromQNameFunc005 0) -EXPECTED_FOTS_FAILURE (fn-namespace-uri-from-QName NamespaceURIFromQNameFunc018 0) -EXPECTED_FOTS_FAILURE (fn-namespace-uri-from-QName NamespaceURIFromQNameFunc019 0) -EXPECTED_FOTS_FAILURE (fn-namespace-uri-from-QName NamespaceURIFromQNameFunc020 0) EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-33 0) EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-35 0) EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-37 0) @@ -502,35 +487,34 @@ EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-45 0) EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-46 0) EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-47 0) -EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-48 0) -EXPECTED_FOTS_FAILURE (fn-nilled
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 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:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 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:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/update_FOTS_snaphot-2013-02-03T11-28-29.931Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 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:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba has been updated. Commit Message changed to: - updated FOTS snapshot tp 3rd of February - by default the 'fotsPath' variable of the cli.xq points to the location where 'make fots-import' unzips the FOTS snapshot. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 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:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba has been updated. Description changed to: - updated FOTS snapshot tp 3rd of February - by default the 'fotsPath' variable of the cli.xq points to the location where 'make fots-import' unzips the FOTS snapshot. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 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:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
Validation queue job update_FOTS_snaphot-2013-02-03T11-28-29.931Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 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:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 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:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/update_FOTS_snaphot into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 -- https://code.launchpad.net/~zorba-coders/zorba/update_FOTS_snaphot/+merge/146299 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:~nbrinza/zorba/hof into lp:zorba
The proposal to merge lp:~nbrinza/zorba/hof into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/hof/+merge/146290 -- https://code.launchpad.net/~nbrinza/zorba/hof/+merge/146290 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:~nbrinza/zorba/hof into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-2013-02-03T13-56-58.37Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/hof/+merge/146290 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:~nbrinza/zorba/hof into lp:zorba
The attempt to merge lp:~nbrinza/zorba/hof 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 hof-2013-02-03T13-56-58.37Z is finished. The final status was: 54 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/hof/+merge/146290 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:~nbrinza/zorba/hof into lp:zorba
The proposal to merge lp:~nbrinza/zorba/hof into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/hof/+merge/146290 -- https://code.launchpad.net/~nbrinza/zorba/hof/+merge/146290 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:~zorba-coders/zorba/zorba-error_printer_in_api into lp:zorba
The error code was printed in XML as: codeerr:XPST0003/code I think it's better to print it as: codehttp://www.w3.org/2005/xqt-errors#XPST0003/code (as suggested in http://www.w3.org/TR/xquery-30/#id-identifying-errors). But is it better still to print it as: code ns=http://www.w3.org/2005/xqt-errors; prefix=err localname=XPST0003/ ? -- https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 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:~zorba-coders/zorba/bug-1103819 into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1103819 into
lp:zorba.
Commit message:
Reworked some catch clauses.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1103819 in Zorba: Use of catch (...) should be reduced or mitigated
https://bugs.launchpad.net/zorba/+bug/1103819
Bug #1106581 in Zorba: Use of throw 0 as flow-control
https://bugs.launchpad.net/zorba/+bug/1106581
Bug #1106586 in Zorba: Use of catch (...) swallows exceptions
https://bugs.launchpad.net/zorba/+bug/1106586
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1103819/+merge/146312
Reworked some catch clauses.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1103819/+merge/146312
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp 2013-01-08 08:34:08 +
+++ src/api/xqueryimpl.cpp 2013-02-03 18:00:35 +
@@ -79,6 +79,7 @@
namespace zorba
{
+#define QUERY_TRY try
#define QUERY_CATCH \
catch (ZorbaException const e) \
@@ -941,7 +942,7 @@
{
SYNC_CODE(AutoMutex lock(theMutex);)
- try
+ QUERY_TRY
{
checkNotClosed();
checkCompiled();
@@ -964,22 +965,7 @@
return true;
}
- catch (ZorbaException const e)
- {
-ZorbaImpl::notifyError(theDiagnosticHandler, e);
- }
- catch (FlowCtlException const)
- {
-ZorbaImpl::notifyError(theDiagnosticHandler, User interrupt);
- }
- catch (std::exception const e)
- {
-ZorbaImpl::notifyError(theDiagnosticHandler, e.what());
- }
- catch (...)
- {
-ZorbaImpl::notifyError(theDiagnosticHandler);
- }
+ QUERY_CATCH
return false;
}
=== modified file 'src/capi/cdynamic_context.cpp'
--- src/capi/cdynamic_context.cpp 2012-09-19 21:16:15 +
+++ src/capi/cdynamic_context.cpp 2013-02-03 18:00:35 +
@@ -271,10 +271,7 @@
CDynamicContext::free(XQC_DynamicContext* context)
{
try {
- CDynamicContext* me = CDynamicContext::get(context);
- delete me;
-} catch (ZorbaException const) {
- assert(false);
+ delete CDynamicContext::get(context);
} catch (...) {
assert(false);
}
=== modified file 'src/capi/cexpression.cpp'
--- src/capi/cexpression.cpp 2012-09-19 21:16:15 +
+++ src/capi/cexpression.cpp 2013-02-03 18:00:35 +
@@ -227,10 +227,7 @@
CExpression::free(XQC_Expression* expr)
{
try {
- CExpression* me = CExpression::get(expr);
- delete me;
-} catch (ZorbaException const) {
- assert(false);
+ delete CExpression::get(expr);
} catch (...) {
assert(false);
}
=== modified file 'src/capi/cimplementation.cpp'
--- src/capi/cimplementation.cpp 2012-09-19 21:16:15 +
+++ src/capi/cimplementation.cpp 2013-02-03 18:00:35 +
@@ -507,10 +507,7 @@
CImplementation::free(XQC_Implementation* impl)
{
try {
- CImplementation* me = CImplementation::get(impl);
- delete me;
-} catch (ZorbaException const) {
- assert(false);
+ delete CImplementation::get(impl);
} catch (...) {
assert(false);
}
=== modified file 'src/capi/csequence.cpp'
--- src/capi/csequence.cpp 2012-09-19 21:16:15 +
+++ src/capi/csequence.cpp 2013-02-03 18:00:35 +
@@ -492,10 +492,7 @@
CSequence::free(XQC_Sequence* seq)
{
try {
-CSequence* me = CSequence::get(seq);
-delete me;
- } catch (ZorbaException const) {
-assert(false);
+delete CSequence::get(seq);
} catch (...) {
assert(false);
}
=== modified file 'src/capi/cstatic_context.cpp'
--- src/capi/cstatic_context.cpp 2012-09-19 21:16:15 +
+++ src/capi/cstatic_context.cpp 2013-02-03 18:00:35 +
@@ -666,10 +666,7 @@
CStaticContext::free(XQC_StaticContext* context)
{
try {
- CStaticContext* me = CStaticContext::get(context);
- delete me;
-} catch (ZorbaException const) {
- assert(false);
+ delete CStaticContext::get(context);
} catch (...) {
assert(false);
}
=== modified file 'src/context/default_url_resolvers.cpp'
--- src/context/default_url_resolvers.cpp 2013-01-24 12:11:43 +
+++ src/context/default_url_resolvers.cpp 2013-02-03 18:00:35 +
@@ -21,6 +21,7 @@
#include util/uri_util.h
#include util/http_util.h
#include util/fs_util.h
+#include util/string_util.h
#include store/api/store.h
#include store/api/item_factory.h
#include store/api/collection.h
@@ -93,6 +94,11 @@
new StreamResource((lStream-getStream()), lStream-getStreamReleaser());
lStream-setStreamReleaser(nullptr);
return lResource;
+ } catch (std::exception const e) {
+std::string const msg(
+ BUILD_STRING( Could not create stream resource: , e.what() )
+);
+throw os_error::exception( , aUrl.c_str(), msg.c_str() );
} catch (...) {
throw os_error::exception(, aUrl.c_str(), Could not create stream resource);
}
=== modified file
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1108515 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-1108515 into
lp:zorba.
Commit message:
Fixed incorrect error reporting
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1108515 in Zorba: English error message in json_items.cpp
https://bugs.launchpad.net/zorba/+bug/1108515
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316
Fixed incorrect error reporting
--
https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-01-30 15:19:38 +
+++ src/diagnostics/diagnostic_en.xml 2013-02-03 19:03:19 +
@@ -2735,7 +2735,13 @@
/diagnostic
diagnostic code=ZSTR0060 name=RANGE_EXCEPTION
- valueout of range: $1/value
+ value$1: value out of range${ 2}/value
+ entry key=ForCollection_3
+valuefor collection $3/value
+ /entry
+ entry key=ForSequence
+valuefor sequence/value
+ /entry
/diagnostic
diagnostic code=ZSTR0065 name=STRINGS_IN_POOL
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-01-30 16:43:55 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-02-03 19:03:19 +
@@ -469,7 +469,7 @@
{ ZSTR0045, duplicate node found in sequence },
{ ZSTR0050, \$1\ not implemented for item type \$2\ },
{ ZSTR0055, streamable string has already been consumed },
- { ZSTR0060, out of range: $1 },
+ { ZSTR0060, \$1\: value out of range${ 2} },
{ ZSTR0065, Zorba did not close properly, objects may still in memory.\\n$1 referenced URI(s) remain in the string pool.\\nFor help avoiding this message please refer to http://www.zorba-xquery.com/html/documentation in section General Architecture - Memory Leaks. },
{ ZSTR0066, $1: does not reference a node in collection $2 },
{ ZWST0002, \$1\: unknown or unsupported annotation },
@@ -935,6 +935,8 @@
{ ~ZDST0027_NO_KEY_TYPE_DECL, value index missing key type declaration },
{ ~ZDST0060_unknown_localname, unknown localname ($3) },
{ ~ZDST0060_unknown_namespace, unknown namespace ($3) },
+ { ~ZSTR0060_ForCollection_3, for collection \$3\ },
+ { ~ZSTR0060_ForSequence, for sequence },
{ ~ZWST0005_PARAM_TYPE, type of parameter $3 is $4 which is not a subtype of xs:anyAtomicType },
{ ~ZWST0005_RETURN_TYPE, return type ($3) is not subtype of xs:anyAtomicType },
{ ~ZWST0005_UPDATING, function is updating },
=== modified file 'src/diagnostics/pregenerated/dict_zed_keys.h'
--- src/diagnostics/pregenerated/dict_zed_keys.h 2013-01-23 17:24:44 +
+++ src/diagnostics/pregenerated/dict_zed_keys.h 2013-02-03 19:03:19 +
@@ -90,6 +90,8 @@
#define ZED_ZDST0027_NON_ORDERED_KEY_TYPE ~ZDST0027_NON_ORDERED_KEY_TYPE
#define ZED_ZDST0060_unknown_namespace ~ZDST0060_unknown_namespace
#define ZED_ZDST0060_unknown_localname ~ZDST0060_unknown_localname
+#define ZED_ZSTR0060_ForCollection_3 ~ZSTR0060_ForCollection_3
+#define ZED_ZSTR0060_ForSequence ~ZSTR0060_ForSequence
#define ZED_JNUP0007_Object ~JNUP0007_Object
#define ZED_JNUP0007_Array ~JNUP0007_Array
#define ZED_JNUP0007_ObjectArray ~JNUP0007_ObjectArray
=== modified file 'src/store/naive/json_items.cpp'
--- src/store/naive/json_items.cpp 2013-01-08 05:02:54 +
+++ src/store/naive/json_items.cpp 2013-02-03 19:03:19 +
@@ -1014,10 +1014,12 @@
{
return to_xs_unsignedLong(i);
}
- catch (std::range_error e)
+ catch (std::range_error const)
{
-throw ZORBA_EXCEPTION(zerr::ZSTR0060_RANGE_EXCEPTION,
-ERROR_PARAMS(BUILD_STRING(access out of bounds e.what() ;
+throw ZORBA_EXCEPTION(
+ zerr::ZSTR0060_RANGE_EXCEPTION,
+ ERROR_PARAMS( i )
+);
}
}
=== modified file 'src/store/naive/pul_primitives.cpp'
--- src/store/naive/pul_primitives.cpp 2013-01-22 11:07:53 +
+++ src/store/naive/pul_primitives.cpp 2013-02-03 19:03:19 +
@@ -1024,11 +1024,15 @@
{
size = to_xs_unsignedLong(collection-size());
}
- catch (std::range_error e)
+ catch (std::range_error const)
{
RAISE_ERROR(zerr::ZSTR0060_RANGE_EXCEPTION, theLoc,
-ERROR_PARAMS(BUILD_STRING(collection too big (
- e.what() ; theName ;
+ ERROR_PARAMS(
+collection-size(),
+ZED( ZSTR0060_ForCollection_3 ),
+theName
+ )
+);
}
for (uint64_t i = 0; i size; ++i)
@@ -1101,11 +1105,15 @@
{
lastPos = to_xs_unsignedLong(lColl-size()) - 1;
}
- catch (std::range_error e)
+ catch (std::range_error const)
{
RAISE_ERROR(zerr::ZSTR0060_RANGE_EXCEPTION, theLoc,
-ERROR_PARAMS(BUILD_STRING(collection too big (
- e.what() ; theName ;
+ ERROR_PARAMS(
+lColl-size(),
+ZED( ZSTR0060_ForCollection_3 ),
+theName
+ )
+);
}
for (long i =
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1108515 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1108515 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1108515-2013-02-03T19-06-33.908Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
Validation queue job bug-1108515-2013-02-03T19-06-33.908Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1108515 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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:~zorba-coders/zorba/zorba-error_printer_in_api into lp:zorba
The error code was printed in XML as: codeerr:XPST0003/code I think it's better to print it as: codehttp://www.w3.org/2005/xqt-errors#XPST0003/code (as suggested in http://www.w3.org/TR/xquery-30/#id-identifying-errors). But is it better still to print it as: code ns=http://www.w3.org/2005/xqt-errors; prefix=err localname=XPST0003/ ? It would make sense to me but the problem is that the change is not backwards compatible. I know that 28msec relies on it. on the current way the error is reported. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 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:~zorba-coders/zorba/zorba-error_printer_in_api into lp:zorba
It would make sense to me but the problem is that the change is not backwards compatible. I know that 28msec relies on it. on the current way the error is reported. There were other mistakes that whoever coded the original XML made. For example, not including a xmlns=... attribute on the exception element; omitting the raised-at ... information; using localized strings for the code value (this is one case where the string should NOT be localized). Will those changes break 28msec as well? Can't we just update the 28msec code? -- https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 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-1108515 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1108515 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1108515-2013-02-04T05-11-25.912Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
Validation queue job bug-1108515-2013-02-04T05-11-25.912Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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-1108515 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1108515 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1108515/+merge/146316 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
