Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqxq-url-resolver into lp:zorba/xqxq-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
The proposal to merge lp:~zorba-coders/zorba/xqxq-url-resolver into lp:zorba/xqxq-module has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
Validation queue job xqxq-url-resolver-2012-10-19T01-22-47.205Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-url-resolver-2012-10-19T01-22-47.205Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
The proposal to merge lp:~zorba-coders/zorba/xqxq-url-resolver into lp:zorba/xqxq-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
Review: Approve Now using HOF! -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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-xqxq-url-resolver into lp:zorba
Review: Disapprove No longer needed with HOF-based XQXQ implementation. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/xqxq-url-resolver into lp:zorba/xqxq-module
The proposal to merge lp:~zorba-coders/zorba/xqxq-url-resolver into lp:zorba/xqxq-module has been updated. Commit Message changed to: Bug 903797: add feature to prepare-main-module() to enable URI mappers and URL resolvers written in XQuery. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/zorba-xqxq-url-resolver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/xqxq-url-resolver into lp:zorba/xqxq-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/xqxq-url-resolver
into lp:zorba/xqxq-module.
Commit message:
Bug 903797: add feature to prepare-main-module() to enable URI mappers and URL
resolvers written in XQuery.
Requested reviews:
Chris Hillery (ceejatec)
Matthias Brantner (matthias-brantner)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #903797 in Zorba: "XQXQ feature request: custom schema uri resolver"
https://bugs.launchpad.net/zorba/+bug/903797
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460
--
https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460
Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-module.
=== modified file 'src/xqxq.xq'
--- src/xqxq.xq 2012-09-28 13:48:30 +
+++ src/xqxq.xq 2012-10-19 01:17:21 +
@@ -26,9 +26,12 @@
module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
declare namespace an = "http://www.zorba-xquery.com/annotations";;
-
declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace op = "http://www.zorba-xquery.com/options/features";;
+declare namespace f = "http://www.zorba-xquery.com/features";;
+
declare option ver:module-version "1.0";
+declare option op:enable "f:hof";
(:~
: The function prepares a given XQuery program for execution.
@@ -56,6 +59,106 @@
xs:anyURI external;
(:~
+ : The function prepares a given XQuery program for execution.
+ : If the program was successfully compiled, the function returns an
+ : identifier as xs:anyURI. This URI can be passed to other functions
+ : of this module (e.g. to actually evaluate the program). The URI
+ : is opaque and its lilfetime is bound by the lifetime of the XQuery
+ : program that invoked this function. Further reference or uses
+ : of the identifier lead to unexpected results.
+ :
+ : Important notes regarding the second and third parameters of the function:
+ : --
+ :
+ : These parameters allow you to specify a URL resolver and a URI mapper
+ : for Zorba to use when executing this query. See
+ : http://www.zorba-xquery.com/html/documentation/2.7.0/zorba/uriresolvers
+ :
+ : The second parameter is a function item for a URL
+ : resolver. The URL resolver function must recive 2 parameters:
+ : A $namespace as xs:string that will contain the url to be resolved.
+ : A $entity as xs:string that will contain the type of resolving needed;
+ : this can be 2 values "module" and "schema".
+ : The function must return an empty sequence when the specified $namespace
+ : or $entity are not the ones to be resolved.
+ :
+ : Example:
+ :
+ : declare function mymod:url-resolver($namespace as xs:string, $entity as xs:string)
+ : {
+ : if($namespace = 'http://test.xq')
+ : then "module namespace test = 'http://test'; declare function test:foo(){'foo'};"
+ : else ()
+ : };
+ :
+ : The URL resolver function's namespace, name, and parameter naming are
+ : not restricted by XQXQ.
+ :
+ : The URL resolver function's return type is not restricted, it could be a string, a sequence,
+ : a node, etc. All the outputs types are to be serialized as a string.
+ :
+ : The third parameter is a function item for a URI mapper.
+ : The URI mapper function, just like the URL resolver, receives 2 parameters:
+ : A $namespace as xs:string that will contain the URI to be mapped.
+ : A $entity as xs:string that will contain the type of resolving needed;
+ : this can be 2 values "module" and "schema".
+ : The URI mapper must return an empty sequence when the specified $namesapce or $entity
+ : are not to be mapped. Unlike the URL resolver this function must return a sequence of strings.
+ :
+ : Example:
+ :
+ : declare function mymod:uri-mapper($namespace as xs:string, $entity as xs:string)
+ : {
+ : if($namespace = 'http://test')
+ : then ("http://www.zorba-xquery.com/test";, "http://foo.com/schema/test";)
+ : else ()
+ : };
+ :
+ : The URI mapper function's namespace, name, and parameter naming are
+ : not restricted by XQXQ.
+ :
+ : In order to pass the above URL resolver and URI mapper to this function,
+ : use the following syntax:
+ :
+ : variable $queryID := xqxq:prepare-main-module("..query text..",
+ : mymod:url-resolver#2, mymod:uri-mapper#2);
+ :
+ : That is, the QName of the function followed by "#2". This is XQuery
+ : "higher-order function" syntax, meaning the function with the specified
+ : QName which takes two arguments. Since URL resolvers and URI mappers
+ : must take two arguments, both will always be specified with "#2".
+ :
+ : Note that parameters 2 and 3 should be declared as follows:
+ :as function($url as xs:string, $entity as xs:string) as item()
+ :as function($uri as xs:string, $entity as xs:string) as xs:string*
+ : However Zorba's implementation of higher-order functions (HOF) is not
+ : yet complete enough to allow for
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1068323 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1068323/+merge/130434 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/bug1068323 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1068323 into lp:zorba has been updated. Commit Message changed to: This is working on linux very well, seems that cmake don't like quoted variables or file variables if they doesn't exist yet. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1068323/+merge/130434 -- https://code.launchpad.net/~zorba-coders/zorba/bug1068323/+merge/130434 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/bug1068323 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1068323 into
lp:zorba.
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
Related bugs:
Bug #1068323 in Zorba: "Zorba don't install zorba_api.jar"
https://bugs.launchpad.net/zorba/+bug/1068323
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1068323/+merge/130434
Fix for Linux installer
--
https://code.launchpad.net/~zorba-coders/zorba/bug1068323/+merge/130434
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'swig/java/CMakeLists.txt'
--- swig/java/CMakeLists.txt 2012-09-19 21:16:15 +
+++ swig/java/CMakeLists.txt 2012-10-18 21:37:20 +
@@ -75,29 +75,28 @@
SET (JAVA_SITEARCH_DIR ${CMAKE_INSTALL_PREFIX}/share/java)
ENDIF (${CMAKE_INSTALL_PREFIX} EQUAL "/usr/local")
- FILE(GLOB JAVA_SWIG_FILES "${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar")
- SET(ZORBA_JAVA_JAR "${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar" PARENT_SCOPE )
+ SET(ZORBA_JAVA_JAR ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar PARENT_SCOPE )
IF ( APPLE )
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}libzorba_api.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
- INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
ELSE ( APPLE )
IF(NOT WIN32)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so DESTINATION ${JAVA_SITEARCH_DIR})
- INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
ELSE(NOT WIN32)
IF (MSVC_IDE)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/zorba_api.dll
DESTINATION share/java
COMPONENT "java_swig")
-INSTALL(FILES ${JAVA_SWIG_FILES}
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar
DESTINATION share/java
COMPONENT "java_swig")
ELSE (MSVC_IDE)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.dll
DESTINATION share/java
COMPONENT "java_swig")
-INSTALL(FILES ${JAVA_SWIG_FILES}
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar
DESTINATION share/java
COMPONENT "java_swig")
ENDIF (MSVC_IDE)
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-10-18T20-19-00.223Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-10-18T20-19-00.223Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
changed some scripting tests to cmply with the current syntax of the scripting
spec.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422
changed some scripting tests to cmply with the current syntax of the scripting
spec.
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130422
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-10-12 10:46:46 +
+++ ChangeLog 2012-10-18 20:10:32 +
@@ -13,6 +13,7 @@
position that is negative)
* Fixed bug #1061222 (bad message for errors in index key type declaration)
* Fixed bug #1065175 (preceding::node()[1] returns wrong results)
+ * Fixed bug #1065321 (following:text() doesn't return results in doc order)
* Fixed bug #1021492 (while computeing the "sources" of a prolog var, skip
any var-setting exprs that appear in non-used (and non-optimized) functions).
=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc.xq 2012-10-08 12:09:36 +
+++ modules/com/zorba-xquery/www/modules/xqdoc.xq 2012-10-18 20:10:32 +
@@ -139,6 +139,7 @@
$filename as xs:string
) as element() external;
+
(:~
: Generated the an XQDoc XML document for the module provided
: as parameter to this function.
@@ -157,6 +158,7 @@
xqd:xqdoc-content-impl($module, "")
};
+
(:~
: Generated the an XQDoc XML document for the module provided
: as parameter to this function.
=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2012-09-19 21:16:15 +
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2012-10-18 20:10:32 +
@@ -278,6 +278,8 @@
xqdoc2html:copy-files($xhtmlRequisitesPath, $cssPath,"css");
file:create-directory($schemasPath);
+
+ ()
}
};
@@ -693,11 +695,11 @@
fn:not(fn:matches($exampleSource, $search-queries))) then
file:write( $exampleDestination,
xqdoc2html:create-xhtml-wrapper($exampleContent,"xquery"),
-$xqdoc2html:serParamXhtml)
+$xqdoc2html:serParamXhtml);
else if (fn:matches($exampleContent, "output", "i")) then
file:write( $exampleDestination,
xqdoc2html:create-xhtml-wrapper($exampleContent,"xquery"),
-$xqdoc2html:serParamXhtml)
+$xqdoc2html:serParamXhtml);
else
let $specSource := fn:replace($exampleSource, "[.]xq$", ".spec")
return
=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp 2012-10-08 12:09:36 +
+++ src/compiler/expression/expr_type.cpp 2012-10-18 20:10:32 +
@@ -316,60 +316,14 @@
{
fo_expr* e = static_cast(this);
-const function* func = e->get_func();
/*
const user_function* udf = dynamic_cast(func);
if (udf != NULL)
return udf->getUDFReturnType(sctx);
*/
-FunctionConsts::FunctionKind funcKind = func->getKind();
-
-switch (funcKind)
-{
-case FunctionConsts::STATIC_COLLECTIONS_DML_COLLECTION_1:
-{
- const store::Item* qname = e->theArgs[0]->getQName(theSctx);
-
- if (qname != NULL)
- {
-const StaticallyKnownCollection* collection = theSctx->lookup_collection(qname);
-if (collection != NULL)
-{
- newType = collection->getCollectionType();
-}
-else
-{
- RAISE_ERROR(zerr::ZDDY0001_COLLECTION_NOT_DECLARED, get_loc(),
- ERROR_PARAMS(qname->getStringValue()));
-}
- }
- break;
-}
-case FunctionConsts::FN_SUBSEQUENCE_3:
-{
- const_expr* lenExpr = dynamic_cast(e->theArgs[2]);
-
- if (lenExpr != NULL)
- {
-store::Item* val = lenExpr->get_val();
-xs_double len = val->getDoubleValue();
-if (len == 1.0)
-{
- newType = tm->create_type(*e->theArgs[0]->get_return_type(),
-TypeConstants::QUANT_QUESTION);
-}
- }
- break;
-}
-default:
- break;
-}
-
-if (newType == NULL)
-{
- newType = e->theFunction->getReturnType(e);
-}
+
+newType = e->theFunction->getReturnType(e);
break;
}
=== modified file 'src/compiler/expression/flwor_expr.h'
--- src/compiler/expression/flwor_expr.h 2012-10-09 14:06:08 +
+++ src/compiler/expression/flwor_expr.h 2012-10-18 20:10:32 +
@@ -45,6 +45,7 @@
/
class flwor_clause
{
+ friend class expr;
friend class flwor_expr;
friend class ExprIterator;
friend class ExprManager;
@@ -139,6 +140,7 @@
**
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqxq-url-resolver into lp:zorba/xqxq-module
Review: Needs Fixing I don't feel comfortable with the QName solution. It would be great if HOFs could be used for this. As far as I understood earlier discussions, this should have been developed together with Nicolae. Using HOFs would also solve the static context problem. Maybe the HOF feature already allows this relatively simple use case. Can a sequence of mappers be registered? The documentation should say that mapper:uri-mapper should return xs:string*. s/lilfetime/lifetime s/recive/receive s/namesapce/namespace s/th /the / -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/123604 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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-xqxq-url-resolver into lp:zorba
Review: Needs Information I would really like to avoid this special case and the string comparison on the function call. What about using a function annotation? -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
Validation queue job zorba-xqxq-url-resolver-2012-10-18T09-14-46.434Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-xqxq-url-resolver-2012-10-18T09-14-46.434Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/xqxq-url-resolver into lp:zorba/xqxq-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/123604 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/zorba-xqxq-url-resolver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-xqxq-url-resolver into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/zorba-xqxq-url-resolver into lp:zorba
Validation queue job zorba-xqxq-url-resolver-2012-10-18T06-48-00.823Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/xqxq-url-resolver into lp:zorba/xqxq-module
Whoops, right - this merge proposal won't pass until https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 is merged. Ignore these test failures for now. -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/123604 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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
