Merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba

[Juan Zacarias]

Change for bug903797:
Change to make zorba give the current query's StaticContext when xqxq:prepare-main-module is called.

[Chris Hillery (ceejatec)]

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.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue job zorba-xqxq-url-resolver-2012-10-18T06-48-00.823Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue job zorba-xqxq-url-resolver-2012-10-18T09-14-46.434Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Pending.

[Matthias Brantner (matthias-brantner)]

I would really like to avoid this special case and the string comparison on the function call. What about using a function annotation?

review: Needs Information

[Chris Hillery (ceejatec)]

No longer needed with HOF-based XQXQ implementation.

review: Disapprove

Unmerged revisions

11003. By Chris Hillery on 2012-10-18

Merge from trunk.

11002. By Juan Zacarias on 2012-09-04

Change to make the StaticContext available for xqxq:prepare-main-module for bug 903797

=== modified file 'src/runtime/core/fncall_iterator.cpp'
--- src/runtime/core/fncall_iterator.cpp	2012-09-19 21:16:15 +0000
+++ src/runtime/core/fncall_iterator.cpp	2012-10-18 01:12:20 +0000
@@ -770,14 +770,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);