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 +0000
+++ src/runtime/core/fncall_iterator.cpp 2012-09-10 17:26:24 +0000
@@ -769,14 +769,27 @@
lNonePureFct = dynamic_cast<const 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
