[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Stage "TestZorbaUbuntu" failed. 6 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/165/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Stage "AddTestSuitesUbuntu" failed. Check console output at http://jenkins.lambda.nu/job/AddTestSuitesUbuntu/165/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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-942171 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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/mz-schema-tools-module into lp:zorba/schema-tools-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 Stage "ZorbaVQ" failed. Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/218/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 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/mz-schema-tools-module into lp:zorba/schema-tools-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 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/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into lp:zorba. Commit message: re-enabled languages and schema tools modules Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 re-enabled languages and schema tools modules -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2013-08-05 15:31:02 + +++ modules/ExternalModules.conf 2013-08-05 19:23:28 + @@ -39,7 +39,7 @@ http-client bzr lp:zorba/http-client-module zorba-2.9 image bzr lp:zorba/image-module jdbcbzr lp:zorba/jdbc-module -#languages bzr lp:zorba/languages-module +languages bzr lp:zorba/languages-module oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module oauth bzr lp:zorba/oauth-modulezorba-2.9 process bzr lp:zorba/process-module @@ -48,7 +48,7 @@ system bzr lp:zorba/system-module zorba-2.9 email bzr lp:zorba/email-module util-jvmbzr lp:zorba/util-jvm-module -#schema-toolsbzr lp:zorba/schema-tools-module +schema-toolsbzr lp:zorba/schema-tools-module stack bzr lp:zorba/stack-module queue bzr lp:zorba/queue-module couchbase bzr 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/mz-schema-tools-module into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/mz-schema-tools-module into lp:zorba/schema-tools-module has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 -- https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 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/mz-schema-tools-module into lp:zorba/schema-tools-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 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/mz-schema-tools-module into lp:zorba/schema-tools-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 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/mz-schema-tools-module into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620 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/mz-schema-tools-module into lp:zorba/schema-tools-module
Markos Zaharioudakis has proposed merging
lp:~zorba-coders/zorba/mz-schema-tools-module into lp:zorba/schema-tools-module.
Commit message:
XmlDataManager is not a singleton anymore
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620
XmlDataManager is not a singleton anymore
--
https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.
=== modified file 'src/schema-tools.xq.src/schema-tools.cpp'
--- src/schema-tools.xq.src/schema-tools.cpp 2013-06-12 14:02:42 +
+++ src/schema-tools.xq.src/schema-tools.cpp 2013-08-05 18:27:25 +
@@ -57,13 +57,11 @@
private:
const ExternalModule* theModule;
ItemFactory* theFactory;
-XmlDataManager* theDataManager;
public:
Inst2xsdFunction(const ExternalModule* aModule) :
theModule(aModule),
- theFactory(Zorba::getInstance(0)->getItemFactory()),
- theDataManager(Zorba::getInstance(0)->getXmlDataManager())
+ theFactory(Zorba::getInstance(0)->getItemFactory())
{}
~Inst2xsdFunction()
@@ -77,23 +75,22 @@
{ return "inst2xsd-internal"; }
virtual ItemSequence_t
- evaluate(const ExternalFunction::Arguments_t& args,
- const zorba::StaticContext*,
- const zorba::DynamicContext*) const;
+evaluate(const ExternalFunction::Arguments_t& args,
+ const zorba::StaticContext*,
+ const zorba::DynamicContext*) const;
};
+
class Xsd2instFunction : public ContextualExternalFunction
{
private:
const ExternalModule* theModule;
ItemFactory* theFactory;
-XmlDataManager* theDataManager;
public:
Xsd2instFunction(const ExternalModule* aModule) :
theModule(aModule),
- theFactory(Zorba::getInstance(0)->getItemFactory()),
- theDataManager(Zorba::getInstance(0)->getXmlDataManager())
+ theFactory(Zorba::getInstance(0)->getItemFactory())
{}
~Xsd2instFunction()
@@ -355,7 +352,7 @@
//std::cout << " lBinaryString '" << lBinaryString << "'" << std::endl; std::cout.flush();
std::stringstream lStream(lBinaryString);
- Item lRes = theDataManager->parseXML(lStream);
+ Item lRes = Zorba::getInstance(0)->getXmlDataManager()->parseXML(lStream);
vec.push_back(lRes);
}
@@ -538,7 +535,7 @@
//std::cout << " lBinaryString '" << lBinaryString << "'" << std::endl; std::cout.flush();
std::stringstream lStream(lBinaryString);
-Item lRes = theDataManager->parseXML(lStream);
+Item lRes = Zorba::getInstance(0)->getXmlDataManager()->parseXML(lStream);
return ItemSequence_t(new SingletonItemSequence(lRes));
}
--
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/mz-schema-tools-module into lp:~zorba-coders/zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178618 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/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/mz-schema-tools-module into lp:~zorba-coders/zorba/schema-tools-module
Markos Zaharioudakis has proposed merging
lp:~zorba-coders/zorba/mz-schema-tools-module into
lp:~zorba-coders/zorba/schema-tools-module.
Commit message:
XmlDataManager is not a singleton anymore
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178618
XmlDataManager is not a singleton anymore
--
https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178618
Your team Zorba Coders is subscribed to branch
lp:~zorba-coders/zorba/schema-tools-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-06-14 12:39:26 +
+++ CMakeLists.txt 2013-08-05 18:21:28 +
@@ -17,12 +17,15 @@
PROJECT (zorba_schema-tools_module)
FIND_PACKAGE (zorba_util-jvm_module QUIET)
+INCLUDE ("${zorba_util-jvm_module_USE_FILE}")
IF (zorba_util-jvm_module_FOUND)
- ZORBA_FIND_JNI()
- FIND_PACKAGE(Java)
FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
INCLUDE ("${Zorba_USE_FILE}")
+
+ SET_CMAKE_MODULE_PATH ()
+ FIND_PACKAGE(JNI)
+ FIND_PACKAGE(Java)
IF (JNI_FOUND)
INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
=== added file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 1970-01-01 00:00:00 +
+++ cmake_modules/FindJNI.cmake 2013-08-05 18:21:28 +
@@ -0,0 +1,310 @@
+# - 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 2000-2009 Kitware, Inc., Insight Software Consortium
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# * Neither the names of Kitware, Inc., the Insight Software Consortium, nor
+# the names of their contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#=
+
+# 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
+# endianess of the underlying system.
+SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCH
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-lang-module into lp:zorba/languages-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610 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/mz-lang-module into lp:zorba/languages-module
The proposal to merge lp:~zorba-coders/zorba/mz-lang-module into lp:zorba/languages-module has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610 -- https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610 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/mz-lang-module into lp:zorba/languages-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610 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/mz-lang-module into lp:zorba/languages-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610 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/mz-lang-module into lp:zorba/languages-module
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/mz-lang-module
into lp:zorba/languages-module.
Commit message:
XmlDataManager is not a singleton any more
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610
XmlDataManager is not a singleton any more
--
https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610
Your team Zorba Coders is subscribed to branch lp:zorba/languages-module.
=== modified file 'src/com/zorba-xquery/www/modules/languages/xslt.xq.src/xslt.cpp'
--- src/com/zorba-xquery/www/modules/languages/xslt.xq.src/xslt.cpp 2011-08-13 00:08:39 +
+++ src/com/zorba-xquery/www/modules/languages/xslt.xq.src/xslt.cpp 2013-08-05 17:27:25 +
@@ -123,7 +123,7 @@
std::istringstream iss( resStr.c_str() );
- XmlDataManager* lDM = Zorba::getInstance(0)->getXmlDataManager();
+ XmlDataManager_t lDM = Zorba::getInstance(0)->getXmlDataManager();
try
{
return ItemSequence_t(new SingletonItemSequence(lDM->parseXML(iss)));
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 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/mz-htlm-module into lp:zorba/html-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Stage "ZorbaVQ" failed. Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/213/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 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/mz-htlm-module into lp:zorba/html-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571
:
Votes: {'Approve': 1, 'Pending': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571
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/bump_QT_snapshot_August_8th into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/86/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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/bump_QT_snapshot_August_8th into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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/bump_QT_snapshot_August_8th into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/85/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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/bump_QT_snapshot_August_8th into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571
:
Votes: {'Pending': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571
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/bump_QT_snapshot_August_8th into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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/bump_QT_snapshot_August_8th into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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/mz-htlm-module into lp:zorba/html-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into lp:zorba. Commit message: re-enabled html module Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 re-enabled html module -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2013-08-05 14:54:22 + +++ modules/ExternalModules.conf 2013-08-05 15:33:33 + @@ -35,7 +35,7 @@ geo bzr lp:zorba/geo-module geoproj bzr lp:zorba/geoproj-module zorba-2.9 graphvizbzr lp:zorba/graphviz-module zorba-2.9 -#htmlbzr lp:zorba/html-module zorba-2.9 +htmlbzr lp:zorba/html-module zorba-2.9 http-client bzr lp:zorba/http-client-module zorba-2.9 image bzr lp:zorba/image-module jdbcbzr lp:zorba/jdbc-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/mz-htlm-module into lp:zorba/html-module
The proposal to merge lp:~zorba-coders/zorba/mz-htlm-module into lp:zorba/html-module has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-htlm-module into lp:zorba/html-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-htlm-module into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-htlm-module into lp:zorba/html-module
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/mz-htlm-module
into lp:zorba/html-module.
Commit message:
XmlDataManager is not a singleton any more
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585
XmlDataManager is not a singleton any more
--
https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178585
Your team Zorba Coders is subscribed to branch lp:zorba/html-module.
=== modified file 'src/html.xq.src/html.cpp'
--- src/html.xq.src/html.cpp 2011-10-06 07:40:17 +
+++ src/html.xq.src/html.cpp 2013-08-05 15:23:31 +
@@ -25,8 +25,8 @@
namespace zorba
{
- namespace htmlmodule
- {
+namespace htmlmodule
+{
//*
//*
@@ -36,72 +36,80 @@
{
}
+
ItemSequence_t
ParseFunction::evaluate(
- const ExternalFunction::Arguments_t& aArgs,
- const StaticContext* aSctxCtx,
- const DynamicContext* aDynCtx) const
- {
-std::auto_ptr iss;
-std::istream *is;
-String docString;
-Item lStringItem, lOptionsItem;
-
-if (aArgs.size() >= 1)
-{
- Iterator_t lArg0Iter = aArgs[0]->getIterator();
- lArg0Iter->open();
- lArg0Iter->next(lStringItem);
- lArg0Iter->close();
-}
-
-if ( lStringItem.isStreamable() )
-{
- //
- // The "iss" auto_ptr can NOT be used since it will delete the stream that,
- // in this case, is a data member inside another object and not dynamically
- // allocated.
- //
- // We can't replace "iss" with "is" since we still need the auto_ptr for
- // the case when the result is not streamable.
- //
- is = &lStringItem.getStream();
-}
-else
-{
- docString = lStringItem.getStringValue();
- iss.reset (new std::istringstream(docString.c_str()));
- is = iss.get();
-}
-
-if (aArgs.size() == 2)
-{
- Iterator_t lArg1Iter = aArgs[1]->getIterator();
- lArg1Iter->open();
- lArg1Iter->next(lOptionsItem);
- lArg1Iter->close();
-}
-
-return ItemSequence_t(new SingletonItemSequence(
- createHtmlItem( *is , lOptionsItem )));
- }
-
-//*
-//*
-
-ItemFactory* HtmlModule::theFactory = 0;
+const ExternalFunction::Arguments_t& aArgs,
+const StaticContext* aSctxCtx,
+const DynamicContext* aDynCtx) const
+{
+ std::auto_ptr iss;
+ std::istream *is;
+ String docString;
+ Item lStringItem, lOptionsItem;
+
+ if (aArgs.size() >= 1)
+ {
+Iterator_t lArg0Iter = aArgs[0]->getIterator();
+lArg0Iter->open();
+lArg0Iter->next(lStringItem);
+lArg0Iter->close();
+ }
+
+ if ( lStringItem.isStreamable() )
+ {
+//
+// The "iss" auto_ptr can NOT be used since it will delete the stream that,
+// in this case, is a data member inside another object and not dynamically
+// allocated.
+//
+// We can't replace "iss" with "is" since we still need the auto_ptr for
+// the case when the result is not streamable.
+//
+is = &lStringItem.getStream();
+ }
+ else
+ {
+docString = lStringItem.getStringValue();
+iss.reset (new std::istringstream(docString.c_str()));
+is = iss.get();
+ }
+
+ if (aArgs.size() == 2)
+ {
+Iterator_t lArg1Iter = aArgs[1]->getIterator();
+lArg1Iter->open();
+lArg1Iter->next(lOptionsItem);
+lArg1Iter->close();
+ }
+
+ return ItemSequence_t(
+ new SingletonItemSequence(createHtmlItem(*is, lOptionsItem)));
+}
+
+
+//*
+//*
+HtmlModule::HtmlModule()
+{
+ Zorba* engine = Zorba::getInstance(0);
+
+ theFactory = engine->getItemFactory();
+}
+
HtmlModule::~HtmlModule()
{
for ( FuncMap_t::const_iterator lIter = theFunctions.begin();
lIter != theFunctions.end();
++lIter)
- {
- delete lIter->second;
- }
- theFunctions.clear();
+ {
+delete lIter->second;
+ }
+ theFunctions.clear();
}
+
ExternalFunction*
HtmlModule::getExternalFunction(const String& aLocalname)
{
@@ -127,6 +135,8 @@
}
delete this;
}
+
+
//*
//*
=== modified file 'src/html.xq.src/html.h'
--- src/html.xq.src/html.h 2011-10-06 07:40:17 +
+++ src/html.xq.src/html.h 2013-08-05 15:23:31 +
@@ -26,87 +26,85 @@
{
namespace htmlmodule
{
-//*
-//***
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/mz-htlm-module into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178573 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Stage "TestZorbaUbuntu" failed. 11 tests failed (8376 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/156/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/bump_QT_snapshot_August_8th into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 Stage "TestZorbaUbuntu" failed. 1 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/155/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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/mz-htlm-module into lp:zorba/html-module
The proposal to merge lp:~zorba-coders/zorba/mz-htlm-module into lp:zorba/html-module has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178573 -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178573 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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/mz-htlm-module into lp:zorba/html-module
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/mz-htlm-module into lp:zorba/html-module. Commit message: XmlDataManager is not a singleton anymore Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178573 XmlDataManager is not a singleton anymore -- https://code.launchpad.net/~zorba-coders/zorba/mz-htlm-module/+merge/178573 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba
Sorin Marian Nasoi has proposed merging
lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba.
Commit message:
- bumped QT snapshot to August 5th
- removed the environment checking for the default collection and collations
other tahn Unicode Codepoint Collection
- added necessary dependencies in FOTSZorbaManifest for
'non_unicode_codepoint_collation' and 'non_empty_sequence_collection'
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571
--
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/ImportFOTS.cmake'
--- test/fots/ImportFOTS.cmake 2013-07-24 14:14:43 +
+++ test/fots/ImportFOTS.cmake 2013-08-05 13:54:28 +
@@ -23,8 +23,8 @@
#this is the official QT 1.0 release from 21st June 2013
#SET (FOTS_ARCHIVE "QT3_1_0.tgz")
-#this is the QT CVS trunk version as from 24th July 2013
-SET (FOTS_ARCHIVE "QT_240713.tgz")
+#this is the QT CVS trunk version as from 5th August 2013
+SET (FOTS_ARCHIVE "QT_050813.tgz")
# Change this to modify which elements in FOTS driver results are output
# as CDATA
=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
--- test/fots_driver/FOTSZorbaManifest.xml 2013-07-12 08:45:22 +
+++ test/fots_driver/FOTSZorbaManifest.xml 2013-08-05 13:54:28 +
@@ -11,6 +11,12 @@
+
+
+
+
+
+
=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq 2013-06-11 17:26:40 +
+++ test/fots_driver/environment.xq 2013-08-05 13:54:28 +
@@ -737,22 +737,3 @@
}
};
-(:~
- : Checks if a test case should be run. Possible reasons for not running a test
- : according to http://dev.w3.org/2011/QT3-test-suite/guide/running.html:
- : - the environment requires the setting of collections
- : - the environment requires the setting of collation URIs
- :
- :
- :)
-declare function env:check-prerequisites(
- $case as element(fots:test-case),
- $env as element(fots:environment)?
-) as xs:string?
-{
- if(exists($case/fots:environment/fots:collection) or exists($env/fots:collection))
- then 'Default collection is always an empty sequence.'
- else if (exists($case/fots:environment/fots:collation) or exists($env/fots:collation))
- then 'Can not define any other collations (other than the Unicode Codepoint Collation).'
- else ()
-};
=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq 2013-07-19 08:58:43 +
+++ test/fots_driver/fots-driver.xq 2013-08-05 13:54:28 +
@@ -906,9 +906,7 @@
$usePlanSerializer);
variable $duration := (datetime:current-dateTime() - $startDateTime);
-
-variable $prerequisitesError as xs:string? := env:check-prerequisites($case, $env);
-
+
variable $checkPass := feedback:check-pass($result, $queryName, $testSetName, $expFailureTC, $ctestMode);
if ($checkPass) then
@@ -920,15 +918,6 @@
$verbose,
$expFailureTC,
$ctestMode)
-(:
- If the test case did not pass, we check to see if the failure is caused
- by a environment that requires setting of a COLLATION or COLLECTION.
- There are over 130 test cases that are using an environment that requires
- setting a COLLATION or COLLECTION but they still PASS even if this setting
- is not done. That is why we first run the test case.
- :)
-else if (exists($prerequisitesError)) then
- feedback:not-applicable($case, $prerequisitesError)
else if ($expFailureTC/@finalStatus = "disputed") then
feedback:disputed($case,
concat("For details please see https://www.w3.org/Bugs/Public/show_bug.cgi?id=";,
=== modified file 'test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml'
--- test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-07-12 08:45:22 +
+++ test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-08-05 13:54:28 +
@@ -12,6 +12,12 @@
+
+
+
+
+
+
=== modified file 'test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml'
--- test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-07-12 08:45:22 +
+++ test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-08-05 13:54:28 +
@@ -12,6 +12,12 @@
+
+
+
+
+
+
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Stage "TestZorbaUbuntu" failed. 22 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/154/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/188/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Description changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) 10. bug fix in URI.cpp 11. thread-safe MAPM For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) 10. bug fix in URI.cpp 11. thread-safe MAPM For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Description changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) 10. bug fix in URI.cpp For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/187/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) 10. bug fix in URI.cpp For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/use-dataguide into lp:zorba
Review: Needs Fixing
1. The following query constructs the wrong dataguide (and returns the wrong
result):
jsoniq version "1.0";
declare variable $doc1 :=
"
{
\"foo\" : { \"name\" : \"moto\", \"price\" : 100 },
\"boo\" : { \"name\" : \"car\", \"price\" : 1000 }
}
";
let $v := exactly-one(jn:parse-json($doc1))
return
if ($v.foo.name eq "moto")
then
$v
else
()
2. The following query does not construct any dataguide at all, although it
should:
jsoniq version "1.0";
import module namespace ddl =
"http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
import module namespace dml =
"http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
declare variable $test external := 1;
ddl:create(xs:QName("sales"));
dml:insert-last(xs:QName("sales"),
( { "product" : { "name" : "broiler",
"price" : 100
},
"category1" : { "category3" :
{ "category4" : "value4" }
}
}
)
);
(
exactly-one
(
if ($test)
then
dml:collection(xs:QName("sales"))[1]
else
dml:collection(xs:QName("sales"))[2]
)
).category1
3. Window variables are not taken into account in getClauseVar
4. The implementation of the JsonDataguide rule does too much copying and
allocations of dataguides. I have the feeling that this is not necessary. For
example, what about the following approach?
- There is only one dataguide_cb allocated per JsonDataguide application. It
contains one entry for each json "source" encountered during the application of
the rule.
- There is also a single map from expr* to std::vector. The map contains
one entry for each expr that may receive return json items coming from a json
"source". The value of the entry is the set of "sources" for the key expr.
I may be missing something, but if this works, it will eliminate all
allocations and copies.
--
https://code.launchpad.net/~zorba-coders/zorba/use-dataguide/+merge/176385
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/use-dataguide into lp:zorba
Review: Needs Fixing
1. The following query constructs the wrong dataguide (and returns the wrong
result):
jsoniq version "1.0";
declare variable $doc1 :=
"
{
\"foo\" : { \"name\" : \"moto\", \"price\" : 100 },
\"boo\" : { \"name\" : \"car\", \"price\" : 1000 }
}
";
let $v := exactly-one(jn:parse-json($doc1))
return
if ($v.foo.name eq "moto")
then
$v
else
()
2. The following query does not construct any dataguide at all, although it
should:
jsoniq version "1.0";
import module namespace ddl =
"http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
import module namespace dml =
"http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
declare variable $test external := 1;
ddl:create(xs:QName("sales"));
dml:insert-last(xs:QName("sales"),
( { "product" : { "name" : "broiler",
"price" : 100
},
"category1" : { "category3" :
{ "category4" : "value4" }
}
}
)
);
(
exactly-one
(
if ($test)
then
dml:collection(xs:QName("sales"))[1]
else
dml:collection(xs:QName("sales"))[2]
)
).category1
3. Window variables are not taken into account in getClauseVar
4. The implementation of the JsonDataguide rule does too much copying and
allocations of dataguides. I have the feeling that this is not necessary. For
example, what about the following approach?
- There is only one dataguide_cb allocated per JsonDataguide application. It
contains one entry for each json "source" encountered during the application of
the rule.
- There is also a single map from expr* to std::vector. The map contains
one entry for each expr that may receive return json items coming from a json
"source". The value of the entry is the set of "sources" for the key expr.
I may be missing something, but if this works, it will eliminate all
allocations and copies.
--
https://code.launchpad.net/~zorba-coders/zorba/use-dataguide/+merge/176385
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
