Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/remove-xqdoc-modules into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/remove-xqdoc-modules/+merge/187670 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/remove-xqdoc-modules into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/remove-xqdoc-modules/+merge/187670 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/remove-xqdoc-modules/+merge/187670 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/new-website-merge-proposal into lp:~zorba-coders/zorba/new-website
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-website-merge-proposal/+merge/183089 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/new-website. -- 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/zorba-documentation-merge-proposal into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-documentation-merge-proposal/+merge/186036 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/remove-xqdoc-modules into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/remove-xqdoc-modules/+merge/187670 Stage TestZorbaUbuntu failed. 1 tests failed (8547 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/332/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/remove-xqdoc-modules/+merge/187670 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/bug-archiver into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/bug-archiver
into lp:zorba.
Commit message:
1. Fixed plan serializer bug: no more only_for_eval fields
2. invoke() can also be used to invoke function items.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-archiver/+merge/187699
1. Fixed plan serializer bug: no more only_for_eval fields
2. invoke() can also be used to invoke function items.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-archiver/+merge/187699
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/zorba-query/zorba-query.xq'
--- modules/zorba-query/zorba-query.xq 2013-08-14 06:22:00 +
+++ modules/zorba-query/zorba-query.xq 2013-09-26 09:43:49 +
@@ -456,12 +456,3 @@
declare function zq:load-from-query-plan($plan as xs:base64Binary,
$resolver as item()?, $mapper as item()?) as xs:anyURI external;
-(:~
- : pInternal helper function. Only necessary because of incomplete HOF
- : support in Zorba./p
- :)
-declare %private function zq:hof-invoker($hof as item(),
- $ns as xs:string, $entity as xs:string) as item()*
-{
- $hof($ns, $entity)
-};
=== modified file 'modules/zorba-query/zorba-query.xq.src/zorba-query.cpp'
--- modules/zorba-query/zorba-query.xq.src/zorba-query.cpp 2013-09-19 20:47:26 +
+++ modules/zorba-query/zorba-query.xq.src/zorba-query.cpp 2013-09-26 09:43:49 +
@@ -22,8 +22,8 @@
/***
/
-zorba::ExternalFunction*
-ZorbaQueryModule::getExternalFunction(const zorba::String localName)
+zorba::ExternalFunction* ZorbaQueryModule::getExternalFunction(
+const zorba::String localName)
{
FuncMap_t::iterator lIte = theFunctions.find(localName);
@@ -102,7 +102,7 @@
/***
-
+ Invoked from static_context::~static_context()
/
void ZorbaQueryModule::destroy()
{
@@ -231,7 +231,9 @@
/***
/
-void ZorbaQueryFunction::throwError(const char *err_localname, const std::string aErrorMessage)
+void ZorbaQueryFunction::throwError(
+const char *err_localname,
+const std::string aErrorMessage)
{
String errNS(ZORBA_QUERY_MODULE_NAMESPACE);
String errName(err_localname);
@@ -356,18 +358,12 @@
//construct the arguments for the url resolver
std::vectorItemSequence_t lArgs;
- ItemSequence_t lSeq0 = new SingletonItemSequence(theFunction);
ItemSequence_t lSeq1 = new SingletonItemSequence(ZorbaQueryModule::getItemFactory()-createString(aUri));
ItemSequence_t lSeq2 = new SingletonItemSequence(ZorbaQueryModule::getItemFactory()-createString(lDataKind));
- lArgs.push_back(lSeq0);
lArgs.push_back(lSeq1);
lArgs.push_back(lSeq2);
- //invoke the HOF helper function using the arguments generated
- Item lHofHelper = ZorbaQueryModule::getItemFactory()-
- createQName(http://zorba.io/modules/zorba-query;, zq, hof-invoker);
-
- ItemSequence_t lResult = theCtx-invoke(lHofHelper, lArgs);
+ ItemSequence_t lResult = theCtx-invoke(theFunction, lArgs);
//Check if the result is an empty sequence by creating an Iterator, this is
// cheaper than serializing the result and then checking if it was empty.
@@ -406,18 +402,12 @@
//construct the arguments for the url resolver
std::vectorItemSequence_t lArgs;
- ItemSequence_t lSeq0 = new SingletonItemSequence(theFunction);
ItemSequence_t lSeq1 = new SingletonItemSequence(ZorbaQueryModule::getItemFactory()-createString(aUrl));
ItemSequence_t lSeq2 = new SingletonItemSequence(ZorbaQueryModule::getItemFactory()-createString(lDataKind));
- lArgs.push_back(lSeq0);
lArgs.push_back(lSeq1);
lArgs.push_back(lSeq2);
- //invoke the HOF helper function using the arguments generated
- Item lHofHelper = ZorbaQueryModule::getItemFactory()-
- createQName(http://zorba.io/modules/zorba-query;, zq, hof-invoker);
-
- ItemSequence_t lResult = theCtx-invoke(lHofHelper, lArgs);
+ ItemSequence_t lResult = theCtx-invoke(theFunction, lArgs);
// Check if the result is an empty sequence by creating an Iterator, this is
// cheaper than serializing the result and then checking if it was empty.
@@ -460,8 +450,10 @@
DynamicContext* lDynCtx = const_castDynamicContext*(aDctx);
StaticContext_t lSctxChild = aSctx-createChildContext();
- QueryMap* lQueryMap;
- if (!(lQueryMap = dynamic_castQueryMap*(lDynCtx-getExternalFunctionParameter(zqQueryMap
+ QueryMap* lQueryMap =
+ dynamic_castQueryMap*(lDynCtx-getExternalFunctionParameter(zqQueryMap));
+
+ if (!lQueryMap)
{
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-archiver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-archiver/+merge/187699 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/bug-archiver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-archiver into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-archiver/+merge/187699 -- https://code.launchpad.net/~zorba-coders/zorba/bug-archiver/+merge/187699 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Description changed to: 1. Adding Xereces mutex for multi-thread safety 2. parse-xml() function will not use cached document For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: 1. Adding Xereces mutex for multi-thread safety 2. parse-xml() function will not use cached document For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/187605 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/187605 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/187605 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/187605 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/187605 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/187605 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/zorba-documentation-merge-proposal into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-documentation-merge-proposal/+merge/186036 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/new-website-merge-proposal into lp:~zorba-coders/zorba/new-website
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-website-merge-proposal/+merge/183089 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/new-website. -- 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/xqdoc_fixes_archive into lp:zorba/archive-module
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/xqdoc_fixes_archive into lp:zorba/archive-module. Commit message: XQDoc fixes. Requested reviews: Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_archive/+merge/187902 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_archive/+merge/187902 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. === modified file 'src/archive_module.xq' --- src/archive_module.xq 2013-08-09 09:37:05 + +++ src/archive_module.xq 2013-09-26 20:27:03 + @@ -32,7 +32,7 @@ : @author Luis Rodgriguez, Juan Zacarias, and Matthias Brantner : : @library a href=http://code.google.com/p/libarchive/;libarchive/a - : @project Zorba/Archive + : @project Zorba/Archive/Archive :) module namespace a = http://zorba.io/modules/archive;; -- 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/xqdoc_fixes_data_cleaning into lp:zorba/data-cleaning-module
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/xqdoc_fixes_data_cleaning into lp:zorba/data-cleaning-module. Commit message: XQDoc fixes. Requested reviews: Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_data_cleaning/+merge/187904 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_data_cleaning/+merge/187904 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. === modified file 'src/character-based-string-similarity.xq' --- src/character-based-string-similarity.xq 2013-08-09 09:37:05 + +++ src/character-based-string-similarity.xq 2013-09-26 20:27:53 + @@ -40,9 +40,9 @@ : of edits needed to transform one string into the other, with the allowable edit operations : being insertion, deletion, or substitution of a single character./p : p/ - : pExample usage : codeedit-distance(FLWOR, FLOWER)/code/p + : pExample usage : pre class=ace-static ace-mode=xqueryedit-distance(FLWOR, FLOWER)/pre/p : p/ - : pThe function invocation in the example above returns : code2/code/p + : pThe function invocation in the example above returns : pre class=ace-static ace-mode=xquery2/pre/p : : @param $s1 The first string. : @param $s2 The second string. @@ -67,9 +67,9 @@ : the Jaro-Winkler value is, the more similar the strings are. The coefficient is : normalized such that 0 equates to no similarity and 1 is an exact match./p : p/ - : pExample usage : codejaro(FLWOR Found., FLWOR Foundation)/code/p + : pExample usage : pre class=ace-static ace-mode=xqueryjaro(FLWOR Found., FLWOR Foundation)/pre/p : p/ - : pThe function invocation in the example above returns : code0.5853174603174603/code/p + : pThe function invocation in the example above returns : pre class=ace-static ace-mode=xquery0.5853174603174603/pre/p : : @param $s1 The first string. : @param $s2 The second string. @@ -98,9 +98,9 @@ : pThis similarity coefficient corresponds to an extension of the Jaro similarity coefficient that weights or : penalizes strings based on their similarity at the beginning of the string, up to a given prefix size./p : p/ - : pExample usage : codejaro-winkler(DWAYNE, DUANE, 4, 0.1 )/code/p + : pExample usage : pre class=ace-static ace-mode=xqueryjaro-winkler(DWAYNE, DUANE, 4, 0.1 )/pre/p : p/ - : pThe function invocation in the example above returns : code0.8578/code/p + : pThe function invocation in the example above returns : pre class=ace-static ace-mode=xquery0.8578/pre/p : : @param $s1 The first string. : @param $s2 The second string. @@ -123,9 +123,9 @@ : variable cost adjustment to the cost of a gap (i.e., an insertion or deletion) in the : distance metric./p : p/ - : pExample usage : codeneedleman-wunsch(KAK, KQRK, 1, 1)/code/p + : pExample usage : pre class=ace-static ace-mode=xqueryneedleman-wunsch(KAK, KQRK, 1, 1)/pre/p : p/ - : pThe function invocation in the example above returns : code0/code/p + : pThe function invocation in the example above returns : pre class=ace-static ace-mode=xquery0/pre/p : : @param $s1 The first string. : @param $s2 The second string. @@ -148,9 +148,9 @@ (:~ : pReturns the Smith-Waterman distance between two strings./p : p/ - : pExample usage : codesmith-waterman(ACACACTA, AGCACACA, 2, 1)/code/p + : pExample usage : pre class=ace-static ace-mode=xquerysmith-waterman(ACACACTA, AGCACACA, 2, 1)/pre/p : p/ - : pThe function invocation in the example above returns : code12/code/p + : pThe function invocation in the example above returns : pre class=ace-static ace-mode=xquery12/pre/p : : @param $s1 The first string. : @param $s2 The second string. === modified file 'src/consolidation.xq' --- src/consolidation.xq 2013-08-09 09:37:05 + +++ src/consolidation.xq 2013-09-26 20:27:53 + @@ -41,9 +41,9 @@ : pIf more then one answer is possible, returns the first node according to the order of the input sequence./p : p/ : - : pExample usage : codemost-frequent( ( a, a, b) )/code/p + : pExample usage : pre class=ace-static ace-mode=xquerymost-frequent( ( a, a, b) )/pre/p : p/ - : pThe function invocation in the example above returns : code(a)/code/p + : pThe function invocation in the example above returns : pre class=ace-static ace-mode=xquery(a)/pre/p : : @param $s A sequence of nodes. : @return The most frequent node in the input sequence. @@ -58,9 +58,9 @@ : pIf more then one answer is possible, return the first node according to the order of the input sequence./p : p/ : - : pExample usage : codeleast-frequent( ( a, a, b) )/code/p + : pExample usage : pre class=ace-static ace-mode=xqueryleast-frequent( ( a, a, b) )/pre/p : p/ - : pThe function invocation in the example above returns : code(b)/code/p + : pThe function invocation in the example above returns : pre class=ace-static ace-mode=xquery(b)/pre/p : : @param $s A sequence of nodes. :
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqdoc_fixes_geoproj into lp:zorba/geoproj-module
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/xqdoc_fixes_geoproj into lp:zorba/geoproj-module. Commit message: XQDoc fixes. Requested reviews: Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_geoproj/+merge/187905 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_geoproj/+merge/187905 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-module. === modified file 'src/geoproj.xq' --- src/geoproj.xq 2013-08-09 09:37:05 + +++ src/geoproj.xq 2013-09-26 20:28:45 + @@ -48,7 +48,7 @@ : pThe projection formulas are taken from lib_proj library and implemented in XQuery./p : : @author Daniel Turcanu - : @project Zorba/Geo Projection + : @project Zorba/Geo Projection/Geo Projection :) module namespace geoproj = http://zorba.io/modules/geoproj;; -- 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/xqdoc_fixes_system into lp:zorba/system-module
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/xqdoc_fixes_system into lp:zorba/system-module. Commit message: XQDoc fixes. Requested reviews: Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_system/+merge/187907 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_system/+merge/187907 Your team Zorba Coders is subscribed to branch lp:zorba/system-module. === modified file 'src/system.xq' --- src/system.xq 2013-08-09 09:37:05 + +++ src/system.xq 2013-09-26 20:30:24 + @@ -22,7 +22,7 @@ : To avoid conflicts between environment variables and properties defined by Zorba, : all environment variables are prefixed with ienv./i.p/ : For instance, the following query: p/ - : pre class=ace-static + : pre class=ace-static ace-mode=xquery : import module namespace system = http://www.zorba-xquery.com/modules/system;; : : for $prop in system:properties() @@ -31,7 +31,7 @@ : /pre : p/ : Will output: - : pre class=ace-static + : pre class=ace-static ace-mode=xquery : env.TERM_PROGRAM: Apple_Terminal : ... : /pre -- 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/xqdoc_fixes_archive into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_archive/+merge/187902 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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/xqdoc_fixes_util_jvm into lp:zorba/util-jvm-module
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/xqdoc_fixes_util_jvm into lp:zorba/util-jvm-module. Commit message: XQDoc fixes. Requested reviews: Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_util_jvm/+merge/187908 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_util_jvm/+merge/187908 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module. === modified file 'src/util-jvm.xq' --- src/util-jvm.xq 2013-08-09 09:37:05 + +++ src/util-jvm.xq 2013-09-26 20:31:05 + @@ -31,7 +31,7 @@ : : @author Cezar Andrei : @library a href=http://www.oracle.com/technetwork/java/javase/downloads/index.html;JDK - Java Development Kit/a - : @project Zorba/JVM Utility + : @project Zorba/JVM Utility/JVM Utility :) module namespace util-jvm = http://www.zorba-xquery.com/modules/util-jvm;; -- 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/xqdoc_fixes_geoproj into lp:zorba/geoproj-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_geoproj/+merge/187905 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-module. -- 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/xqdoc_fixes_data_cleaning into lp:zorba/data-cleaning-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_data_cleaning/+merge/187904 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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/xqdoc_fixes_system into lp:zorba/system-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_system/+merge/187907 Your team Zorba Coders is subscribed to branch lp:zorba/system-module. -- 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/xqdoc_fixes_read_pdf into lp:zorba/read-pdf-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_read_pdf/+merge/187906 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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/xqdoc_fixes_util_jvm into lp:zorba/util-jvm-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_util_jvm/+merge/187908 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module. -- 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:
added comments and getContentType() method to SequenceType class
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/187917
added comments and getContentType() method to SequenceType class
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/187917
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/typeident.h'
--- include/zorba/typeident.h 2013-09-16 09:08:27 +
+++ include/zorba/typeident.h 2013-09-26 20:59:19 +
@@ -35,10 +35,6 @@
* SequenceType may be returned by methods of Zorba's C++ API. The class also
* provides static methods to create instances of SequenceType, which can then
* be passed as arguments to other methods of Zorba's C++ API.
- *
- * Note: This class is reference counted. When writing multi-threaded clients,
- * it is the responibility of the client code to synchronize assignments to the
- * SmartPtr holding this object.
*/
class ZORBA_DLL_PUBLIC SequenceType
{
@@ -51,18 +47,18 @@
FUNCTION_TYPE,// function(*) and subtypes
STRUCTURED_ITEM_TYPE, // structured-item()
NODE_TYPE,// node()
-DOCUMENT_TYPE,
-ELEMENT_TYPE,
-SCHEMA_ELEMENT_TYPE,
-ATTRIBUTE_TYPE,
-SCHEMA_ATTRIBUTE_TYPE,
-PI_TYPE,
-TEXT_TYPE,
-COMMENT_TYPE,
-NAMESPACE_TYPE,
-JSON_ITEM_TYPE,
-JSON_OBJECT_TYPE,
-JSON_ARRAY_TYPE,
+DOCUMENT_TYPE,// document-node() and subtypes
+ELEMENT_TYPE, // element() and subtypes
+SCHEMA_ELEMENT_TYPE, // schema-element() and subtypes
+ATTRIBUTE_TYPE, // attribute() and subtypes
+SCHEMA_ATTRIBUTE_TYPE,// schema-attribute() and subtypes
+PI_TYPE, // processing-instruction() and subtypes
+TEXT_TYPE,// text()
+COMMENT_TYPE, // comment()
+NAMESPACE_TYPE, // namespace-node()
+JSON_ITEM_TYPE, // json-item()
+JSON_OBJECT_TYPE, // object()
+JSON_ARRAY_TYPE, // array()
INVALID_TYPE
} Kind;
@@ -176,28 +172,88 @@
*/
~SequenceType();
+ /**
+ *
+ */
bool isValid() const;
+ /**
+ *
+ */
Kind getKind() const;
+ /**
+ *
+ */
Quantifier getQuantifier() const;
+ /**
+ * If this is an atomic or union type, this method returns the URI of
+ * the type name. For other kinds of types, an empty string is returned.
+ */
String getTypeUri() const;
+ /**
+ * If this is an atomic or union type, this method returns the local part of
+ * the type name. For other kinds of types, an empty string is returned.
+ */
String getTypeLocalName() const;
+ /**
+ * If this is an element() or attribute() type that contains a NodeName,
+ * this method returns the URI of that NodeName. In all other cases, an
+ * empty string is returned.
+ */
String getNodeUri() const;
+ /**
+ * If this is an element() or attribute() type that contains a NodeName,
+ * this method returns the URI of that NodeName. If this is a
+ * processing-instruction() that contains a TargetName, that TargetName is
+ * returned. In all other cases, an empty string is returned.
+ */
String getNodeLocalName() const;
+ /**
+ * If this is an element() or attribute() type that does not contain a
+ * NodeName, this method returns true. In all other cases, false is returned.
+ */
bool isWildcard() const;
+ /**
+ * If this is an document-node() type that contains an embedded element()
+ * type, this method returns the embedded element() type. In all other cases,
+ * an invalid SequenceType is returned.
+ */
+ SequenceType getContentType() const;
+
+ /**
+ * If this is an element() or attribute() type that contains a TypeName, this
+ * method returns the URI of that TypeName. If this is a schema-element(N) or
+ * schema-attribute(N) type, the method returns the URI of the XMLSchema type
+ * associated with the global element or attribute declaration N. In all other
+ * cases, it returns an empty string.
+ */
String getContentTypeUri() const;
+ /**
+ * If this is an element() or attribute() type that contains a TypeName, this
+ * method returns the local name of that TypeName. If this is a schema-element(N)
+ * or schema-attribute(N) type, the method returns the local name of the
+ * XMLSchema type associated with the global element or attribute declaration N.
+ * In all other cases, it returns an empty string.
+ */
String getContentTypeLocalName() const;
+ /**
+ * Return true if this type is a schema-element() or schema-attribute() type,
+ * Otherwise return false.
+ */
bool isSchemaTest() const;
+ /**
+ *
+ */
std::ostream emit(std::ostream) const;
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/187917 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 the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/187917 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/187917 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 = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/187917 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/187917 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 succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/187917 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/1189803-html into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- 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/1189803-html into lp:zorba/html-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1189803-html into lp:zorba/html-module. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. === modified file 'src/html.xq' --- src/html.xq 2013-08-09 09:37:05 + +++ src/html.xq 2013-09-26 21:39:57 + @@ -34,7 +34,7 @@ (:~ : Import module for checking if html options element is validated. :) -import module namespace schema = http://www.zorba-xquery.com/modules/schema;; +import module namespace schema = http://zorba.io/modules/schema;; import schema namespace html-options = http://www.zorba-xquery.com/modules/converters/html-options;; -- 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/1189803-geoproj-module into lp:zorba/geoproj-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-module. -- 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/1189803-geoproj-module into lp:zorba/geoproj-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1189803-geoproj-module into lp:zorba/geoproj-module. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-module. === modified file 'src/geoproj.xq' --- src/geoproj.xq 2013-08-09 09:37:05 + +++ src/geoproj.xq 2013-09-26 22:08:06 + @@ -62,7 +62,7 @@ (:~ : pImport module for checking if geoproj parameters are validated./p :) -import module namespace schemaOptions = http://www.zorba-xquery.com/modules/schema;; +import module namespace schemaOptions = http://zorba.io/modules/schema;; (:~ -- 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/1189803-csv into lp:zorba/csv-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1189803-csv into lp:zorba/csv-module. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-csv/+merge/187949 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-csv/+merge/187949 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. === modified file 'src/csv.xq' --- src/csv.xq 2013-08-29 03:32:20 + +++ src/csv.xq 2013-09-26 22:41:04 + @@ -28,7 +28,7 @@ (:~ : Import module for checking if csv options element is validated. :) -import module namespace schemaOptions = http://www.zorba-xquery.com/modules/schema;; +import module namespace schemaOptions = http://zorba.io/modules/schema;; (:~ : Contains the definitions of the csv options element. -- 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/bug-1058398 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-1058398 into lp:zorba. Commit message: Bug #1058398: set-based sequence operations Requested reviews: Matthias Brantner (matthias-brantner) Related bugs: Bug #1058398 in Zorba: set-based sequence operations https://bugs.launchpad.net/zorba/+bug/1058398 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1058398/+merge/187965 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1058398/+merge/187965 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2013-09-22 17:52:24 + +++ ChangeLog 2013-09-27 03:33:21 + @@ -54,6 +54,7 @@ * Fixed bug #1190261 (relative paths bug in file module) * Fixed bug #1189798 (Update core module errors) * Fixed bug #1187537 (Eliminate (or at least reduce) use of MAX_PATH) + * Fixed bug #1058398 (set-based sequence operations) * Fixed bug #1180220 (Consolidate redundant path/file public APIs) * Fixed bug #1158052 (createBase64Binary() API too subtle) * Fixed bug #1103115 (Timezone units as hours are wrong) === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-09-09 23:47:17 + +++ modules/CMakeLists.txt 2013-09-27 03:33:21 + @@ -13,18 +13,19 @@ # limitations under the License. ADD_SUBDIRECTORY(atomic) -ADD_SUBDIRECTORY(store) ADD_SUBDIRECTORY(com) -ADD_SUBDIRECTORY(org) +ADD_SUBDIRECTORY(full-text) ADD_SUBDIRECTORY(functx) -ADD_SUBDIRECTORY(zorba-query) -ADD_SUBDIRECTORY(w3c) -ADD_SUBDIRECTORY(full-text) -ADD_SUBDIRECTORY(xml) ADD_SUBDIRECTORY(http-client) +ADD_SUBDIRECTORY(item) ADD_SUBDIRECTORY(json) +ADD_SUBDIRECTORY(org) +ADD_SUBDIRECTORY(sequence) +ADD_SUBDIRECTORY(store) ADD_SUBDIRECTORY(structured-items) -ADD_SUBDIRECTORY(item) +ADD_SUBDIRECTORY(w3c) +ADD_SUBDIRECTORY(xml) +ADD_SUBDIRECTORY(zorba-query) # Add external module projects - any subdirectories of a directory === added directory 'modules/sequence' === added file 'modules/sequence/CMakeLists.txt' --- modules/sequence/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/sequence/CMakeLists.txt 2013-09-27 03:33:21 + @@ -0,0 +1,18 @@ +# Copyright 2013 The FLWOR Foundation. +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +DECLARE_ZORBA_MODULE(FILE sequence.xq VERSION 1.0 + URI http://zorba.io/modules/sequence;) + +# vim:set et sw=2 ts=2: === added file 'modules/sequence/sequence.xq' --- modules/sequence/sequence.xq 1970-01-01 00:00:00 + +++ modules/sequence/sequence.xq 2013-09-27 03:33:21 + @@ -0,0 +1,73 @@ +xquery version 3.0; + +(: + : Copyright 2006-2013 The FLWOR Foundation. + : + : Licensed under the Apache License, Version 2.0 (the License); + : you may not use this file except in compliance with the License. + : You may obtain a copy of the License at + : + : http://www.apache.org/licenses/LICENSE-2.0 + : + : Unless required by applicable law or agreed to in writing, software + : distributed under the License is distributed on an AS IS BASIS, + : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + : See the License for the specific language governing permissions and + : limitations under the License. + :) + +(:===:) + +(:~ + : This module provides an XQuery API to perform set operations on sequences. + : + : @author Paul J. Lucas + : @project Zorba/Sequence + :) + +module namespace seq = http://zorba.io/modules/sequence;; + +declare namespace ver = http://zorba.io/options/versioning;; +declare option ver:module-version 1.0; + +(:===:) + +(:~ + : Performs an intersection of two sequences. + : + : @param $seq1 The first sequence. + : @param $seq2 The second sequence. + : @return a sequence only containing items from code$seq1/code that are + : also in code$seq2/code + :) +declare function seq:set-intersect( $seq1 as xs:anyAtomicType*, +$seq2 as xs:anyAtomicType* ) + as xs:anyAtomicType* external; + +(:~ + : Performs a union of two sequences. + : + : @param $seq1 The first sequence. + : @param $seq2 The second sequence. + : @return a sequence containing all items from code$seq1/code + : and codeseq2$/code but without duplicates. + :) +declare function seq:set-union( $seq1 as xs:anyAtomicType*, +$seq2 as xs:anyAtomicType* ) + as xs:anyAtomicType* external; +
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1058398 into lp:zorba
Review: Needs Fixing documentation in Performs TODO -- https://code.launchpad.net/~zorba-coders/zorba/bug-1058398/+merge/187965 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/bug-1058398 into lp:zorba
Why did you create a MP for this? As you saw from my e-mail, the performance isn't significantly better as-is. That said, it might be possible to improve it by, for instance, caching the casting results; but that would take more investigation. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1058398/+merge/187965 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
