Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188052-oauth-update into lp:zorba/oauth-module
Merged in https://github.com/28msec/zorba-oauth-module -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188052-oauth-update/+merge/173872 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1188052-oauth-update into lp:zorba/oauth-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/bug1302240 into lp:zorba
Review: Disapprove Superseeded by https://github.com/28msec/zorba/pull/6 -- https://code.launchpad.net/~zorba-coders/zorba/bug1302240/+merge/214137 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/skiplimit into lp:zorba
PR superseed by https://github.com/28msec/zorba/pull/7 -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/175747 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/xqdoc-fixes into lp:zorba
superseeded by https://github.com/28msec/zorba/pull/8 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-fixes/+merge/214246 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/feature-EntityDataNS into lp:zorba
superseeded at https://github.com/28msec/zorba/pull/9 -- https://code.launchpad.net/~zorba-coders/zorba/feature-EntityDataNS/+merge/148618 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/feature-multiple_function_lookup into lp:zorba
superseeded by https://github.com/28msec/zorba/pull/10 -- https://code.launchpad.net/~zorba-coders/zorba/feature-multiple_function_lookup/+merge/155382 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/218862 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/xqdoc-fixes into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-fixes/+merge/214246 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/xqdoc-fixes into lp:zorba
yes I generated it but as a one time thing. -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-fixes/+merge/214246 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/xqdoc-fixes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-fixes into lp:zorba has been updated. Commit Message changed to: Remove duplication function declaration in the xpath functions module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-fixes/+merge/214246 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-fixes/+merge/214246 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/xqdoc-fixes into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/xqdoc-fixes into lp:zorba. Commit message: Remove duplication function declaration in the xpath functions module. Requested reviews: William Candillon (wcandillon) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-fixes/+merge/214246 Remove duplication function declaration in the xpath functions module. -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-fixes/+merge/214246 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/w3c/xpath_functions.xq' --- modules/w3c/xpath_functions.xq 2013-10-31 19:55:27 + +++ modules/w3c/xpath_functions.xq 2014-04-04 13:53:40 + @@ -465,16 +465,6 @@ declare function fn:codepoint-equal( $comparand1 as xs:string?, $comparand2 as xs:string?) as xs:boolean? external; (:~ - : divp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;Creates an codexs:string/code from a sequence of termref def=codepointcodepoints/termref./pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;example role=signatureproto name=codepoints-to-string return-type=xs:string isOp=no prefix=fn returnEmptyOk=no returnSeq=no returnVaries=no isSchema=no isDatatype=no isSpecial=noarg name=arg type=xs:integer*//proto/example/pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;This function is termref def=dt-deterministicdeterministic/termref, termref def=dt-context-independentcontext-independent/termref, and termref def=dt-focus-independentfocus-independent/termref. /pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;The function returns the string made up from the termref def=charactercharacters/termref whose Unicode termref def=codepointcodepoints/termref are - : supplied in code$arg/code. This will be the zero-length string if code$arg/code - : is the empty sequence. /pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;A phrase diff=add at=Mdynamic/phrase error is raised errorref class=CH code=0001/ if any of the codepoints in - :code$arg/code is not a permitted XML character./p/div - : - : @see http://www.w3.org/TR/xpath-functions-30/#func-codepoints-to-string - :) -declare function fn:codepoints-to-string($arg as xs:integer*) as xs:string external; - -(:~ : divp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;Returns a sequence of nodes representing a collection of documents indentified : by a collection URI; or a default collection if no URI is supplied./pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;example role=signatureproto name=collection return-type=node()* isOp=no prefix=fn returnEmptyOk=no returnSeq=no returnVaries=no isSchema=no isDatatype=no isSpecial=no//exampleexample role=signatureproto name=collection return-type=node()* isOp=no prefix=fn returnEmptyOk=no returnSeq=no returnVaries=no isSchema=no isDatatype=no isSpecial=noarg name=arg type=xs:string?//proto/example/pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;This function is termref def=dt-deterministicdeterministic/termref, termref def=dt-context-dependentcontext-dependent/termref, and termref def=dt-focus-independentfocus-independent/termref. It depends on : available node collections, and static base uri. @@ -3658,79 +3648,7 @@ : @see http://www.w3.org/TR/xpath-functions-30/#func-unparsed-text :) declare function fn:unparsed-text($href as xs:string?, $encoding as xs:string) as xs:string? external; - -(:~ - : divp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;Because errors in evaluating the functionfn:unparsed-text/function function are - : non-recoverable, these two functions are provided to allow an application to determine - : whether a call with particular arguments would succeed./pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;example role=signatureproto name=unparsed-text-available return-type=xs:boolean isOp=no prefix=fn returnEmptyOk=no returnSeq=no returnVaries=no isSchema=no isDatatype=no isSpecial=noarg name=href type=xs:string?//proto/exampleexample role=signatureproto name=unparsed-text-available return-type=xs:boolean isOp=no prefix=fn returnEmptyOk=no returnSeq=no returnVaries=no isSchema=no isDatatype=no isSpecial=noarg name=href type=xs:string?/arg name=encoding type=xs:string//proto/example/pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;This function is termref def=dt-deterministicdeterministic/termref, termref def=dt-context-dependentcontext-dependent/termref, and termref def=dt-focus-independentfocus-independent/termref. It depends on - : static base uri. - : /pp xmlns:e=http://www.w3.org/1999/XSL/Spec/ElementSyntax;The functionfn:unparsed-text-available/function function determines whether a call - : on the functionfn:unparsed-text/function function with identical arguments would - : return a string./pp xmlns:e=http://www.w3.org/1999
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/trim-http_status into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/trim-http_status/+merge/214314 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/no_commas into lp:zorba
Looks good. Why is it only unexpected expression. Where is the error message from bison gone? -- https://code.launchpad.net/~zorba-coders/zorba/no_commas/+merge/210707 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/xqdoc-improvements into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-improvements into lp:zorba has been updated. Commit Message changed to: Update documentation on modules. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-improvements/+merge/204669 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-improvements/+merge/204669 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/xqdoc-improvements into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-improvements/+merge/204669 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-1262732 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1262732/+merge/199785 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/deadlinks into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/deadlinks into lp:zorba has been updated. Commit Message changed to: Remove dead links in the documentation. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/deadlinks/+merge/197836 -- https://code.launchpad.net/~zorba-coders/zorba/deadlinks/+merge/197836 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/deadlinks into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/deadlinks/+merge/197836 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/xpath_xqdoc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xpath_xqdoc/+merge/193484 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/xpath_xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xpath_xqdoc into lp:zorba has been updated. Commit Message changed to: Improve documentation for the xpath and xpath math functions. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xpath_xqdoc/+merge/193484 -- https://code.launchpad.net/~zorba-coders/zorba/xpath_xqdoc/+merge/193484 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/skiplimit into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/skiplimit into
lp:zorba.
Requested reviews:
William Candillon (wcandillon)
Markos Zaharioudakis (markos-za)
Ghislain Fourny (gislenius)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/175747
Add offset limit clauses to the FLWOR.
These clauses are similar to limit and offset from SQL.
For example:
for $i in (1 to 10)
offset 5
limit 2
return $i
--
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/175747
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/parser/parser.y'
--- src/compiler/parser/parser.y 2013-06-17 20:05:21 +
+++ src/compiler/parser/parser.y 2013-07-19 07:42:35 +
@@ -325,6 +325,8 @@
%token QUOTE'\'
%token RBRACE '}'
%token RBRACK ']'
+%token OFFSET 'offset'
+%token LIMIT'limit'
%token RETURN 'return'
%token RPAR ')'
%token SATISFIES'satisfies'
@@ -637,6 +639,8 @@
%type node BlockVarDecl
%type node WhereClause
%type node CountClause
+%type node OffsetClause
+%type node LimitClause
%type node Wildcard
/* left-hand sides: expressions */
@@ -883,7 +887,7 @@
%destructor { release_hack( $$ ); } SchemaPrefix SequenceType SequenceTypeList Setter SignList SingleType TextTest NamespaceTest TypeDeclaration TypeName TypeName_WITH_HOOK
%destructor { release_hack( $$ ); } URILiteralList ValueComp CollectionDecl IndexDecl IndexKeySpec IndexKeyList IntegrityConstraintDecl CtxItemDecl CtxItemDecl2 CtxItemDecl3
%destructor { release_hack( $$ ); } CtxItemDecl4 VarDecl VarGetsDecl VarGetsDeclList VarInDecl VarInDeclList WindowVarDecl WindowVars WindowVars2 WindowVars3 FLWORWinCond
-%destructor { release_hack( $$ ); } VersionDecl VFO_Decl VFO_DeclList WhereClause CountClause Wildcard DecimalFormatDecl TypedFunctionTest AnyFunctionTest TypeList
+%destructor { release_hack( $$ ); } VersionDecl VFO_Decl VFO_DeclList WhereClause CountClause LimitClause OffsetClause Wildcard DecimalFormatDecl TypedFunctionTest AnyFunctionTest TypeList
%destructor { release_hack( $$ ); } SwitchCaseClause SwitchCaseClauseList SwitchCaseOperandList
#ifdef XQUERY_PARSER
@@ -2712,8 +2716,23 @@
| OrderByClause
| GroupByClause
| CountClause
-;
-
+ | OffsetClause
+ | LimitClause
+;
+
+OffsetClause :
+ OFFSET ExprSingle
+ {
+$$ = new OffsetClause(LOC (@$), $2);
+ }
+;
+
+LimitClause :
+ LIMIT ExprSingle
+ {
+$$ = new LimitClause(LOC (@$), $2);
+ }
+;
FLWORClauseList :
ForLetWinClause
=== modified file 'src/compiler/parser/scanner.l'
--- src/compiler/parser/scanner.l 2013-04-23 13:20:31 +
+++ src/compiler/parser/scanner.l 2013-07-19 07:42:35 +
@@ -557,6 +557,8 @@
by { return token::BY; }
stable { return token::STABLE; }
or { return token::OR; }
+limit { return token::LIMIT; }
+offset { return token::OFFSET; }
return { return token::RETURN; }
#ifdef JSONIQ_SCANNER
select { return token::RETURN; }
=== modified file 'src/compiler/parsetree/parsenode_print_xml_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xml_visitor.cpp 2013-06-07 13:46:26 +
+++ src/compiler/parsetree/parsenode_print_xml_visitor.cpp 2013-07-19 07:42:35 +
@@ -726,6 +726,8 @@
BEGIN_END_TAG (ContextItemExpr)
BEGIN_END_TAG (CopyNamespacesDecl)
BEGIN_END_TAG (CountClause)
+BEGIN_END_TAG (LimitClause)
+BEGIN_END_TAG (OffsetClause)
BEGIN_END_TAG (DefaultCollationDecl)
BEGIN_END_TAG (DeleteExpr)
END_TAG (DirAttr)
=== modified file 'src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2013-07-01 18:59:06 +
+++ src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2013-07-19 07:42:35 +
@@ -1529,6 +1529,8 @@
XQDOC_NO_BEGIN_END_TAG (VarRef)
XQDOC_NO_BEGIN_END_TAG (VFO_DeclList)
XQDOC_NO_BEGIN_END_TAG (WhereClause)
+XQDOC_NO_BEGIN_END_TAG (OffsetClause)
+XQDOC_NO_BEGIN_END_TAG (LimitClause)
XQDOC_NO_BEGIN_END_TAG (WhileExpr)
XQDOC_NO_BEGIN_END_TAG (Wildcard)
XQDOC_NO_BEGIN_END_TAG (WindowClause)
=== modified file 'src/compiler/parsetree/parsenode_print_xquery_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xquery_visitor.cpp 2013-06-07 13:46:26 +
+++ src/compiler/parsetree/parsenode_print_xquery_visitor.cpp 2013-07-19 07:42:35 +
@@ -1199,6 +1199,24 @@
}
DEFAULT_END_VISIT (WhereClause)
+void* begin_visit(const OffsetClause n)
+{
+ os offset ;
+ n.get_offset()-accept(*this);
+ return 0;
+}
+DEFAULT_END_VISIT (OffsetClause)
+
+
+void* begin_visit(const LimitClause n)
+{
+ os limit ;
+ n.get_limit()-accept(*this);
+ return 0;
+}
+DEFAULT_END_VISIT (LimitClause)
+
+
void* begin_visit(const CountClause n)
{
os count $ n.get_varname
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/skiplimit into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/175747 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
Is it possible to have new tests for this change?
I tried the following query:
jn:parse-json('{ foo
\abar:
1 }')
Got:
test.xq:4,2: dynamic error [jerr:JNDY0021]: '\a': illegal JSON character
escape
I'm not sure if the line number make sense.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/174785
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
Do you have a query to try out the change?
I ran:
declare namespace zerr = http://www.zorba-xquery.com/errors;;
declare namespace err = http://www.w3.org/2005/xqt-errors;;
try {
jn:parse-json('{ foo
\abar:
1 }')
} catch * {
{
code: $err:code,
description: $err:description,
module: $err:module,
column-number: $err:column-number,
column-number-end: $zerr:column-number-end
}
}
And got:
static error [err:XPST0008]: zerr:column-number-end: undeclared variable
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/174785
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
Doesn't work for me. Do you have the full query? -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/174785 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/174785 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/skiplimit into lp:zorba
It feels that the current proposal is actually quite efficient and has a predictable performance. But I like the beauty of having the count/where syntactic sugar. So I'm not sure what do to. -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 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/skiplimit into lp:zorba
Hi Ghislain, Thank you so much for this insight. That makes perfect sense. Now I see two way this can go: - offset/limit is just a syntactic sugar for count/where and using the subsequence optimisation for it is completely orthogonal to this merge proposal. - offset/limit doesn't make sense if the subsequence optimisation is not used. If so, could I have some pointers on how to implement this optimisation? -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 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/skiplimit into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/skiplimit into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 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/skiplimit into lp:zorba
1. I make an email loop to get Dana's approval. 2. There are couple of options, I wasn't sure which one to pick: a) (offset ExprSingle)? (limit ExprSingle)? b) (offset ExprSingle) | (limit ExprSingle) | (limit ExprSingle offset ExprSingle) | (offset ExprSingle limit ExprSingle) c) ((offset ExprSingle) | (limit ExprSingle)?)* I ended up doing c) but I can do a) or b). -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 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/skiplimit into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/skiplimit into
lp:zorba.
Commit message:
Add offset limit clauses to the FLWOR.
Requested reviews:
William Candillon (wcandillon)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126
Add offset limit clauses to the FLWOR.
These clauses are similar to limit and offset from SQL.
For example:
for $i in (1 to 10)
offset 5
limit 2
return $i
--
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/parser/parser.y'
--- src/compiler/parser/parser.y 2013-06-17 20:05:21 +
+++ src/compiler/parser/parser.y 2013-07-05 04:45:36 +
@@ -325,6 +325,8 @@
%token QUOTE'\'
%token RBRACE '}'
%token RBRACK ']'
+%token OFFSET'offset'
+%token LIMIT'limit'
%token RETURN 'return'
%token RPAR ')'
%token SATISFIES'satisfies'
@@ -693,6 +695,7 @@
%type expr ExprSimple
%type expr ExtensionExpr
%type expr FLWORExpr
+%type expr OffsetLimitExpr
%type expr ReturnExpr
%type expr PostfixExpr
%type expr FunctionCall
@@ -904,7 +907,7 @@
%destructor { release_hack( $$ ); } AxisStep
// exprnodes
-%destructor { release_hack( $$ ); } AdditiveExpr AndExpr CDataSection CastExpr CastableExpr CommonContent ComparisonExpr CompAttrConstructor CompCommentConstructor CompDocConstructor CompElemConstructor CompPIConstructor CompNamespaceConstructor CompTextConstructor ComputedConstructor Constructor ContextItemExpr DirCommentConstructor DirElemConstructor DirElemContent DirPIConstructor DirectConstructor BracedExpr BlockExpr EnclosedStatementsAndOptionalExpr BlockStatement Statement Statements StatementsAndExpr StatementsAndOptionalExpr StatementsAndOptionalExprTop SwitchStatement TypeswitchStatement TryStatement CatchListStatement CatchStatement ApplyStatement IfStatement FLWORStatement ReturnStatement VarDeclStatement Expr ExprSingle ExprSimple ExtensionExpr FLWORExpr ReturnExpr PostfixExpr FunctionCall IfExpr InstanceofExpr IntersectExceptExpr Literal MultiplicativeExpr NumericLiteral OrExpr OrderedExpr ParenthesizedExpr PathExpr Predicate PrimaryExpr QuantifiedExpr QueryBody RangeExpr RelativePathExpr StepExpr StringLiteral TreatExpr StringConcatExpr SwitchExpr TypeswitchExpr UnaryExpr UnionExpr UnorderedExpr ValidateExpr ValueExpr SimpleMapExpr VarRef TryExpr CatchListExpr CatchExpr DeleteExpr InsertExpr RenameExpr ReplaceExpr TransformExpr VarNameList VarNameDecl AssignStatement ExitStatement WhileStatement FlowCtlStatement QNAME EQNAME FUNCTION_NAME FTContainsExpr
+%destructor { release_hack( $$ ); } AdditiveExpr AndExpr CDataSection CastExpr CastableExpr CommonContent ComparisonExpr CompAttrConstructor CompCommentConstructor CompDocConstructor CompElemConstructor CompPIConstructor CompNamespaceConstructor CompTextConstructor ComputedConstructor Constructor ContextItemExpr DirCommentConstructor DirElemConstructor DirElemContent DirPIConstructor DirectConstructor BracedExpr BlockExpr EnclosedStatementsAndOptionalExpr BlockStatement Statement Statements StatementsAndExpr StatementsAndOptionalExpr StatementsAndOptionalExprTop SwitchStatement TypeswitchStatement TryStatement CatchListStatement CatchStatement ApplyStatement IfStatement FLWORStatement ReturnStatement VarDeclStatement Expr ExprSingle ExprSimple ExtensionExpr FLWORExpr OffsetLimitExpr ReturnExpr PostfixExpr FunctionCall IfExpr InstanceofExpr IntersectExceptExpr Literal MultiplicativeExpr NumericLiteral OrExpr OrderedExpr ParenthesizedExpr PathExpr Predicate PrimaryExpr QuantifiedExpr QueryBody RangeExpr RelativePathExpr StepExpr StringLiteral TreatExpr StringConcatExpr SwitchExpr TypeswitchExpr UnaryExpr UnionExpr UnorderedExpr ValidateExpr ValueExpr SimpleMapExpr VarRef TryExpr CatchListExpr CatchExpr DeleteExpr InsertExpr RenameExpr ReplaceExpr TransformExpr VarNameList VarNameDecl AssignStatement ExitStatement WhileStatement FlowCtlStatement QNAME EQNAME FUNCTION_NAME FTContainsExpr
// internal non-terminals with values
%destructor { delete $$; } FunctionSig VarNameAndType NameTestList DecimalFormatParam DecimalFormatParamList
@@ -973,6 +976,10 @@
%nonassoc SIMPLEMAPEXPR_REDUCE
%left BANG
+%nonassoc SKIPLIMIT_REDUCE
+%left OFFSET
+%left LIMIT
+
/*_
*
* resolve shift-reduce conflict for
@@ -2584,6 +2591,19 @@
FLWORExpr :
+FLWORClauseList %prec SKIPLIMIT_REDUCE OffsetLimitExpr ReturnExpr
+{
+ OffsetLimitExpr *sl = dynamic_castOffsetLimitExpr*($2);
+ ReturnExpr *re = dynamic_castReturnExpr*($3);
+ $$ = new FLWORExpr(LOC(@$),
+ dynamic_castFLWORClauseList*($1
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/skiplimit into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/skiplimit into lp:zorba has been updated. Commit Message changed to: Add offset limit clauses to the FLWOR. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 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/skiplimit into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/skiplimit into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 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/skiplimit into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126 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/166601 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/166601 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/166601 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166601 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/sqlite-check-for-metadata-availability into lp:zorba/sqlite-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/sqlite-check-for-metadata-availability/+merge/145041 Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-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/bug867259 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug867259/+merge/160515 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/bug867259 into lp:zorba
Looks great! -- https://code.launchpad.net/~zorba-coders/zorba/bug867259/+merge/160515 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/bug867259 into lp:~zorba-coders/zorba/website
What is this new public/tutorials/css/all.css file? -- https://code.launchpad.net/~zorba-coders/zorba/bug867259/+merge/160199 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/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/bug867259 into lp:~zorba-coders/zorba/website
The way we published tutorials in the past were via blog entries like at http://www.zorba-xquery.com/html/entry/2012/09/26/XQDoc What do you think? -- https://code.launchpad.net/~zorba-coders/zorba/bug867259/+merge/160199 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/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/new-xqdoc into lp:zorba
It's absolutely the same code. For the Zorba website, the list of modules and their relationships is cherry picked and this is done manually. That's the only difference. -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/156731 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-xqdoc into lp:zorba
Just had a look and it looks good. -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/156731 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/couchbase-module_null into lp:zorba/couchbase-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/couchbase-module_null/+merge/155128 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-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/couchbase-module_null into lp:zorba/couchbase-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/couchbase-module_null/+merge/155090 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-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/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
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/144397 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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/144397 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/144397 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:~nbrinza/zorba/error-messages into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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:~nbrinza/zorba/error-messages into lp:zorba
Review: Needs Fixing -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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:~nbrinza/zorba/error-messages into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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/feature-reference_module into lp:zorba
We agreed with Ghislain to use xs:string. Regarding dereference(), for which scenario should it throw an exception? -- https://code.launchpad.net/~zorba-coders/zorba/feature-reference_module/+merge/138345 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/llvm into lp:zorba
Boost is the only standalone cross platform uuid library I could find. The dependency exists only if compiling with emscripten. If you could point me to the uuid library that could work as replacement, I could definitely replace the boost one. BTW this branch as is, compiles to JavaScript. -- https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141233 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/llvm into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/llvm into lp:zorba has been updated. Commit Message changed to: This branch enables Zorba to be compiled to JavaScript. Specifically: Fix build with the following options: - ZORBA_NO_ICU - ZORBA_NO_XMLSCHEMA - ZORBA_NO_FULLTEXT - ZORBA_WITH_FILE_ACCESS=OFF Update references of ulong to u_long Add EMSCRIPTEN options for UUID, traits, and static assert support. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141233 -- https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141233 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/llvm into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/llvm into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141181 -- https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141181 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/llvm into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/llvm into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141233 -- https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141233 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/llvm into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/llvm into
lp:zorba.
Commit message:
Fix build with the following options:
- ZORBA_NO_ICU
- ZORBA_NO_XMLSCHEMA
- ZORBA_NO_FULLTEXT
- ZORBA_WITH_FILE_ACCESS=OFF
Requested reviews:
Paul J. Lucas (paul-lucas)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141181
Fix build with the following options:
- ZORBA_NO_ICU
- ZORBA_NO_XMLSCHEMA
- ZORBA_NO_FULLTEXT
- ZORBA_WITH_FILE_ACCESS=OFF
--
https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141181
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2012-11-06 10:11:37 +
+++ bin/zorbacmd.cpp 2012-12-23 12:55:26 +
@@ -622,6 +622,7 @@
void
removeOutputFileIfNeeded(const ZorbaCMDProperties lProperties)
{
+#ifdef ZORBA_WITH_FILE_ACCESS
if (lProperties.outputFile().size() 0)
{
File_t lFile = zorba::File::createFile(lProperties.outputFile());
@@ -630,6 +631,7 @@
lFile-remove();
}
}
+#endif
}
=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt 2012-12-05 03:33:46 +
+++ src/api/CMakeLists.txt 2012-12-23 12:55:26 +
@@ -46,7 +46,6 @@
invoke_item_sequence.cpp
item_sequence_chainer.cpp
empty_sequence.cpp
-fileimpl.cpp
serializerimpl.cpp
base64impl.cpp
base64_streambuf.cpp
@@ -63,6 +62,10 @@
uuid.cpp
)
+IF (ZORBA_WITH_FILE_ACCESS)
+ LIST(APPEND API_SRCS fileimpl.cpp)
+ENDIF (ZORBA_WITH_FILE_ACCESS)
+
IF (NOT ZORBA_NO_FULL_TEXT)
LIST(APPEND API_SRCS
stemmer.cpp
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp 2012-10-10 21:15:05 +
+++ src/api/staticcontextimpl.cpp 2012-12-23 12:55:26 +
@@ -39,6 +39,7 @@
#include api/staticcollectionmanagerimpl.h
#include api/vectoriterator.h
+#include context/dynamic_context.h
#include context/static_context.h
#include context/static_context_consts.h
#ifndef ZORBA_NO_FULL_TEXT
@@ -59,10 +60,10 @@
#include types/typeops.h
#include diagnostics/xquery_diagnostics.h
+#include diagnostics/assert.h
#include runtime/util/flowctl_exception.h
-
namespace zorba {
/***
=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp 2012-10-26 07:13:42 +
+++ src/compiler/expression/expr_manager.cpp 2012-12-23 12:55:26 +
@@ -813,7 +813,7 @@
CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc);
}
-
+#ifndef ZORBA_NO_FULL_TEXT
ftcontains_expr* ExprManager::create_ftcontains_expr(
static_context* sctx,
user_function* udf,
@@ -824,7 +824,7 @@
{
CREATE_AND_RETURN_EXPR(ftcontains_expr, sctx, udf, loc, range, ftselection, ftignore);
}
-
+#endif
=== modified file 'src/compiler/expression/expr_manager.h'
--- src/compiler/expression/expr_manager.h 2012-10-26 07:13:42 +
+++ src/compiler/expression/expr_manager.h 2012-12-23 12:55:26 +
@@ -495,6 +495,7 @@
user_function* udf,
const QueryLoc loc);
+#ifndef ZORBA_NO_FULL_TEXT
ftcontains_expr* create_ftcontains_expr(
static_context*,
user_function* udf,
@@ -502,6 +503,7 @@
expr* range,
ftnode* ftselection,
expr* ftignore);
+#endif
=== modified file 'src/compiler/parsetree/parsenode_print_xml_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xml_visitor.cpp 2012-09-19 21:16:15 +
+++ src/compiler/parsetree/parsenode_print_xml_visitor.cpp 2012-12-23 12:55:26 +
@@ -323,7 +323,6 @@
void *begin_visit(const SchemaImport n)
{
-#ifndef ZORBA_NO_XMLSCHEMA
INDENT;
os SchemaImport IDS;
@@ -332,9 +331,6 @@
INDENT_INC; NL;
return no_state;
-#else
- throw XQUERY_EXCEPTION(err::XQST0009);
-#endif
}
void *begin_visit (const URILiteralList n)
=== modified file 'src/context/default_url_resolvers.cpp'
--- src/context/default_url_resolvers.cpp 2012-11-06 10:11:37 +
+++ src/context/default_url_resolvers.cpp 2012-12-23 12:55:26 +
@@ -113,12 +113,14 @@
if (lScheme != uri::file) {
return NULL;
}
- zstring lPath = fs::get_normalized_path(aUrl);
+#ifdef ZORBA_WITH_FILE_ACCESS
+ zstring lPath = fs::get_normalized_path(aUrl);
if (fs::get_type(lPath) == fs::file) {
std::ifstream* lStream = new std::ifstream(lPath.c_str());
return new StreamResource(
lStream, fileStreamReleaser, , true /* seekable */);
}
+#endif
return NULL;
}
=== modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp'
--- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2012-10-08 12:09:36 +
+++ src/runtime/parsing_and_serializing
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/llvm into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/llvm into lp:zorba has been updated. Commit Message changed to: Fix build with the following options: - ZORBA_NO_ICU - ZORBA_NO_XMLSCHEMA - ZORBA_NO_FULLTEXT - ZORBA_WITH_FILE_ACCESS=OFF For more details, see: https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141181 -- https://code.launchpad.net/~zorba-coders/zorba/llvm/+merge/141181 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/feature-reference_module into lp:zorba
That makes sense. -- https://code.launchpad.net/~zorba-coders/zorba/feature-reference_module/+merge/138345 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/feature-reference_module into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-reference_module/+merge/138345 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/feature-reference_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-reference_module into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-reference_module/+merge/138345 -- https://code.launchpad.net/~zorba-coders/zorba/feature-reference_module/+merge/138345 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/feature-reference_module into lp:zorba
Another small comment: wouldn't be more user friendly for these two functions to deal with xs:string instead of xs:anyURI? -- https://code.launchpad.net/~zorba-coders/zorba/feature-reference_module/+merge/138345 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/schema-tools-module-doc into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-doc/+merge/126944 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-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/zorba-error_printer_in_api into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 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/no_disqus into lp:zorba
Currently the website is not using any static content from the zorba repository. We just feed the database with the xml xqdoc and doxygen and then have xquery to render the pages. The source code of the website is available at https://code.launchpad.net/~zorba-coders/zorba/website -- https://code.launchpad.net/~zorba-coders/zorba/no_disqus/+merge/114793 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/xpath_doc into lp:zorba
I agree this depends on lp:~zorba-coders/zorba/new-xqdoc being merged into the trunk. -- https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/126681 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/process_doc into lp:zorba/process-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/process_doc/+merge/126738 Your team Zorba Coders is subscribed to branch lp:zorba/process-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/data-converters-module-doc into lp:zorba/data-converters-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/data-converters-module-doc/+merge/126951 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-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/data-formatting-doc into lp:zorba/data-formatting-module
William Candillon has proposed merging lp:~zorba-coders/zorba/data-formatting-doc into lp:zorba/data-formatting-module. Requested reviews: William Candillon (wcandillon) Cezar Andrei (cezar-andrei) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/127666 Minor documentation improvements. -- https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/127666 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. === modified file 'src/com/zorba-xquery/www/modules/xsl-fo.xq' --- src/com/zorba-xquery/www/modules/xsl-fo.xq 2012-04-11 13:45:56 + +++ src/com/zorba-xquery/www/modules/xsl-fo.xq 2012-10-03 08:27:25 + @@ -21,8 +21,7 @@ : to various formats such as PDF, EPS, PCL, AFP, Text, PNG, Postscript, RTF, and TIFF. : For instance, the following example converts a simple XSL-FO document to PDF: : br / - : pre class=brush: xquery; - : import module namespace fop = http://www.zorba-xquery.com/modules/xsl-fo;; + : pre class=ace-static ace-mode=xquery![CDATA[import module namespace fop = http://www.zorba-xquery.com/modules/xsl-fo;; : import module namespace file = http://expath.org/ns/file;; : : declare namespace fo = http://www.w3.org/1999/XSL/Format;; @@ -41,8 +40,7 @@ : /fo:page-sequence : /fo:root : let $pdf := fop:generator($fop:PDF, $xsl-fo) - : return file:write-binary(simple.pdf, $pdf) - : /pre + : return file:write-binary(simple.pdf, $pdf)]]/pre : br / : This module uses Apache-FOP to generate content from an XSL-FO document. : See a href=http://xmlgraphics.apache.org/fop/;the Apache FOP documentation/a for further information. @@ -57,7 +55,7 @@ : @author Markus Pilman : @see http://xmlgraphics.apache.org/fop/ : @library a href=http://www.oracle.com/technetwork/java/javase/downloads/index.html;JDK - Java Development Kit/a - : @project data processing/data formatting + : @project Zorba/Data Formatting/XSL-FO :) module namespace xsl-fo = http://www.zorba-xquery.com/modules/xsl-fo;; -- 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/data-formatting-doc into lp:zorba/data-formatting-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/127666 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
In the HTML specification, code is an inline element and pre a block element. One thing I can do is to change class=ace-static ace-mode=xquery by something more simple: class=xquery. What do you think? -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 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/excel-doc into lp:zorba/excel-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/excel-doc/+merge/126975 Your team Zorba Coders is subscribed to branch lp:zorba/excel-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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
No it was brush: xquery; which was pretty bad (regarding whitespace and processing) -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/email_doc into lp:zorba/email-module
William Candillon has proposed merging lp:~zorba-coders/zorba/email_doc into lp:zorba/email-module. Requested reviews: William Candillon (wcandillon) Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126942 Minor documentation improvements. -- https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126942 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. === modified file 'src/com/zorba-xquery/www/modules/email/imap.xq' --- src/com/zorba-xquery/www/modules/email/imap.xq 2012-04-11 09:50:26 + +++ src/com/zorba-xquery/www/modules/email/imap.xq 2012-09-28 12:14:25 + @@ -25,21 +25,22 @@ : in the email schema: codehttp://www.zorba-xquery.com/modules/email/code. : : For example: - : pre - : lt;email:hostInfogt; - : lt;email:hostNamegt;imap.example.comlt;/email:hostNamegt; - : lt;email:userNamegt;myuserlt;/email:userNamegt; - : lt;email:passwordgt;mypasswordlt;/email:passwordgt; - : lt;/email:hostInfogt; - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[ + : email:hostInfo + : email:hostNameimap.example.com/email:hostName + : email:userNamemyuser/email:userName + : email:passwordmypassword/email:password + : /email:hostInfo + : ]]/pre : : The codehostInfoType/code only needs to be in the email schema namespace : (codehttp://www.zorba-xquery.com/modules/email/code). It does not need : to be validated since it's validated by the module. : : @author Daniel Thomas, Gabriel Petrovay + : @see a href=http://www.washington.edu/imap/;c-client library part of UW IMAP toolkit/a : @library a href=http://www.washington.edu/imap/;c-client library part of UW IMAP toolkit/a - : @project communication + : @project Zorba/IO/IMAP :) module namespace imap = 'http://www.zorba-xquery.com/modules/email/imap'; === modified file 'src/com/zorba-xquery/www/modules/email/smtp.xq' --- src/com/zorba-xquery/www/modules/email/smtp.xq 2012-04-11 09:50:26 + +++ src/com/zorba-xquery/www/modules/email/smtp.xq 2012-09-28 12:14:25 + @@ -27,8 +27,9 @@ : documentation associated with this function. : : @author Sorin Nasoi, Daniel Thomas + : @see a href=http://www.washington.edu/imap/;c-client Library part of UW IMAP toolkit/a : @library a href=http://www.washington.edu/imap/;c-client Library part of UW IMAP toolkit/a - : @project communication + : @project Zorba/IO/SMTP :) module namespace smtp = http://www.zorba-xquery.com/modules/email/smtp;; @@ -55,13 +56,13 @@ : /ul : : The code$host-info/code parameter could then look like this: - : pre - : lt;hostInfogt; - : lt;hostNamegt;smtp.gmail.com:587/tls/novalidate-certlt;hostNamegt; - : lt;userNamegt;usernamelt;userNamegt; - : lt;passwordgt;passwordlt;passwordgt; - : lt;/hostInfogt; - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[ + : hostInfo + : hostNamesmtp.gmail.com:587/tls/novalidate-cert/hostName + : userNameusername/userName + : passwordpassword/password + : /hostInfo + : ]]/pre : : For a complete of the structure of an email message, see the imported email : schema: codehttp://www.zorba-xquery.com/modules/email/code -- 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/email_doc into lp:zorba/email-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126942 Your team Zorba Coders is subscribed to branch lp:zorba/email-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/email_doc into lp:zorba/email-module
Nice catch. It's back. -- https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126942 Your team Zorba Coders is subscribed to branch lp:zorba/email-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/schema-tools-module-doc into lp:zorba/schema-tools-module
William Candillon has proposed merging lp:~zorba-coders/zorba/schema-tools-module-doc into lp:zorba/schema-tools-module. Commit message: Minor documentation improvements. Requested reviews: William Candillon (wcandillon) Cezar Andrei (cezar-andrei) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-doc/+merge/126944 Minor documentation improvements. -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-doc/+merge/126944 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. === modified file 'src/schema-tools.xq' --- src/schema-tools.xq 2012-03-20 18:33:33 + +++ src/schema-tools.xq 2012-09-28 12:20:26 + @@ -29,8 +29,9 @@ : @author Cezar Andrei : @see http://xmlbeans.apache.org/ : @library a href=http://www.oracle.com/technetwork/java/javase/downloads/index.html;JDK - Java Development Kit/a - : @project data processing/metadata : @library a href=http://xmlbeans.apache.org/;Apache XMLBeans/a + : @see http://xmlbeans.apache.org + : @project Zorba/Data Processing/Schema Tools :) module namespace schema-tools = http://www.zorba-xquery.com/modules/schema-tools;; @@ -58,8 +59,7 @@ : a href=http://xmlbeans.apache.org/;official documentation for further : information/a. : br / - : Example:pre class=brush: xquery; - : + : Example:pre class=ace-static ace-mode=xquery![CDATA[ : import module namespace st = http://www.zorba-xquery.com/modules/schema-tools;; : declare namespace sto = : http://www.zorba-xquery.com/modules/schema-tools/schema-tools-options;; @@ -74,7 +74,7 @@ : return : st:inst2xsd($instances, $options) : - : /pre + : ]]/pre : br / : @param $instances The input XML instance elements : @param $options Options:br / @@ -144,8 +144,7 @@ : a href=http://xmlbeans.apache.org/;official documentation for further : information/a. : br / - : Example:pre class=brush: xquery; - : + : Example: pre class=ace-static ace-static=xquery![CDATA[ : import module namespace st = http://www.zorba-xquery.com/modules/schema-tools;; : declare namespace sto = : http://www.zorba-xquery.com/modules/schema-tools/schema-tools-options;; @@ -170,7 +169,7 @@ :/sto:xsd2inst-options : return : st:xsd2inst($xsds, a, $options) - : /prebr / + : ]]/prebr / : @param $schemas elements representing XMLSchema definitions : @param $rootElementName The local name of the instance root element. :If multiple target namespaces are used, first one found - using the @@ -217,4 +216,4 @@ schema-tools:xsd2inst-internal ($schemas as element()+, $rootElementName as xs:string, $options as element(st-options:xsd2inst-options, st-options:xsd2instOptionsType)?) - as document-node() external; \ No newline at end of file + as document-node() external; -- 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/schema-tools-module-doc into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/schema-tools-module-doc into lp:zorba/schema-tools-module has been updated. Commit Message changed to: Minor documentation improvements. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-doc/+merge/126944 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-doc/+merge/126944 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-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/data-converters-module-doc into lp:zorba/data-converters-module
William Candillon has proposed merging lp:~zorba-coders/zorba/data-converters-module-doc into lp:zorba/data-converters-module. Commit message: Minor documentation improvements. Requested reviews: William Candillon (wcandillon) Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-converters-module-doc/+merge/126951 Minor documentation improvements. -- https://code.launchpad.net/~zorba-coders/zorba/data-converters-module-doc/+merge/126951 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. === modified file 'src/com/zorba-xquery/www/modules/converters/csv.xq' --- src/com/zorba-xquery/www/modules/converters/csv.xq 2011-08-17 23:28:43 + +++ src/com/zorba-xquery/www/modules/converters/csv.xq 2012-09-28 12:53:22 + @@ -21,7 +21,7 @@ : The functions are optimized to work with large amounts of data, in a streaming way. : : @author Daniel Turcanu - : @project data processing/data converters + : @project Zorba/Data Converters/CSV :) module namespace csv = http://www.zorba-xquery.com/modules/converters/csv;; @@ -40,32 +40,24 @@ (:~ : Parse a CSV or fixed size text and convert to XML.br/ - : By default each line is converted to a lt;row element, and each field to a lt;column element inside lt;row.br/ + : By default each line is converted to a coderow/code element, and each field to a codecolumn/code element inside coderow/code.br/ : The format of the param $options is:br/ - :lt;csv-options:optionsbr/ - :lt;csv [separator=default comma ,] ? br/ - : [quote-char=default double quotes amp;quote;]? br/ - : [quote-escape=default double double quotes amp;quote;amp;quote;]? / br/ - :br/ - :orbr/ - :lt;column-widthsbr/ - : lt;column-widthi[column fixed width, unsigned int]/ilt;column-width*br/ - : lt;/column-widthsbr/ - :br/ - :orbr/ - :lt;column-positionsbr/ - : lt;column-positioni[column position on line, unsigned int]/ilt;column-position*br/ - : lt;/column-positionsbr/ - :br/ - :lt;first-row-is-header [line=ifirst_line[-last_line]?/i]?/?br/ - :lt;start-from-row line=ifirst_line[-last_line]?/i/?br/ - :lt;add-last-void-columns/?br/ - :lt;xml-nodesbr/ - : [lt;irow-name/ibr/ - :[lt;icolumn-name//i]?br/ - : lt;/irow-name/i]?br/ - :lt;/xml-nodes?br/ - :lt;/csv-options:optionsbr/ + : pre class=ace-static ace-mode=xquery![CDATA[csv-options:options + : csv [separator=default comma ,]? + : [quote-char=default double quotes quote;]? + : [quote-escape=default double double quotes quote;quote;]? / + : column-widths + : column-width[(column fixed width | column fixed width), unsigned int]column-width* + : /column-widths + : first-row-is-header [line=ifirst_line[-last_line]?/i]?/? + : start-from-row line=ifirst_line[-last_line]?/i/? + : add-last-void-columns/? + : xml-nodes + : [row-name + : [column-name/]? + : row-name /]? + : /xml-nodes? + : /csv-options:options]]/pre :br/ :All the parameters are optional and can appear in any order.br/ :All the parameters are case sensitive. The namespace used is http://www.zorba-xquery.com/modules/converters/csv-options;.br/ @@ -113,11 +105,11 @@ :1,John,student/ibr/ :br/ :is parsed intobr/ - :ilt;rowbr/ - :lt;ID1lt;/IDbr/ - :lt;NameJohnlt;/Namebr/ - :lt;Occupationstudentlt;/Occupationbr/ - :lt;/row/ibr/ + :pre class=ace-static ace-mode=xquery![CDATA[row + : ID1/ID + : NameJohn/Name + : Occupationstudent/Occupation + : /row]]/pre : br/ :If the header names contain characters that cannot be used in a QName, they are replaced with underscore '_'.br/ :The namespace for the header QNames is taken from the column name specified in xml-nodes parameter, or from @@ -134,14 +126,14 @@ :1,John,Howard,student/ibr/ :br/ :is parsed intobr/ - :ilt;rowbr/ - :lt;ID1lt;/IDbr/ - :lt;Namebr/ - : lt;First_NameJohnlt;/First_Namebr/ - : lt;Last_NameHowardlt;/Last_Namebr/ - :lt;/Namebr/ - :lt;Occupationstudentlt;/Occupationbr/ - :lt;/row/ibr/ + :pre class=ace-static ace-mode=xquery![CDATA[row + : ID1/ID + : Name + : First_NameJohn/First_Name + : Last_NameHoward/Last_Name + : /Name + : Occupationstudent/Occupation + : /row]]/pre :br/ :This element can have an attribute accept-all-lines with values false or true (default false). :When set to true it tells the parser to not report lines that do not have the same number of items as @@ -165,18 +157,18 @@ :that enclose the fields in the output xml if there is no header. br/ :If the csv has a header, only the namespace
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/data-converters-module-doc into lp:zorba/data-converters-module
The proposal to merge lp:~zorba-coders/zorba/data-converters-module-doc into lp:zorba/data-converters-module has been updated. Commit Message changed to: Minor documentation improvements. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-converters-module-doc/+merge/126951 -- https://code.launchpad.net/~zorba-coders/zorba/data-converters-module-doc/+merge/126951 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-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/data-formatting-doc into lp:zorba/process-module
William Candillon has proposed merging
lp:~zorba-coders/zorba/data-formatting-doc into lp:zorba/process-module.
Commit message:
Minor documentation improvements.
Requested reviews:
William Candillon (wcandillon)
Cezar Andrei (cezar-andrei)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/126953
Minor documentation improvements.
--
https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/126953
Your team Zorba Coders is subscribed to branch lp:zorba/process-module.
=== added file 'CMakeLists.txt'
--- CMakeLists.txt 1970-01-01 00:00:00 +
+++ CMakeLists.txt 2012-09-28 12:58:20 +
@@ -0,0 +1,56 @@
+# Copyright 2006-2010 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.
+
+MESSAGE (STATUS BEGIN Configuring module Data-Formatting )
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+PROJECT (zorba_data-formatting_module)
+
+FIND_PACKAGE (zorba_util-jvm_module QUIET)
+
+IF (zorba_util-jvm_module_FOUND)
+ INCLUDE (${zorba_util-jvm_module_USE_FILE})
+
+ FIND_PACKAGE(JNI)
+ FIND_PACKAGE(Java)
+ FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
+ INCLUDE (${Zorba_USE_FILE})
+
+ IF (JNI_FOUND)
+INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
+
+ENABLE_TESTING ()
+INCLUDE (CTest)
+
+SET_CMAKE_MODULE_PATH ()
+
+FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
+INCLUDE (${Zorba_USE_FILE})
+
+ADD_SUBDIRECTORY (src)
+#ADD_TEST_DIRECTORY (${CMAKE_SOURCE_DIR}/test)
+
+DONE_DECLARING_ZORBA_URIS ()
+
+ ELSE (JNI_FOUND)
+MESSAGE ( STATUS Java and/or JNI not found; skipping data-formating module.)
+ ENDIF(JNI_FOUND)
+
+ELSE (zorba_util-jvm_module_FOUND)
+ MESSAGE (STATUS Zorba's util-jvm module not found; skipping data-formatting module.)
+ENDIF (zorba_util-jvm_module_FOUND)
+
+
+MESSAGE (STATUS END Configuring module Data-Formatting )
=== renamed file 'CMakeLists.txt' = 'CMakeLists.txt.moved'
=== added directory 'cmake_modules'
=== added file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 1970-01-01 00:00:00 +
+++ cmake_modules/FindJNI.cmake 2012-09-28 12:58:20 +
@@ -0,0 +1,286 @@
+# - Find JNI java libraries.
+# This module finds if Java is installed and determines where the
+# include files and libraries are. It also determines what the name of
+# the library is. This code sets the following variables:
+#
+# JNI_INCLUDE_DIRS = the include dirs to use
+# JNI_LIBRARIES = the libraries to use
+# JNI_FOUND = TRUE if JNI headers and libraries were found.
+# JAVA_AWT_LIBRARY = the path to the jawt library
+# JAVA_JVM_LIBRARY = the path to the jvm library
+# JAVA_INCLUDE_PATH = the include path to jni.h
+# JAVA_INCLUDE_PATH2= the include path to jni_md.h
+# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+#
+
+#=
+# Copyright 2001-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+MACRO(java_append_library_directories _var)
+# Determine java arch-specific library subdir
+# Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
+# 1.6.0_18 + icedtea patches. However, it would be much better to base the
+# guess on the first part of the GNU config.guess platform triplet.
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch amd64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^i.86$)
+SET(_java_libarch i386)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^alpha)
+SET(_java_libarch alpha)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^arm)
+# Subdir is arm for both big-endian (arm) and little-endian (armel).
+SET(_java_libarch arm)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^mips)
+# mips* machines are bi-endian mostly so processor does not tell
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/data-formatting-doc into lp:zorba/process-module
The proposal to merge lp:~zorba-coders/zorba/data-formatting-doc into lp:zorba/process-module has been updated. Commit Message changed to: Minor documentation improvements. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/126953 -- https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/126953 Your team Zorba Coders is subscribed to branch lp:zorba/process-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/data-formatting-doc into lp:zorba/process-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/126953 Your team Zorba Coders is subscribed to branch lp:zorba/process-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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
William Candillon has proposed merging lp:~zorba-coders/zorba/data-cleaning-module-doc into lp:zorba/data-cleaning-module. Commit message: Minor documentation improvements. Requested reviews: William Candillon (wcandillon) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 Minor documentation improvements. -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. === modified file 'src/com/zorba-xquery/www/modules/data-cleaning/character-based-string-similarity.xq' --- src/com/zorba-xquery/www/modules/data-cleaning/character-based-string-similarity.xq 2011-10-19 02:03:22 + +++ src/com/zorba-xquery/www/modules/data-cleaning/character-based-string-similarity.xq 2012-09-28 13:37:23 + @@ -27,7 +27,7 @@ : The logic contained in this module is not specific to any particular XQuery implementation. : : @author Bruno Martins and Diogo Simões - : @project data processing/data cleaning + : @project Zorba/Data Cleaning/Character-Based String Similarity :) module namespace simc = http://www.zorba-xquery.com/modules/data-cleaning/character-based-string-similarity;; @@ -43,9 +43,9 @@ : being insertion, deletion, or substitution of a single character. : : br/ - : Example usage : pre edit-distance(FLWOR, FLOWER) /pre + : Example usage : codeedit-distance(FLWOR, FLOWER)/code : br/ - : The function invocation in the example above returns : pre 2 /pre + : The function invocation in the example above returns : code2/code : : @param $s1 The first string. : @param $s2 The second string. @@ -71,9 +71,9 @@ : normalized such that 0 equates to no similarity and 1 is an exact match. : : br/ - : Example usage : pre jaro(FLWOR Found., FLWOR Foundation) /pre + : Example usage : codejaro(FLWOR Found., FLWOR Foundation)/code : br/ - : The function invocation in the example above returns : pre 0.5853174603174603 /pre + : The function invocation in the example above returns : code0.5853174603174603/code : : @param $s1 The first string. : @param $s2 The second string. @@ -103,9 +103,9 @@ : penalizes strings based on their similarity at the beginning of the string, up to a given prefix size. : : br/ - : Example usage : pre jaro-winkler(DWAYNE, DUANE, 4, 0.1 ) /pre + : Example usage : codejaro-winkler(DWAYNE, DUANE, 4, 0.1 )/code : br/ - : The function invocation in the example above returns : pre 0.8578 /pre + : The function invocation in the example above returns : code0.8578/code : : @param $s1 The first string. : @param $s2 The second string. @@ -129,9 +129,9 @@ : distance metric. : : br/ - : Example usage : pre needleman-wunsch(KAK, KQRK, 1, 1) /pre + : Example usage : codeneedleman-wunsch(KAK, KQRK, 1, 1)/code : br/ - : The function invocation in the example above returns : pre 0 /pre + : The function invocation in the example above returns : code0/code : : @param $s1 The first string. : @param $s2 The second string. @@ -155,9 +155,9 @@ : Returns the Smith-Waterman distance between two strings. : : br/ - : Example usage : pre smith-waterman(ACACACTA, AGCACACA, 2, 1) /pre + : Example usage : codesmith-waterman(ACACACTA, AGCACACA, 2, 1)/code : br/ - : The function invocation in the example above returns : pre 12 /pre + : The function invocation in the example above returns : code12/code : : @param $s1 The first string. : @param $s2 The second string. === modified file 'src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq' --- src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq 2012-04-27 15:19:46 + +++ src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq 2012-09-28 13:37:23 + @@ -22,11 +22,10 @@ : : The logic contained in this module is not specific to any particular XQuery implementation, : although the consolidation functions based on matching sequences against XPath expressions require - : some form of dynamic evaluation for XPath expressions, - : such as the x:eval() function provided in the Qizx XQuery Engine. + : some form of dynamic evaluation for XPath expressions. : : @author Bruno Martins - : @project data processing/data cleaning + : @project Zorba/Data Cleaning/Consolidation :) module namespace con = http://www.zorba-xquery.com/modules/data-cleaning/consolidation;; @@ -42,9 +41,9 @@ : If more then one answer is possible, returns the first node according to the order of the input sequence. : : br/ - : Example usage : pre most-frequent( ( a, a, b) ) /pre + : Example usage : codemost-frequent( ( a, a, b) )/code : br/ - : The function invocation in the example above returns : pre (a) /pre + : The function invocation in the example above returns : code(a)/code : : @param $s A sequence of nodes. : @return The most frequent node
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/data-cleaning-module-doc into lp:zorba/data-cleaning-module
The proposal to merge lp:~zorba-coders/zorba/data-cleaning-module-doc into lp:zorba/data-cleaning-module has been updated. Commit Message changed to: Minor documentation improvements. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xslt-doc into lp:zorba/languages-module
The proposal to merge lp:~zorba-coders/zorba/xslt-doc into lp:zorba/languages-module has been updated. Commit Message changed to: Minor documentation improvements For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xslt-doc/+merge/126969 -- https://code.launchpad.net/~zorba-coders/zorba/xslt-doc/+merge/126969 Your team Zorba Coders is subscribed to branch lp:zorba/languages-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/xslt-doc into lp:zorba/languages-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xslt-doc/+merge/126969 Your team Zorba Coders is subscribed to branch lp:zorba/languages-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/archive-doc into lp:zorba/archive-module
William Candillon has proposed merging lp:~zorba-coders/zorba/archive-doc into
lp:zorba/archive-module.
Commit message:
Minor documentation improvement.
Requested reviews:
William Candillon (wcandillon)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/archive-doc/+merge/126972
Minor documentation improvement.
--
https://code.launchpad.net/~zorba-coders/zorba/archive-doc/+merge/126972
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.
=== modified file 'src/archive_module.xq'
--- src/archive_module.xq 2012-08-02 21:11:32 +
+++ src/archive_module.xq 2012-09-28 14:01:27 +
@@ -32,6 +32,7 @@
: @author Luis Rodgriguez, Juan Zacarias, and Matthias Brantner
:
: @library a href=http://code.google.com/p/libarchive/;libarchive/a
+ : @project Zorba/Archive
:)
module namespace a = http://www.zorba-xquery.com/modules/archive;;
@@ -89,22 +90,18 @@
:
: pFor example, the following sequence may be used to describe an archive
: containing three elements:
- : pre
- : lt;a:entry last-modified={fn:current-dateTime()}myfile.txtlt;/a:entry
- : lt;a:entry encoding=ISO-8859-1 compression=storedir/myfile.xmllt;/a:entry
- : /pre
+ : pre class=ace-static ace-mode=xquery![CDATA[a:entry last-modified={fn:current-dateTime()}myfile.txt/a:entry
+ : a:entry encoding=ISO-8859-1 compression=storedir/myfile.xml/a:entry]]/pre
: /p
:
: pThe $options argument may be used to describe general options for the
: archive. For example, the following option element can be used to create a ZIP
: archive in which all entries are compressed with the DEFLATE compression
: algorithm:
- : pre
- : lt;archive:options
- : lt;archive:formatZIPlt;/archive:format
- : lt;archive:compressionDEFLATElt;/archive:compression
- : lt;/archive:options
- : /pre
+ : pre class=ace-static ace-mode=xquery![CDATA[archive:options
+ : archive:formatZIP/archive:format
+ : archive:compressionDEFLATE/archive:compression
+ : /archive:options]]/pre
: /p
:
: pThe result of the function is the generated archive as a item of type
@@ -274,12 +271,10 @@
: Returns the algorithm and format options of the given archive.
: For example, for a ZIP archive, the following options element
: would be returned:
- : pre
- : lt;archive:options
- : lt;archive:formatZIPlt;/archive:format
- : lt;archive:compressionDEFLATElt;/archive:compression
- : lt;/archive:options
- : /pre
+ : pre class=ace-static ace-mode=xquery![CDATA[archive:options
+ : archive:formatZIPlt;/archive:format
+ : archive:compressionDEFLATElt;/archive:compression
+ : /archive:options]]/pre
:
: @param $archive the archive as xs:base64Binary
:
--
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/archive-doc into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/archive-doc/+merge/126972 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/archive-doc into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/archive-doc into lp:zorba/archive-module has been updated. Commit Message changed to: Minor documentation improvement. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/archive-doc/+merge/126972 -- https://code.launchpad.net/~zorba-coders/zorba/archive-doc/+merge/126972 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/excel-doc into lp:zorba/excel-module
William Candillon has proposed merging lp:~zorba-coders/zorba/excel-doc into lp:zorba/excel-module. Commit message: Minor documentation improvement. Requested reviews: William Candillon (wcandillon) Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/excel-doc/+merge/126975 Minor documentation improvement. -- https://code.launchpad.net/~zorba-coders/zorba/excel-doc/+merge/126975 Your team Zorba Coders is subscribed to branch lp:zorba/excel-module. === modified file 'src/com/zorba-xquery/www/modules/excel/datetime.xq' --- src/com/zorba-xquery/www/modules/excel/datetime.xq 2011-08-18 02:56:56 + +++ src/com/zorba-xquery/www/modules/excel/datetime.xq 2012-09-28 14:08:22 + @@ -23,9 +23,8 @@ : @see a href=http://office.microsoft.com/en-us/excel/CH062528231033.aspx; : target=_blankExcel Documentation: Datetime Functions/a : - : @spec XQuery Specification: January 2007 : @author Sorin Nasoi - : @project excel + : @project Zorba/Excel/Datetime : :) module namespace excel-datetime = http://www.zorba-xquery.com/modules/excel/datetime; ; === modified file 'src/com/zorba-xquery/www/modules/excel/engineering.xq' --- src/com/zorba-xquery/www/modules/excel/engineering.xq 2011-08-18 02:56:56 + +++ src/com/zorba-xquery/www/modules/excel/engineering.xq 2012-09-28 14:08:22 + @@ -25,7 +25,7 @@ : @see a href=http://office.microsoft.com/en-us/excel/CH062528241033.aspx; : target=_blankExcel Documentation: Engineering Functions/a : - : @project excel + : @project Zorba/Excel/Engineering :) module namespace excel-engineering = http://www.zorba-xquery.com/modules/excel/engineering; ; === modified file 'src/com/zorba-xquery/www/modules/excel/information.xq' --- src/com/zorba-xquery/www/modules/excel/information.xq 2011-08-18 02:56:56 + +++ src/com/zorba-xquery/www/modules/excel/information.xq 2012-09-28 14:08:22 + @@ -25,7 +25,7 @@ : @see a href=http://office.microsoft.com/en-us/excel/CH062528261033.aspx; : target=_blankExcel Documentation: Information Functions/a : - : @project excel + : @project Zorba/Excel/Information :) module namespace excel-information = http://www.zorba-xquery.com/modules/excel/information; ; === modified file 'src/com/zorba-xquery/www/modules/excel/logical.xq' --- src/com/zorba-xquery/www/modules/excel/logical.xq 2011-08-18 02:56:56 + +++ src/com/zorba-xquery/www/modules/excel/logical.xq 2012-09-28 14:08:22 + @@ -24,7 +24,7 @@ : : @see a href=http://office.microsoft.com/en-us/excel/CH062528271033.aspx; : target=_blankExcel Documentation: Logical Functions/a - : @project excel + : @project Zorba/Excel/Logical : :) (: for False,Not and True use fn:false(), fn:not(), fn:true() :) === modified file 'src/com/zorba-xquery/www/modules/excel/lookup.xq' --- src/com/zorba-xquery/www/modules/excel/lookup.xq 2011-08-18 02:56:56 + +++ src/com/zorba-xquery/www/modules/excel/lookup.xq 2012-09-28 14:08:22 + @@ -22,9 +22,8 @@ : @see a href=http://office.microsoft.com/en-us/excel/CH062528281033.aspx; : target=_blankExcel 2003 Documentation: Lookup Functions/a : - : @spec XQuery Specification: January 2007 : @author Daniel Turcanu - : @project excel + : @project Zorba/Excel/Lookup : :) module namespace excel = http://www.zorba-xquery.com/modules/excel/lookup; ; === modified file 'src/com/zorba-xquery/www/modules/excel/math-sumproduct.xq' --- src/com/zorba-xquery/www/modules/excel/math-sumproduct.xq 2011-08-18 02:56:56 + +++ src/com/zorba-xquery/www/modules/excel/math-sumproduct.xq 2012-09-28 14:08:22 + @@ -25,9 +25,8 @@ : @see a href=http://office.microsoft.com/en-us/excel/HP052092931033.aspx; : target=_blankExcel 2003 Documentation: Math-sumproduct Functions/a : - : @spec XQuery Specification: January 2007 : @author Daniel Turcanu - : @project excel + : @project Zorba/Excel/Math Sumproduct : :) module namespace excel = http://www.zorba-xquery.com/modules/excel/math-sumproduct;; === modified file 'src/com/zorba-xquery/www/modules/excel/math.xq' --- src/com/zorba-xquery/www/modules/excel/math.xq 2011-08-18 02:56:56 + +++ src/com/zorba-xquery/www/modules/excel/math.xq 2012-09-28 14:08:22 + @@ -23,9 +23,8 @@ : @see a href=http://office.microsoft.com/en-us/excel/CH062528291033.aspx; : target=_blankExcel 2003 Documentation: Math Functions/a : - : @spec XQuery Specification: January 2007 : @author Daniel Turcanu - : @project excel + : @project Zorba/Excel/Math : :) module namespace excel = http://www.zorba-xquery.com/modules/excel/math; ; === modified file 'src/com/zorba-xquery/www/modules/excel/statistical-zorba.xq' --- src/com/zorba-xquery/www/modules/excel/statistical-zorba.xq 2011-08-18 02:56:56 + +++ src/com/zorba-xquery/www/modules/excel/statistical-zorba.xq 2012-09-28 14:08:22 + @@ -23,7 +23,7 @@ : : @Author Daniel Turcanu : @See http://office.microsoft.com/en-us/excel/CH062528311033.aspx
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/excel-doc into lp:zorba/excel-module
The proposal to merge lp:~zorba-coders/zorba/excel-doc into lp:zorba/excel-module has been updated. Commit Message changed to: Minor documentation improvement. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/excel-doc/+merge/126975 -- https://code.launchpad.net/~zorba-coders/zorba/excel-doc/+merge/126975 Your team Zorba Coders is subscribed to branch lp:zorba/excel-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/expath_http_doc into lp:zorba/http-client-module
Thanks a lot I didn't catch it. I will fix this and merge the branch. -- https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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/xpath_doc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xpath_doc into lp:zorba has been updated. Commit Message changed to: Update the XPath module documentation. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/126681 -- https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/126681 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/process_doc into lp:zorba/process-module
William Candillon has proposed merging lp:~zorba-coders/zorba/process_doc into lp:zorba/process-module. Commit message: Minor documentation improvements. Requested reviews: William Candillon (wcandillon) Cezar Andrei (cezar-andrei) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/process_doc/+merge/126738 Minor documentation improvements. -- https://code.launchpad.net/~zorba-coders/zorba/process_doc/+merge/126738 Your team Zorba Coders is subscribed to branch lp:zorba/process-module. === modified file 'src/com/zorba-xquery/www/modules/process.xq' --- src/com/zorba-xquery/www/modules/process.xq 2012-04-11 09:50:21 + +++ src/com/zorba-xquery/www/modules/process.xq 2012-09-27 16:56:39 + @@ -21,22 +21,22 @@ : (i.e. exit code, result on standard out and error). : : Example: - :pre class=brush: xquery; + :pre class=ace-static ace-mode=xquery : import module namespace proc = http://www.zorba-xquery.com/modules/process;; : proc:exec(ls) :/pre : : Potential result: - : pre - : lt;result xmlns=http://www.zorba-xquery.com/modules/process; - : lt;stdoutmyfile.txtlt;/stout - : lt;stderr/ - : lt;exit-code0lt;/exit-code - : lt;/result - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[ + : result xmlns=http://www.zorba-xquery.com/modules/process; + : stdoutmyfile.txt/stout + : stderr/ + : exit-code0/exit-code + : /result + : ]]/pre : : @author Cezar Andrei - : @project external + : @project Zorba/IO/Process : :) module namespace process = http://www.zorba-xquery.com/modules/process;; -- 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
