[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
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/trycatch-extension into lp:zorba
William Candillon has proposed merging
lp:~zorba-coders/zorba/trycatch-extension into lp:zorba.
Commit message:
Add try/catch extension to introspect the end line and end column number of the
error.
Requested reviews:
William Candillon (wcandillon)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171
Add try/catch extension to introspect the end line and end column number of the
error.
This extension is especially useful for Zorba support in IDEs.
--
https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp 2013-03-05 16:40:27 +
+++ src/compiler/codegen/plan_visitor.cpp 2013-03-07 13:24:42 +
@@ -2093,6 +2093,12 @@
case catch_clause::zerr_data_column_no:
rcc.theVars[TryCatchIterator::CatchClause::zerr_data_column_no] = *vec;
break;
+ case catch_clause::zerr_line_no_end:
+rcc.theVars[TryCatchIterator::CatchClause::zerr_line_no_end] = *vec;
+break;
+ case catch_clause::zerr_column_no_end:
+rcc.theVars[TryCatchIterator::CatchClause::zerr_column_no_end] = *vec;
+break;
case catch_clause::zerr_stack_trace:
rcc.theVars[TryCatchIterator::CatchClause::zerr_stack_trace] = *vec;
break;
=== modified file 'src/compiler/expression/expr.h'
--- src/compiler/expression/expr.h 2013-03-05 12:34:19 +
+++ src/compiler/expression/expr.h 2013-03-07 13:24:42 +
@@ -989,6 +989,8 @@
zerr_data_uri,
zerr_data_line_no,
zerr_data_column_no,
+zerr_line_no_end,
+zerr_column_no_end,
zerr_stack_trace
};
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-03-07 10:10:10 +
+++ src/compiler/translator/translator.cpp 2013-03-07 13:24:42 +
@@ -7862,7 +7862,7 @@
push_scope();
store::Item_t lCode, lDesc, lValue, lModule, lLineNo, lColumnNo,
-lDataURI, lDataLineNo, lDataColumnNo, lStackTrace;
+lDataURI, lDataLineNo, lDataColumnNo, lLineNoEnd, lColumnNoEnd, lStackTrace;
GENV_ITEMFACTORY-createQName(lCode, XQUERY_ERR_NS, , code);
GENV_ITEMFACTORY-createQName(lDesc, XQUERY_ERR_NS, , description);
@@ -7873,6 +7873,8 @@
GENV_ITEMFACTORY-createQName(lDataURI, ZORBA_ERR_NS, , data-uri);
GENV_ITEMFACTORY-createQName(lDataLineNo, ZORBA_ERR_NS, , data-line-number);
GENV_ITEMFACTORY-createQName(lDataColumnNo, ZORBA_ERR_NS, , data-column-number);
+ GENV_ITEMFACTORY-createQName(lLineNoEnd, ZORBA_ERR_NS, , line-number-end);
+ GENV_ITEMFACTORY-createQName(lColumnNoEnd, ZORBA_ERR_NS, , column-number-end);
GENV_ITEMFACTORY-createQName(lStackTrace, ZORBA_ERR_NS, , stack-trace);
cc-add_var(catch_clause::err_code,
@@ -7902,6 +7904,12 @@
cc-add_var(catch_clause::zerr_data_column_no,
bind_var(loc, lDataColumnNo, var_expr::catch_var, theRTM.INTEGER_TYPE_QUESTION));
+ cc-add_var(catch_clause::zerr_line_no_end,
+ bind_var(loc, lLineNoEnd, var_expr::catch_var, theRTM.INTEGER_TYPE_QUESTION));
+
+ cc-add_var(catch_clause::zerr_column_no_end,
+ bind_var(loc, lColumnNoEnd, var_expr::catch_var, theRTM.INTEGER_TYPE_QUESTION));
+
cc-add_var(catch_clause::zerr_stack_trace,
bind_var(loc, lStackTrace, var_expr::catch_var, theRTM.ITEM_TYPE_QUESTION));
=== modified file 'src/runtime/core/trycatch.cpp'
--- src/runtime/core/trycatch.cpp 2013-02-26 04:12:43 +
+++ src/runtime/core/trycatch.cpp 2013-03-07 13:24:42 +
@@ -585,6 +585,62 @@
}
break;
}
+ case CatchClause::zerr_line_no_end:
+ {
+LetVarConstIter lErrorLineVarIter = lIter-second.begin();
+LetVarConstIter lErrorLineVarIterEnd = lIter-second.end();
+
+
+for ( ; lErrorLineVarIter != lErrorLineVarIterEnd; lErrorLineVarIter++ )
+{
+ store::Iterator_t lErrorLineIter;
+
+ XQueryException const *ue;
+ if ( ( ue = dynamic_castXQueryException const*( e ) )
+ ue-has_source() ) {
+store::Item_t lErrorLineItem;
+GENV_ITEMFACTORY-createInteger(
+lErrorLineItem, xs_integer(ue-source_line_end()));
+lErrorLineIter = new ItemIterator(lErrorLineItem);
+ }
+ else
+ {
+lErrorLineIter = new ItemIterator();
+ }
+ lErrorLineIter-open();
+ state-theErrorIters.push_back(lErrorLineIter);
+ (*lErrorLineVarIter)-bind(lErrorLineIter, planState);
+}
+ }
+ break;
+ case CatchClause::zerr_column_no_end:
+ {
+LetVarConstIter lErrorColumnVarIter = lIter-second.begin();
+LetVarConstIter lErrorColumnVarIterEnd = lIter-second.end();
+
+for ( ; lErrorColumnVarIter != lErrorColumnVarIterEnd;
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/trycatch-extension into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/trycatch-extension into lp:zorba has been updated. Commit Message changed to: Add try/catch extension to introspect the end line and end column number of the error. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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/trycatch-extension into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/trycatch-extension into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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/trycatch-extension into lp:zorba
Validation queue job trycatch-extension-2013-03-07T13-25-49.78Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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/trycatch-extension 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/trycatch-extension/+merge/152171 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/trycatch-extension into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/trycatch-extension into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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/fix_bug_revision_11274 into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_revision_11274 into lp:zorba. Commit message: Fixed bug introduced in revision 11274. Requested reviews: Markos Zaharioudakis (markos-za) Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 Fixed bug introduced in revision 11274. -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'test/fots_driver/fots-driver.xq' --- test/fots_driver/fots-driver.xq 2013-03-06 10:36:56 + +++ test/fots_driver/fots-driver.xq 2013-03-07 13:52:21 + @@ -795,7 +795,9 @@ variable $trace := concat(processing test case : , $case/@name, in test set : , $testSetName); -variable $queryName := trace($trace, ); +trace($trace,); + +variable $queryName := $case/@name; variable $test as xs:string := util:get-value($case, $testSetBaseURI, test); -- 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/fix_bug_revision_11274 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 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/fix_bug_revision_11274 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 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/fix_bug_revision_11274 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_revision_11274 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 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/fix_bug_revision_11274 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_revision_11274-2013-03-07T16-02-44.095Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 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/fix_bug_revision_11274 into lp:zorba
Validation queue job fix_bug_revision_11274-2013-03-07T16-02-44.095Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 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/fix_bug_revision_11274 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_revision_11274 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_revision_11274/+merge/152177 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/trycatch-extension into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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/trycatch-extension into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/trycatch-extension into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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/trycatch-extension into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/trycatch-extension-2013-03-07T23-47-52.837Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 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/trycatch-extension into lp:zorba
Validation queue job trycatch-extension-2013-03-07T23-47-52.837Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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/trycatch-extension into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/trycatch-extension into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 -- https://code.launchpad.net/~zorba-coders/zorba/trycatch-extension/+merge/152171 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-08T00-11-49.889Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-08T00-11-49.889Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Added locale to dynamic context. (This is needed to implement format-date()
correctly.)
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319
Added locale to dynamic context. (This is needed to implement format-date()
correctly.)
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h 2013-02-07 17:24:36 +
+++ include/zorba/dynamic_context.h 2013-03-08 04:27:22 +
@@ -21,6 +21,7 @@
#include memory
#include zorba/config.h
+#include zorba/locale.h
#include zorba/api_shared_types.h
#include zorba/static_context_consts.h
#include zorba/xmldatamanager.h
@@ -247,6 +248,26 @@
virtual Item
getDefaultCollection() const = 0;
+ /** \brief Sets the locale.
+ *
+ * @param aLang The language to set.
+ * @param aCountry The country to set.
+ */
+ virtual void
+ setLocale( locale::iso639_1::type aLang,
+ locale::iso3166_1::type aCountry ) = 0;
+
+ /** \brief Gets the locale.
+ *
+ * @param aLang A pointer to a \c iso639_1::type to receive the language.
+ * If \c null, this is not set.
+ * @param aCountry A pointer to a \c iso3166_1::type to receive the country.
+ * If \c null, this is not set.
+ */
+ virtual void
+ getLocale( locale::iso639_1::type *aLang,
+ locale::iso3166_1::type *aCountry ) const = 0;
+
/** \brief Add a name-value pair to this context.
* The value can be accessed in the evaluate method
* of external functions (see ContextualExternalFunction).
=== modified file 'include/zorba/locale.h'
--- include/zorba/locale.h 2013-02-07 17:24:36 +
+++ include/zorba/locale.h 2013-03-08 04:27:22 +
@@ -218,6 +218,262 @@
};
}
+/**
+ * Defines constants for all ISO 3166-1 country codes.
+ */
+namespace iso3166_1 {
+ enum type {
+unknown,
+AD, /// Andorra
+AE, /// United Arab Emirates
+AF, /// Afghanistan
+AG, /// Antigua and Barbuda
+AI, /// Anguilla
+AL, /// Albania
+AM, /// Armenia
+AN, /// Netherlands Antilles
+AO, /// Angola
+AQ, /// Antarctica
+AR, /// Argentina
+AS, /// American Samoa
+AT, /// Austria
+AU, /// Australia
+AW, /// Aruba
+AX, /// Aland Islands
+AZ, /// Azerbaijan
+BA, /// Bosnia and Herzegovina
+BB, /// Barbados
+BD, /// Bangladesh
+BE, /// Belgium
+BF, /// Burkina Faso
+BG, /// Bulgaria
+BH, /// Bahrain
+BI, /// Burundi
+BJ, /// Benin
+BL, /// Saint Barthelemy
+BM, /// Bermuda
+BN, /// Brunei Darussalam
+BO, /// Bolivia
+BR, /// Brazil
+BS, /// Bahamas
+BT, /// Bhutan
+BV, /// Bouvet Island
+BW, /// Botswana
+BY, /// Belarus
+BZ, /// Belize
+CA, /// Canada
+CC, /// Cocos Islands
+CD, /// Congo
+CF, /// Central African Republic
+CG, /// Congo
+CH, /// Switzerland
+CI, /// Cote D'Ivoire
+CK, /// Cook Islands
+CL, /// Chile
+CM, /// Cameroon
+CN, /// China
+CO, /// Colombia
+CR, /// Costa Rica
+CU, /// Cuba
+CV, /// Cape Verde
+CX, /// Christmas Island
+CY, /// Cyprus
+CZ, /// Czech Republic
+DE, /// Germany
+DJ, /// Djibouti
+DK, /// Denmark
+DM, /// Dominica
+DO, /// Dominican Republic
+DZ, /// Algeria
+EC, /// Ecuador
+EE, /// Estonia
+EG, /// Egypt
+EH, /// Western Sahara
+ER, /// Eritrea
+ES, /// Spain
+ET, /// Ethiopia
+FI, /// Finland
+FJ, /// Fiji
+FK, /// Falkland Islands
+FM, /// Micronesia
+FO, /// Faroe Islands
+FR, /// France
+GA, /// Gabon
+GB, /// United Kingdom
+GD, /// Grenada
+GE, /// Georgia
+GF, /// French Guiana
+GG, /// Guernsey
+GH, /// Ghana
+GI, /// Gibraltar
+GL, /// Greenland
+GM, /// Gambia
+GN, /// Guinea
+GP, /// Guadeloupe
+GQ, /// Equatorial Guinea
+GR, /// Greece
+GS, /// South Georgia and the South Sandwich Islands
+GT, /// Guatemala
+GU, /// Guam
+GW, /// Guinea-Bissau
+GY, /// Guyana
+HK, /// Hong Kong
+HM, /// Heard Island and Mcdonald Islands
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-08T05-00-48.853Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-08T05-00-48.853Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 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
