[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ns-nodes into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/ns-nodes into lp:zorba. Commit message: Fixed bug #1188285 Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 Fixed bug #1188285 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/runtime/core/constructors.cpp' --- src/runtime/core/constructors.cpp 2013-06-20 09:52:25 + +++ src/runtime/core/constructors.cpp 2013-06-22 11:01:26 + @@ -316,6 +316,7 @@ zstring baseuri; zstring pre; zstring ns; + const store::NsBindings localBindings = theLocalBindings-getLocalBindings(); ElementIteratorState* state; DEFAULT_STACK_INIT(ElementIteratorState, state, planState); @@ -385,7 +386,7 @@ typeName, true, false, -theLocalBindings-getLocalBindings(), +localBindings, state-baseUri, false); } @@ -443,6 +444,23 @@ break; } +if (childKind == store::StoreConsts::namespaceNode) +{ + csize numLocalBindings = localBindings.size(); + + for (csize i = 0; i numLocalBindings; ++i) + { +const zstring pre = localBindings[i].first; +const zstring ns = localBindings[i].second; + +if (pre == child-getNamespacePrefix() ns != child-getNamespaceUri()) +{ + RAISE_ERROR(err::XQDY0102, loc, + ERROR_PARAMS(child-getNamespaceUri(), pre, ns)); +} + } +} + if (child-getParent() != result.getp()) child-copy(result, copymode); } === modified file 'src/store/naive/node_items.cpp' --- src/store/naive/node_items.cpp 2013-06-11 23:38:49 + +++ src/store/naive/node_items.cpp 2013-06-22 11:01:26 + @@ -3412,6 +3412,11 @@ { if (!ns.empty()) { + if (prefix.empty() theName-getNamespace().empty()) + { +throw XQUERY_EXCEPTION(err::XQDY0102, ERROR_PARAMS(ns2, prefix, ns)); + } + addLocalBinding(prefix, ns); return; } === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2013-06-20 12:00:37 + +++ test/fots/CMakeLists.txt 2013-06-22 11:01:26 + @@ -230,7 +230,6 @@ EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-27 1110217) EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 1110217) EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 1188302) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-042 1188285) EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998) EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-007 1114221) EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-008 1114221) -- 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 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/ns-nodes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ns-nodes-2013-06-22T11-07-02.352Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 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/ns-nodes into lp:zorba
Validation queue job ns-nodes-2013-06-22T11-07-02.352Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/170942 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ns-nodes-2013-03-07T10-24-03.985Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/ns-nodes 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 ns-nodes-2013-03-07T10-24-03.985Z 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/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ns-nodes-2013-03-07T11-49-00.925Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/ns-nodes 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 ns-nodes-2013-03-07T11-49-00.925Z is finished. The final status was: 2 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ns-nodes-2013-03-07T12-41-05.451Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
Validation queue job ns-nodes-2013-03-07T12-41-05.451Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ns-nodes-2013-03-06T11-34-03.269Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/ns-nodes 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 ns-nodes-2013-03-06T11-34-03.269Z 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/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ns-nodes-2013-03-06T12-51-02.197Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/ns-nodes 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 ns-nodes-2013-03-06T12-51-02.197Z is finished. The final status was: 2 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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/ns-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ns-nodes into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 -- https://code.launchpad.net/~zorba-coders/zorba/ns-nodes/+merge/151929 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