Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1147563-2013-04-25T09-55-48.874Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
there are 8 more schema nillable items failures: please see https://bugs.launchpad.net/zorba/+bug/1147563/comments/3 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve, 4 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/160868 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/160868 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/160868 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-25T12-01-13.891Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/160868 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/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-04-25T12-01-13.891Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/160868 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/160868 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/160868 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/bug1147563 into lp:zorba
Status of the last run: - Passing but marked as expected failure: - prod-CastExpr/CastAs674a - prod-CastExpr/CastAsNamespaceSensitiveType-10 - prod-CastExpr/K-SeqExprCast-71b - WrongError - prod-CastExpr/CastAs675a - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/CastAsNamespaceSensitiveType-1 - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/CastAsNamespaceSensitiveType-2 - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/CastAsNamespaceSensitiveType-8 - Expected error: XPTY0117. Found error: FORG0001 - prod-CastExpr/CastAsNamespaceSensitiveType-9 - Expected error: XPTY0117. Found error: FORG0001 - prod-CastExpr/CastAsNamespaceSensitiveType-11 - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/CastAsNamespaceSensitiveType-12 - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/K-SeqExprCast-4a - Expected error: XPST0080. Found error: ZXQP0002 - prod-CastExpr/K-SeqExprCast-422a - Expected error: FORG0001. Found error: XPTY0004 And test w3c_update_testsuite/XQueryX/ValTrans/revalidate-valtrans-ins-003 is reported as failed but the details show: Test output test w3c_update_testsuite/XQueryX/ValTrans/revalidate-valtrans-ins-003 updtestdriver: success Sorin, can you take a look at revalidate-valtrans-ins-003? -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 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/bug-1090089 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-1090089 into lp:zorba. Commit message: Copying precision in copy ctor and operator=. Requested reviews: Paul J. Lucas (paul-lucas) Related bugs: Bug #1090089 in Zorba: fn-distinct-values different results from test https://bugs.launchpad.net/zorba/+bug/1090089 For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 Copying precision in copy ctor and operator=. -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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/bug1064978 into lp:zorba
I talked to Markos and there are some more issues here. 1. The function should probably go into the static context instead of the dynamic context. 2. It really depends on what you want to cast to. In general, the target type for casting is a sequence type (e.g. node()*, or xs:string?). As already mentioned, this cannot be returned as an item other than a string. If you did that, it pushes a lot of effort to the consumer because he needs to parse the sequence-type. There are two alternatives: - xqxq:variable-type-name($name as xs:QName) as xs:QName? which returns the name of type (e.g. no node()*) - xqxq:variable-sequence-type($name as xs:QName) as xs:string? which returns the sequence type as a string. It really depends on exactly what the user needs. I would go with variable-type-name if that's sufficient for all FOTS use cases. -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug-1090089 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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/deprecate-true_false_null into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/deprecate-true_false_null into lp:zorba.
Commit message:
raise deprecated warning for true, false, null in xquery mode
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980
--
https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-04-23 13:12:58 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-04-25 18:31:30 +
@@ -944,6 +944,8 @@
extern ZORBA_DLL_PUBLIC ZorbaWarningCode ZWST0007_LOADER_PARSING_WARNING;
+extern ZORBA_DLL_PUBLIC ZorbaWarningCode ZWST0008_DEPRECATED;
+
} // namespace zwarn
} // namespace zorba
#endif /* ZORBA_DIAGNOSTIC_LIST_API_H */
=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/warnings.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/warnings.xq 2013-03-06 00:18:36 +
+++ modules/com/zorba-xquery/www/modules/pregenerated/warnings.xq 2013-04-25 18:31:30 +
@@ -76,4 +76,8 @@
(:~
:)
-declare variable $zwarn:ZWST0007 as xs:QName := fn:QName($zwarn:NS, zwarn:ZWST0007);
\ No newline at end of file
+declare variable $zwarn:ZWST0007 as xs:QName := fn:QName($zwarn:NS, zwarn:ZWST0007);
+
+(:~
+:)
+declare variable $zwarn:ZWST0008 as xs:QName := fn:QName($zwarn:NS, zwarn:ZWST0008);
\ No newline at end of file
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-04-24 03:54:58 +
+++ src/compiler/translator/translator.cpp 2013-04-25 18:31:30 +
@@ -9530,6 +9530,87 @@
ParseConstants::pathtype_t pe_type = pe.get_type();
+ // terrible hack to allow for a standalone true, false or null to be
+ // interpreted as a boolean. User must use ./true, ./false or ./null for
+ // navigating XML elements named that way.
+#ifdef ZORBA_WITH_JSON
+ if (pe_type == ParseConstants::path_relative)
+ {
+RelativePathExpr* lRootRelPathExpr =
+dynamic_castRelativePathExpr*(pe.get_relpath_expr().getp());
+
+ContextItemExpr* lStepExpr =
+dynamic_castContextItemExpr*(lRootRelPathExpr-get_step_expr());
+
+AxisStep* lRelPathExpr =
+dynamic_castAxisStep*(lRootRelPathExpr-get_relpath_expr());
+
+// Only rewrites if expression consists of a context item step on the left
+// and of an axis step on the right,
+// AND if this context item was set implicitly by the parser, meaning,
+// the original expression was only an axis step.
+if (lRelPathExpr lStepExpr lRootRelPathExpr-is_implicit())
+{
+ ForwardStep* lFwdStep =
+ dynamic_castForwardStep*(lRelPathExpr-get_forward_step());
+
+ if (lFwdStep lFwdStep-get_axis_kind() == ParseConstants::axis_child)
+ {
+AbbrevForwardStep* lAbbrFwdStep =
+dynamic_castAbbrevForwardStep*(lFwdStep-get_abbrev_step());
+
+if (lAbbrFwdStep)
+{
+ const NameTest* lNodetest =
+ dynamic_castconst NameTest*(lAbbrFwdStep-get_node_test());
+
+ if (lNodetest)
+ {
+const rchandleQName lQName = lNodetest-getQName();
+
+if (lQName lQName-get_prefix() == )
+{
+ const zstring lLocal = lQName-get_localname();
+
+ bool lRet = false;
+
+ if (lLocal == true)
+ {
+push_nodestack(theExprManager-create_const_expr(theRootSctx, theUDF, loc, true));
+lRet = true;
+ }
+ else if (lLocal == false)
+ {
+push_nodestack(theExprManager-create_const_expr(theRootSctx, theUDF, loc, false));
+lRet = true;
+ }
+ else if (lLocal == null)
+ {
+store::Item_t lNull;
+GENV_ITEMFACTORY-createJSONNull(lNull);
+push_nodestack(theExprManager-create_const_expr(theRootSctx, theUDF, loc, lNull));
+lRet = true;
+ }
+
+ if (lRet)
+ {
+std::ostringstream lInstead;
+lInstead ((lLocal == null)?jn::fn:);
+lInstead lLocal ();
+theCCB-theXQueryDiagnostics-add_warning(
+ NEW_XQUERY_WARNING(zwarn::ZWST0008_DEPRECATED,
+ WARN_PARAMS(lLocal, lInstead.str()),
+ WARN_LOC(loc)));
+return (void*)1;
+ }
+}
+ }
+}
+ }
+}
+ }
+#endif
+
relpath_expr* pathExpr = NULL;
// Put a NULL in the stack to mark the beginning of a PathExp tree.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-04-23 13:12:58 +
+++
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/deprecate-true_false_null into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/deprecate-true_false_null into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 -- https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 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/deprecate-true_false_null into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/deprecate-true_false_null-2013-04-25T18-32-44.528Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 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/deprecate-true_false_null into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/deprecate-true_false_null into lp:zorba has been updated. Description changed to: note that most of the changes reverts back to the old behavior that was removed recently For more details, see: https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 -- https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 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/deprecate-true_false_null into lp:zorba
Validation queue job deprecate-true_false_null-2013-04-25T18-32-44.528Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 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/deprecate-true_false_null into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 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/deprecate-true_false_null into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/deprecate-true_false_null into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 -- https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 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/deprecate-true_false_null into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/deprecate-true_false_null/+merge/160980 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/bug1167400-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba has been updated. Commit Message changed to: Fixes for bug1167400 validate type failures (at least 9) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1167400-valType 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba has been updated. Description changed to: Fixes for Fixes for bug1167400 validate type failures (at least 9) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1167400-valType 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1167400-valType-2013-04-25T19-27-54.705Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1167400-valType 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/bug1167400-valType into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1167400-valType 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 bug1167400-valType-2013-04-25T19-27-54.705Z is finished. The final status was: 9 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/bug1167400-valType/+merge/160990 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1167400-valType 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1167400-valType 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
if context item is set via the api, implictly set the context size and position
as well (to 1)
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013
if context item is set via the api, implictly set the context size and position
as well (to 1)
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp 2013-03-13 16:17:38 +
+++ src/api/dynamiccontextimpl.cpp 2013-04-25 20:48:27 +
@@ -395,7 +395,28 @@
bool DynamicContextImpl::setContextItem(const Item inValue)
{
String varName = Unmarshaller::newString(static_context::DOT_VAR_NAME);
- return setVariable(varName, inValue);
+ bool res = setVariable(varName, inValue);
+
+ store::Item_t one;
+
+ if (!theCtx-is_set_variable(dynamic_context::IDVAR_CONTEXT_ITEM_POSITION))
+ {
+GENV_ITEMFACTORY-createInteger(one, xs_integer(1));
+
+varName = Unmarshaller::newString(static_context::DOT_POS_VAR_NAME);
+setVariable(varName, Item(one));
+ }
+
+ if (!theCtx-is_set_variable(dynamic_context::IDVAR_CONTEXT_ITEM_SIZE))
+ {
+if (!one)
+ GENV_ITEMFACTORY-createInteger(one, xs_integer(1));
+
+varName = Unmarshaller::newString(static_context::DOT_SIZE_VAR_NAME);
+setVariable(varName, Item(one));
+ }
+
+ return res;
}
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-25 01:27:33 +
+++ test/fots/CMakeLists.txt 2013-04-25 20:48:27 +
@@ -184,7 +184,6 @@
EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-014 0)
EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-015 0)
EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-017 0)
-EXPECTED_FOTS_FAILURE (fn-last last-24 0)
EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-33 0)
EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-35 0)
@@ -212,7 +211,6 @@
EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-016 0)
EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-017 0)
EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-020 0)
-EXPECTED_FOTS_FAILURE (fn-position position-23 0)
EXPECTED_FOTS_FAILURE (fn-replace fn-replace-42 0)
EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-26 0)
EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-28 0)
--
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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-25T20-51-52.578Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013 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/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-04-25T20-51-52.578Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161013 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/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
fots driver fix: wrap external variable values in ()
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029
fots driver fix: wrap external variable values in ()
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-25 21:13:54 +
+++ test/fots/CMakeLists.txt 2013-04-25 21:45:33 +
@@ -134,6 +134,7 @@
EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy20 21619)
EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy21 21619)
EXPECTED_FOTS_FAILURE (DISPUTED misc-CombinedErrorCodes XQST0085 21730)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832)
# Next three possibly unique to old RQ machine, but they need to be
# marked for the RQ to pass.
@@ -412,7 +413,6 @@
EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWithout-18 0)
EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWith-22 0)
EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-003a 0)
-EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-006b 0)
EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016a 0)
EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)
EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)
=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq 2013-04-17 19:11:53 +
+++ test/fots_driver/environment.xq 2013-04-25 21:45:33 +
@@ -490,7 +490,7 @@
ends-with($select, ') and
exists($file))
then concat('', resolve-uri($file, $envBaseURI), '')
- else $select
+ else concat((, $select, ))
let $varName := $param/@name
where (exists($select) and exists($param[@declared eq true]))
return
--
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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-25T21-47-57.438Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 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/bug1064978 into lp:zorba
I talked to Markos and there are some more issues here. 1. The function should probably go into the static context instead of the dynamic context. But the Static context doesn't have functions to access the external variables, so if this function is to be implemented in the static context it would actually be using several functions of the dynamic context to work. Since the external variable are part of the Dynamic context isn't it better to just leave them there? 2. It really depends on what you want to cast to. In general, the target type for casting is a sequence type (e.g. node()*, or xs:string?). As already mentioned, this cannot be returned as an item other than a string. If you did that, it pushes a lot of effort to the consumer because he needs to parse the sequence-type. There are two alternatives: - xqxq:variable-type-name($name as xs:QName) as xs:QName? which returns the name of type (e.g. no node()*) - xqxq:variable-sequence-type($name as xs:QName) as xs:string? which returns the sequence type as a string. It really depends on exactly what the user needs. I would go with variable- type-name if that's sufficient for all FOTS use cases. I will go ahead and make the change for it to return of a QName -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug1064978 into lp:zorba
I talked to Markos and there are some more issues here. 1. The function should probably go into the static context instead of the dynamic context. But the Static context doesn't have functions to access the external variables, so if this function is to be implemented in the static context it would actually be using several functions of the dynamic context to work. Since the external variable are part of the Dynamic context isn't it better to just leave them there? As I said, it doesn't belong there. If you want to have it in the dynamic context you should only invoke it after execution. I think you should use VarInfo* lookup_var(const store::Item* qname) const; VarInfo contains the type of the variable. 2. It really depends on what you want to cast to. In general, the target type for casting is a sequence type (e.g. node()*, or xs:string?). As already mentioned, this cannot be returned as an item other than a string. If you did that, it pushes a lot of effort to the consumer because he needs to parse the sequence-type. There are two alternatives: - xqxq:variable-type-name($name as xs:QName) as xs:QName? which returns the name of type (e.g. no node()*) - xqxq:variable-sequence-type($name as xs:QName) as xs:string? which returns the sequence type as a string. It really depends on exactly what the user needs. I would go with variable- type-name if that's sufficient for all FOTS use cases. I will go ahead and make the change for it to return of a QName Double check with Sorin whether he really doesn't need the occurrence indicator for casting. -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 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/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch 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 markos-scratch-2013-04-25T21-47-57.438Z is finished. The final status was: 1 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/markos-scratch/+merge/161029 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/bug1147563 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1064978 into lp:zorba
I talked to Markos and there are some more issues here. 1. The function should probably go into the static context instead of the dynamic context. But the Static context doesn't have functions to access the external variables, so if this function is to be implemented in the static context it would actually be using several functions of the dynamic context to work. Since the external variable are part of the Dynamic context isn't it better to just leave them there? As I said, it doesn't belong there. If you want to have it in the dynamic context you should only invoke it after execution. I think you should use VarInfo* lookup_var(const store::Item* qname) const; VarInfo contains the type of the variable. Oh that makes sense I will make it static context then. 2. It really depends on what you want to cast to. In general, the target type for casting is a sequence type (e.g. node()*, or xs:string?). As already mentioned, this cannot be returned as an item other than a string. If you did that, it pushes a lot of effort to the consumer because he needs to parse the sequence-type. There are two alternatives: - xqxq:variable-type-name($name as xs:QName) as xs:QName? which returns the name of type (e.g. no node()*) - xqxq:variable-sequence-type($name as xs:QName) as xs:string? which returns the sequence type as a string. It really depends on exactly what the user needs. I would go with variable- type-name if that's sufficient for all FOTS use cases. I will go ahead and make the change for it to return of a QName Double check with Sorin whether he really doesn't need the occurrence indicator for casting. The current implementation does return the occurrence indicator -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-25T22-56-41.947Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 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/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-04-25T22-56-41.947Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029 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
