[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba has been updated. Commit Message changed to: Change for bug903797: Change to make zorba give the current query's StaticContext when xqxq:prepare-main-module is called. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-xqxq-url-resolver-2012-10-18T06-48-00.823Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
Validation queue job zorba-xqxq-url-resolver-2012-10-18T06-48-00.823Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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-xqxq-url-resolver 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/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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-xqxq-url-resolver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-xqxq-url-resolver-2012-10-18T09-14-46.434Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
Validation queue job zorba-xqxq-url-resolver-2012-10-18T09-14-46.434Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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-xqxq-url-resolver into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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-xqxq-url-resolver into lp:zorba
Review: Needs Information I would really like to avoid this special case and the string comparison on the function call. What about using a function annotation? -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba has been updated. Status: Needs review = Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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-xqxq-url-resolver into lp:zorba
Review: Disapprove No longer needed with HOF-based XQXQ implementation. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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-xqxq-url-resolver into lp:zorba
Review: Approve It's an ugly hack, for sure, but I don't see a better alternative without backwards-incompatible API changes. I'll file a new bug for a better solution in 3.0. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #903797 in Zorba: XQXQ feature request: custom schema uri resolver
https://bugs.launchpad.net/zorba/+bug/903797
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/core/fncall_iterator.cpp'
--- src/runtime/core/fncall_iterator.cpp 2012-09-10 16:34:17 +
+++ src/runtime/core/fncall_iterator.cpp 2012-09-10 17:26:24 +
@@ -769,14 +769,27 @@
lNonePureFct = dynamic_castconst ContextualExternalFunction*(theFunction);
ZORBA_ASSERT(lNonePureFct);
+ // Fix for feature request bug#903797
+ // Remove conditioning when HOFs available and the implementation
+ // of url-resolver in xqxq is changed.
+ static_context* lContext;
+ if (theFunction-getLocalName() == prepare-main-module)
+ {
+lContext = theSctx;
+ }
+ else
+ {
+lContext = theModuleSctx;
+ }
+ // replace parameter lContext for theModuleSctx when bug#903797 condition
+ // is removed.
+
// The planState.theQuery maybe null, e.g. in the case of constant-folding
// of global variable expressions
-
- StaticContextImpl theSctxWrapper(theModuleSctx,
+ StaticContextImpl theSctxWrapper(lContext,
(planState.theQuery == NULL?
NULL :
planState.theQuery-getRegisteredDiagnosticHandlerNoSync()));
-
DynamicContextImpl theDctxWrapper(NULL,
planState.theGlobalDynCtx,
theModuleSctx);
--
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
