Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Juan Zacarias 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Chris Hillery 
Review: Needs Fixing

1. still refers to old xqxq namespace

2. this makes me wonder how the test case is working...
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Zorba Build Bot 
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Chris Hillery 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Zorba Build Bot 
Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
 :
Votes: {'Approve': 2, 'Needs commit message': 1}
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Zorba Build Bot 
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Zorba Build Bot 
Validation queue result for 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020

Stage CommitZorba failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/196/console to 
view the results.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Chris Hillery 
The proposal to merge lp:~zorba-coders/zorba/bug1133806_xqxq_base_uri into 
lp:zorba has been updated.

Commit Message changed to:

Set the base URI for queries run by ZQ to something valid (the URI of the ZQ 
module itself).

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/bug1133806_xqxq_base_uri into 
lp:zorba has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-20 Thread Zorba Build Bot 
Validation queue succeeded - proposal merged!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-09-19 Thread Chris Hillery 
Review: Needs Fixing

As discussed - we likely won't make a more drastic API change anytime soon, and 
so we may as well merge this workaround fix. This branch will need to be 
updated for the new ZQ module namespace. It would also be really nice if there 
was a test case for this behaviour.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
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/bug1133806_xqxq_base_uri into lp:zorba

2013-06-07 Thread Chris Hillery 
Chris Hillery has proposed merging 
lp:~zorba-coders/zorba/bug1133806_xqxq_base_uri into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)
Related bugs:
  Bug #1133806 in Zorba: XQXQ should set base URI of execution context
  https://bugs.launchpad.net/zorba/+bug/1133806

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020

Just want to see the diff here.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/bug1133806_xqxq_base_uri into lp:zorba.
=== modified file 'modules/xqxq/xqxq.xq.src/xqxq.cpp'
--- modules/xqxq/xqxq.xq.src/xqxq.cpp	2013-05-28 00:58:27 +
+++ modules/xqxq/xqxq.xq.src/xqxq.cpp	2013-06-07 11:18:32 +
@@ -469,8 +469,9 @@
   String lQueryString = getOneStringArgument(aArgs, 0); 
 
   XQuery_t lQuery;
-
+
   StaticContext_t ltempSctx = lZorba-createStaticContext();
+  ltempSctx-setBaseURI(aSctx-getBaseURI());
 
   std::auto_ptrXQXQURLResolver lResolver;
   std::auto_ptrXQXQURIMapper lMapper;
@@ -938,7 +939,7 @@
 
   zorba::DynamicContext* lCtx = lQuery-getDynamicContext();
   zorba::String lNS = lVarQName.getNamespace(), lLocal = lVarQName.getLocalName();
-
+  
   try
   {
 lIsBoundVariable = lCtx-isBoundExternalVariable(lNS, lLocal);

=== modified file 'src/runtime/core/fncall_iterator.cpp'
--- src/runtime/core/fncall_iterator.cpp	2013-04-24 01:35:58 +
+++ src/runtime/core/fncall_iterator.cpp	2013-06-07 11:18:32 +
@@ -804,7 +804,6 @@
 
   // The planState.theQuery maybe null, e.g. in the case of constant-folding
   // of global variable expressions
-
   StaticContextImpl theSctxWrapper(theModuleSctx,
(planState.theQuery == NULL?
 NULL :
@@ -814,9 +813,13 @@
 planState.theGlobalDynCtx,
 theModuleSctx);
 
+  if (lNonePureFct-getURI() == http://www.zorba-xquery.com/modules/xqxq;)
+theSctxWrapper.setBaseURI(theSctx-get_base_uri().c_str());
+
   state-theResult = lNonePureFct-evaluate(state-m_extArgs,
 theSctxWrapper,
 theDctxWrapper);
+  
   if(state-theResult.get() != NULL)
 state-theResultIter = state-theResult-getIterator();
 } // if (!theFunction-isContextual())

-- 
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/bug1133806_xqxq_base_uri into lp:zorba

2013-06-07 Thread Chris Hillery 
The proposal to merge lp:~zorba-coders/zorba/bug1133806_xqxq_base_uri into 
lp:zorba has been updated.

Description changed to:

Just want to see the diff here.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/bug1133806_xqxq_base_uri into 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/bug1133806_xqxq_base_uri into lp:zorba

2013-06-07 Thread Chris Hillery 
I actually don't find this change too terrible. I like it a lot better than the 
earlier version which actually changed which StaticContext object was passed 
based on the module URI, at least. If we can change the ExternalFunction API to 
directly pass the invoking StaticContext, however (as being discussed in 
email), that would be the better choice.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/bug1133806_xqxq_base_uri into 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