Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Than why do I get this error again? [ 20%] Building CXX object src/CMakeFiles/zorba_simplestore.dir/api/base64_util.cpp.o In file included from /Users/cezar/dev/repo/z3.0/zorba-3.0/src/api/base64_util.cpp:24: In file included from /opt/local/include/zorba/util/base64_util.h:30: In file included from /opt/local/include/zorba/internal/ztd.h:28: /opt/local/include/zorba/internal/type_traits.h:25:11: fatal error: 'type_traits' file not found # include type_traits ^ 1 error generated. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 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
I had the package I built on Friday installed on my system, now it's uninstalled. But I still get the error of not finding type_traits file: [ 20%] Building CXX object src/CMakeFiles/zorba_simplestore.dir/api/base64_util.cpp.o In file included from /Users/cezar/dev/repo/z3.0/zorba-3.0/src/api/base64_util.cpp:24: In file included from /Users/cezar/dev/repo/z3.0/zorba-3.0/include/zorba/util/base64_util.h:30: In file included from /Users/cezar/dev/repo/z3.0/zorba-3.0/include/zorba/internal/ztd.h:28: /Users/cezar/dev/repo/z3.0/zorba-3.0/include/zorba/internal/type_traits.h:25:11: fatal error: 'type_traits' file not found # include type_traits ^ 1 error generated. Shouldn't this be protected by an use_c++11 flag? -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 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
I'm using standard Mountain Lion/Xcode compilers, I don't have anything special configured or even installed. From my previous experience, adding adding -std=c++11 flag fixes the error with finding the type_traits file: http://stackoverflow.com/questions/9345271/xcode-4-3-and-c11-include-paths So, this is why I suggested finding a way around including type_traits, if possible. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 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/mac-install-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864 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/mac-install-fix into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/mac-install-fix into
lp:zorba.
Requested reviews:
Cezar Andrei (cezar-andrei)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864
Fix install files for java, php, python and ruby libs.
--
https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'swig/java/CMakeLists.txt'
--- swig/java/CMakeLists.txt 2013-09-21 00:39:52 +
+++ swig/java/CMakeLists.txt 2013-11-05 00:12:40 +
@@ -78,8 +78,8 @@
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}zorba_api.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api_java.jnilib 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_java.so DESTINATION ${JAVA_SITEARCH_DIR})
=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt 2013-09-24 21:47:07 +
+++ swig/php/CMakeLists.txt 2013-11-05 00:12:40 +
@@ -59,8 +59,12 @@
#set project folder location for IDEs
SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES PROJECT_LABEL PHP FOLDER APIs)
- SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME zorba_api)
-
+ IF ( APPLE )
+SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME zorba_api_php)
+ ELSE ( APPLE )
+SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME zorba_api)
+ ENDIF ( APPLE )
+
IF (NOT WIN32 OR CYGWIN)
STRING (REPLACE ${CMAKE_INSTALL_PREFIX} PHP5_INSTALL_PATH ${PHP5_EXTENSION_DIR})
SET (PHP5_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/php5)
=== modified file 'swig/python/CMakeLists.txt'
--- swig/python/CMakeLists.txt 2013-09-24 21:47:07 +
+++ swig/python/CMakeLists.txt 2013-11-05 00:12:40 +
@@ -19,7 +19,12 @@
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
SWIG_ADD_MODULE (zorba_api_python python zorba_api.i)
SWIG_LINK_LIBRARIES (zorba_api_python zorba_simplestore ${PYTHON_LIBRARIES})
- SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME _zorba_api)
+
+ IF ( APPLE )
+SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME _zorba_api_python)
+ ELSE ( APPLE)
+SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME _zorba_api)
+ ENDIF (APPLE )
IF (MSVC_IDE)
SET_PROPERTY( TARGET _zorba_api_python PROPERTY PROJECT_LABEL Python)
=== modified file 'swig/ruby/CMakeLists.txt'
--- swig/ruby/CMakeLists.txt 2013-09-25 19:35:12 +
+++ swig/ruby/CMakeLists.txt 2013-11-05 00:12:40 +
@@ -37,7 +37,7 @@
SET_TARGET_PROPERTIES(zorba_api PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${_rpath}
BUILD_WITH_INSTALL_RPATH ON
-OUTPUT_NAME zorba_api)
+OUTPUT_NAME zorba_api_ruby)
ELSE (APPLE)
SET_TARGET_PROPERTIES(zorba_api PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${_rpath}
--
Mailing list: https://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/mac-install-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/mac-install-fix into lp:zorba has been updated. Commit Message changed to: Fix install files for java, php, python and ruby libs. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864 -- https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864 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/mac-build-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/mac-build-fix/+merge/193621 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/mac-build-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/mac-build-fix into lp:zorba has been updated. Commit Message changed to: Fixes for build on OSX Mountain Lion. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/mac-build-fix/+merge/193621 -- https://code.launchpad.net/~zorba-coders/zorba/mac-build-fix/+merge/193621 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/mac-build-fix into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/mac-build-fix into
lp:zorba.
Commit message:
Fixes for build on OSX Mountain Lion.
Requested reviews:
Cezar Andrei (cezar-andrei)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mac-build-fix/+merge/193621
Fixes for build on OSX Mountain Lion.
--
https://code.launchpad.net/~zorba-coders/zorba/mac-build-fix/+merge/193621
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt 2013-09-24 21:47:07 +
+++ swig/php/CMakeLists.txt 2013-11-01 15:32:28 +
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-IF (PHP5_FOUND)
+IF (PHP5_FOUND AND PHP5_LIBRARY)
MESSAGE (STATUS SWIG: Generating PHP5 API)
SET_SOURCE_FILES_PROPERTIES (zorba_api.i PROPERTIES CPLUSPLUS ON)
@@ -91,6 +91,6 @@
ENDIF (NOT WIN32 OR CYGWIN)
ADD_SUBDIRECTORY (tests)
-ELSE (PHP5_FOUND)
+ELSE (PHP5_FOUND AND PHP5_LIBRARY)
MESSAGE (STATUS SWIG: PHP5 binding not generated because library and include file are not installed.)
-ENDIF (PHP5_FOUND)
+ENDIF (PHP5_FOUND AND PHP5_LIBRARY)
=== modified file 'test/driver/CMakeLists.txt'
--- test/driver/CMakeLists.txt 2013-05-16 08:22:46 +
+++ test/driver/CMakeLists.txt 2013-11-01 15:32:28 +
@@ -33,35 +33,37 @@
# Compile and build the multi-threaded testdriver executable, if boost
# available
#
-
-FIND_PACKAGE(Boost COMPONENTS filesystem)
-IF (NOT Boost_FILESYSTEM_FOUND)
- MESSAGE(STATUS Boost filesystem or system component not found - not building multithreaded test driver)
-ELSE (NOT Boost_FILESYSTEM_FOUND)
- MESSAGE(STATUS Found Boost v${Boost_LIB_VERSION}: ${Boost_INCLUDE_DIRS})
- MESSAGE(STATUS Boost lib path: ${Boost_LIBRARY_DIRS})
-
- # Assume this is OK for the moment...
- SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE TRUE)
-
- IF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
-# Boost 1.35 and above included a separate system component. In
-# at least some versions, filesystem depends on system - and the
-# Mac linker apparently does not figure this out. Therefore we
-# need to link it explicitly, which means we need to find it
-# first.
-FIND_PACKAGE(Boost COMPONENTS system)
-IF (NOT Boost_SYSTEM_FOUND)
- MESSAGE(STATUS Did NOT find Boost SYSTEM component - not building multithreaded test driver)
- SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE FALSE)
-ELSE (NOT Boost_SYSTEM_FOUND)
- SET (Boost_system_lib boost_system-mt)
-ENDIF (NOT Boost_SYSTEM_FOUND)
+IF(NOT APPLE) # avoid looking for this on OSX, fails linking testdriver_mt with boost for now
+ FIND_PACKAGE(Boost COMPONENTS filesystem)
+ IF (NOT Boost_FILESYSTEM_FOUND)
+ MESSAGE(STATUS Boost filesystem or system component not found - not building multithreaded test driver)
+ ELSE (NOT Boost_FILESYSTEM_FOUND)
+ MESSAGE(STATUS Found Boost v${Boost_LIB_VERSION}: ${Boost_INCLUDE_DIRS})
+ MESSAGE(STATUS Boost lib path: ${Boost_LIBRARY_DIRS})
+
+ # Assume this is OK for the moment...
+ SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE TRUE)
+
+ IF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
+ # Boost 1.35 and above included a separate system component. In
+ # at least some versions, filesystem depends on system - and the
+ # Mac linker apparently does not figure this out. Therefore we
+ # need to link it explicitly, which means we need to find it
+ # first.
+ FIND_PACKAGE(Boost COMPONENTS system)
+ IF (NOT Boost_SYSTEM_FOUND)
+ MESSAGE(STATUS Did NOT find Boost SYSTEM component - not building multithreaded test driver)
+ SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE FALSE)
+ ELSE (NOT Boost_SYSTEM_FOUND)
+ SET (Boost_system_lib boost_system-mt)
+ ENDIF (NOT Boost_SYSTEM_FOUND)
- ENDIF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
-
-ENDIF (NOT Boost_FILESYSTEM_FOUND)
-
+ ENDIF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
+
+ ENDIF (NOT Boost_FILESYSTEM_FOUND)
+ENDIF (APPLE)
+
+
IF (ZORBATEST_TESTDRIVER_MT_AVAILABLE)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
--
Mailing list: https://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: Needs Fixing
I'm on OSX Mountain Lion 10.8.5, completely clean of this branch and I was
getting file not found on #include type_traits . I added -stdlib=libc++ to
the compiler flags and it fixes the error:
IF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
- SET(CMAKE_CXX_FLAGS -std=c++11 ${CMAKE_CXX_FLAGS})
+ SET(CMAKE_CXX_FLAGS -std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS})
ENDIF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
So as it stands right now without this fix, the mac build fails for me.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255
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 Looks good, approved. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 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/b1197577-macDocs into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 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/b1197577-macDocs into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/b1197577-macDocs into lp:zorba has been updated. Commit Message changed to: Add documentation on how to install Zorba and run examples in Python, PHP, Ruby and Java. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 -- https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 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/b1197577-macDocs into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/b1197577-macDocs into lp:zorba. Commit message: Add documentation on how to install Zorba and run examples in Python, PHP, Ruby and Java. Requested reviews: Cezar Andrei (cezar-andrei) Chris Hillery (ceejatec) Related bugs: Bug #1197577 in Zorba: Create Mac APIs documentation https://bugs.launchpad.net/zorba/+bug/1197577 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 Add documentation on how to install Zorba and run examples in Python, PHP, Ruby and Java. -- https://code.launchpad.net/~zorba-coders/zorba/b1197577-macDocs/+merge/188143 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'doc/zorba/indexpage.dox.in' --- doc/zorba/indexpage.dox.in 2013-06-19 23:05:32 + +++ doc/zorba/indexpage.dox.in 2013-09-27 19:05:38 + @@ -15,6 +15,7 @@ - \ref build \section install_section Install + - \ref install_osx_tutorial - \ref php_ubuntu_tutorial - \ref php_windows_tutorial - \ref python_windows_tutorial === added file 'doc/zorba/install_osx.dox' --- doc/zorba/install_osx.dox 1970-01-01 00:00:00 + +++ doc/zorba/install_osx.dox 2013-09-27 19:05:38 + @@ -0,0 +1,237 @@ +/** \page install_osx_tutorial Zorba - Mac OSX Installation + +\section zosx_title Guide to Zorba installation on Mac OSX + +This is a guide to install Zorba on Mac OSX, it was tested on OSX 10.8.5 Mountain Lion with Xcode 5.0 and Zorba 2.9.1. Send us email with the results you had on different versions or platforms. + +There are 3 ways to get Zorba running on your Mac: + - \ref zosx_pkg (Requires macports dependencies, recommended) + - \ref zosx_mpkg (.mpkg file contains all it's .pkg dependencies, easiest) + - \ref zosx_src (the most complete) + +\section zosx_prereq Prerequisites + + - Apple Mac OSX 10.8.5 Mountain Lion + - Apple Xcode Developer Tools version 5.0 (might work with 4.4 or later too) + - For a) and c) MacPorts 2.2.0 (see below). + +\section zosx_install_macports Install MacPorts + +Install MacPorts 2.2.0: a href=http://www.macports.org/install.php;http://www.macports.org/install.php/a . The easiest way to install MacPorts on a Mac OS X system is by downloading and running the .dmg file. + +Update MacPorts +\code +$ sudo port -v selfupdate +\endcode + +Upgrade outdated packages (this might take a while depending on the outdated packages). + +\code +$ sudo port upgrade outdated +\endcode + + +\section zosx_pkg a) Install Zorba binary from .pkg file + +The zorba-2.9.1.pkg file contains only Zorba installation files but not it's dependecies. Unlike Linux and Windows distributions, it contains both Zorba runtime with core modules and most of the external modules. It does not contain the folowing external modules: image, schema-tools, read-pdf and email, due to lack of macports of these modules dependencies. If one of these modules is required, then Zorba must be installed from source. + +Make sure you have MacPorts installed and up to date. Since .pkg contains only Zorba installation files, it's dependecies need to be installed too. + +Install dependecies: +\code +sudo port install boost curl icu libiconv libxml2 libxslt xerces3 tidy fop geos libarchive sqlite3 swig swig-python swig-php swig-java swig-ruby +\endcode + +\b Note: Use MacPorts installation of the libraries, do not modify the libraries that ships with OSX. Modifying OXS libraries usualy renders your OSX installation unusable. + +Download the zorba .pkg file (aproximately 12MB) : a href=http://launchpad.net/zorba/+download;zorba-x.pkg/a. + +Install it by running it, a MacPorts gui installer will guide you. + +after installation Zorba binary should be available in: /opt/local/bin/zorba. + +To uninstall Zorba files, use the folowing script: a href=http://my.zorba-xquery.com/tmp/zorba-2.9.1-uninstall.sh;zorba-2.9.1-uninstall.sh/a. + + + +\section zosx_mpkg b) Install Zorba binary from .mpkg file + +This is the easies way to install Zorba since it doesn't require installation of MacPorts and requires download and installation of only one file. +- The Zorba .mpkg file contains both the Zorba installation files and also all it's MacPorts dependecies. This makes the zorba-2.9.1.mpkg a 175MB file. +- Similar to .pkg file, the .mpkg file contains the Zorba runtime, core modules and most of the external modules. It does not contain the folowing external modules: image, schema-tools, read-pdf and email, due to lack of macports of these modules dependencies. If one of these modules is required, then Zorba must be installed from source. + +Download the zorba .mpkg file (aproximately 175MB) : a href=http://launchpad.net/zorba/+download;zorba-x.mpkg/a. + +Install it by running it, a MacPorts gui installer will guide you. + +Zorba binary should be available in: /opt/local/bin/zorba + +To uninstall only Zorba files, use the following script: a href=http://my.zorba-xquery.com/tmp/zorba-2.9.1-uninstall.sh
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsound-validator into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsound-validator into lp:zorba has been updated. Commit Message changed to: New core module: JSound validator implemented in JSONiq. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsound-validator/+merge/186908 -- https://code.launchpad.net/~zorba-coders/zorba/jsound-validator/+merge/186908 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/jsound-validator into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/jsound-validator into
lp:zorba.
Commit message:
New core module: JSound validator implemented in JSONiq.
Requested reviews:
Juan Zacarias (juan457)
Ghislain Fourny (gislenius)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsound-validator/+merge/186908
New core module: JSound validator implemented in JSONiq.
--
https://code.launchpad.net/~zorba-coders/zorba/jsound-validator/+merge/186908
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt 2013-09-09 23:47:17 +
+++ modules/CMakeLists.txt 2013-09-21 04:53:29 +
@@ -23,6 +23,7 @@
ADD_SUBDIRECTORY(xml)
ADD_SUBDIRECTORY(http-client)
ADD_SUBDIRECTORY(json)
+ADD_SUBDIRECTORY(jsound)
ADD_SUBDIRECTORY(structured-items)
ADD_SUBDIRECTORY(item)
=== modified file 'modules/http-client/json/http-client.jsd'
--- modules/http-client/json/http-client.jsd 2013-07-11 20:57:49 +
+++ modules/http-client/json/http-client.jsd 2013-09-21 04:53:29 +
@@ -2,104 +2,122 @@
$namespace: http://zorba.io/modules/http-client;,
$about: This JSound schema defines the types of requests and
responses used in the http://28.io/http-client module,
- $types: [
+ $types:
+ [
{
- $kind: object,
- $name: headers,
- $about: This type represents a set of headers. Each header is represented
- by a different name-value pair.,
- $constraints : every $key in keys($$) satisfies $$.$key instance of string
-
+ $kind: object,
+ $name: headers,
+ $about: This type represents a set of headers. Each header is represented
+ by a different name-value pair.,
+ $constraints : every $key in keys($$) satisfies $$.$key instance of string,
+ $content : {}
},
{
- $kind: object,
- $name: body,
- $about: This type represents the body of an HTTP request or an HTTP
+ $kind: object,
+ $name: body,
+ $about: This type represents the body of an HTTP request or an HTTP
response. In multi-part requests and responses, it represents the
body of a single part.,
- $content: {
- media-type: {
- $type: string,
- $about: This field is the media type of the body.
- },
-src: {
- $type: anyURI,
- $about: This field, used only in HTTP requests, is used to specify the URL at
- which the request can be found. It is mutually exclusive with the content
- field.,
- $optional: true
- },
- content: {
- $type: string,
- $about: The HTTP request or response body. It is mutually exclusive with the src
- field.,
- $optional: true
- }
- },
- $constraints : count($$.src) + count($$.content) le 1
+ $content:
+ {
+ media-type:
+ {
+ $type: string,
+ $about: This field is the media type of the body.
+ },
+src:
+{
+ $type: anyURI,
+ $about: This field, used only in HTTP requests, is used to specify the URL at
+ which the request can be found. It is mutually exclusive with the content
+ field.,
+ $optional: true
+ },
+ content:
+ {
+ $type: string,
+ $about: The HTTP request or response body. It is mutually exclusive with the src
+ field.,
+ $optional: true
+ }
+ },
+ $constraints : count($$.src) + count($$.content) le 1
},
- {
- $kind: object,
- $name: part,
- $about: This type represents each single part of a multipart HTTP request or
+ {
+ $kind: object,
+ $name: part,
+ $about: This type represents each single part of a multipart HTTP request or
response.,
- $content: {
- headers: {
- $type: headers,
- $optional: true,
- $about: This field specifies the part headers.
- },
- body: {$type: body}
- }
- },
- {
- $kind: object,
- $name: multipart,
- $about: This type represents a multipart HTTP request or response.,
- $content: {
- media-type: {
- $type: string
- $about: The media-type attribute is the media type of the request or
- response, and has to be a multipart media type (that is, its
- main type must be multipart).
- },
- boundary: {
- $type: string,
- $optional: true,
- $about: The boundary attribute is the boundary marker used to separate
- the several parts in the message (the value of the attribute is
- prefixed with -- to form the actual boundary marker in the
- request; on the other way, this prefix is removed from the boundary
- marker in the response to set the value of the attribute.
- },
- parts: {
+ $content:
+ {
+ headers:
+ {
+ $type: headers,
+ $optional: true,
+ $about: This field
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/1181360 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/1181360/+merge/167690 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 Error for the attached query is now fixed. -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 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/181327 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 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/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/zio-oracle-nosql into
lp:zorba/oracle-nosql-db-module.
Commit message:
- Use new zorba.io namespace.
- Upgrade to latest Oracle Nosql DB version: kv-2.1.8.
Requested reviews:
Cezar Andrei (cezar-andrei)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785
- Use new zorba.io namespace.
- Upgrade to latest Oracle Nosql DB version: kv-2.1.8.
--
https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785
Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-12-17 20:35:19 +
+++ CMakeLists.txt 2013-08-06 15:39:30 +
@@ -29,7 +29,7 @@
MESSAGE (STATUS NOSQLDB_HOME = $ENV{NOSQLDB_HOME})
IF (WIN32)
- SET (NOSQLDB_PATH $ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}\\lib C:\\Libs\\kv-1.2.123 C:\\dev\\libraries\\nosqldb C:\\dev\\libraries\\nosqldb\\lib)
+ SET (NOSQLDB_PATH $ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}\\lib C:\\Libs\\kv-2.1.8 C:\\dev\\libraries\\nosqldb C:\\dev\\libraries\\nosqldb\\lib)
MESSAGE (STATUS pdfbox fontbox jars searching path: ${NOSQLDB_PATH} )
ELSE (WIN32)
SET (NOSQLDB_PATH $ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}/lib
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2012-11-21 21:58:30 +
+++ src/CMakeLists.txt 2013-08-06 15:39:30 +
@@ -27,7 +27,7 @@
INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH})
DECLARE_ZORBA_MODULE (
- URI http://www.zorba-xquery.com/modules/oracle-nosqldb;
+ URI http://zorba.io/modules/oracle-nosqldb;
VERSION 1.0
FILE nosqldb.xq
### CONFIG_FILES ../srcJava/org/zorbaxquery/modules/nosqldb/Config.java.in
=== modified file 'src/nosqldb.xq'
--- src/nosqldb.xq 2013-07-17 07:53:12 +
+++ src/nosqldb.xq 2013-08-06 15:39:30 +
@@ -17,7 +17,9 @@
(:~
- : This module provides minimal functionality to interact with an a href=http://www.oracle.com/technetwork/products/nosqldb/overview/index.html;Oracle NoSQL Database/a.
+ : This module provides minimal functionality to interact with an
+ : a href=http://www.oracle.com/technetwork/products/nosqldb/overview/index.html;
+ : Oracle NoSQL Database/a.
:
: Oracle NoSQL Database is built upon the proven Oracle Berkeley DB Java Edition
: high-availability storage engine, which is in widespread use in enterprises across
@@ -25,7 +27,8 @@
: The resulting solution provides distributed, highly available key/value storage that is well
: suited to large-volume, latency-sensitive applications.br/
:
- : The kvclient library is used to implement these functions. Set the NOSQLDB_HOME environment variable to use this module.
+ : The kvclient library is used to implement these functions. Set the NOSQLDB_HOME
+ : environment variable when compilling this module.
: br /
: br /
: br /bNote:/b Since this module has a Java library dependency a JVM required
@@ -35,7 +38,7 @@
: @author Cezar Andrei
: @project DB Drivers/ORACLE NoSQL
:)
-module namespace nosql = http://www.zorba-xquery.com/modules/oracle-nosqldb;;
+module namespace nosql = http://zorba.io/modules/oracle-nosqldb;;
(:~
: Import module for encoding/decoding base64Binary to/from string.
=== modified file 'src/nosqldb.xq.src/nosqldb.h'
--- src/nosqldb.xq.src/nosqldb.h 2013-06-12 13:59:19 +
+++ src/nosqldb.xq.src/nosqldb.h 2013-08-06 15:39:30 +
@@ -37,7 +37,7 @@
#include JavaVMSingleton.h
-#define NOSQLDB_MODULE_NAMESPACE http://www.zorba-xquery.com/modules/oracle-nosqldb;
+#define NOSQLDB_MODULE_NAMESPACE http://zorba.io/modules/oracle-nosqldb;
namespace zorba
=== modified file 'test/Queries/oracle-nosql-db/all-binary.xq'
--- test/Queries/oracle-nosql-db/all-binary.xq 2013-07-17 07:53:12 +
+++ test/Queries/oracle-nosql-db/all-binary.xq 2013-08-06 15:39:30 +
@@ -1,4 +1,4 @@
-import module namespace nosql = http://www.zorba-xquery.com/modules/oracle-nosqldb;;
+import module namespace nosql = http://zorba.io/modules/oracle-nosqldb;;
import module namespace base64 = http://zorba.io/modules/base64;;
{
=== modified file 'test/Queries/oracle-nosql-db/all-text.xq'
--- test/Queries/oracle-nosql-db/all-text.xq 2013-07-17 07:53:12 +
+++ test/Queries/oracle-nosql-db/all-text.xq 2013-08-06 15:39:30 +
@@ -1,4 +1,4 @@
-import module namespace nosql = http://www.zorba-xquery.com/modules/oracle-nosqldb;;
+import module namespace nosql = http://zorba.io/modules/oracle-nosqldb;;
import module namespace base64 = http://zorba.io/modules/base64;;
{
=== modified file 'test/Queries/oracle-nosql-db/connect.xq'
--- test/Queries/oracle-nosql-db/connect.xq 2013-01-09 17:56:22 +
+++ test/Queries/oracle-nosql-db/connect.xq 2013-08-06 15:39:30 +
@@ -1,4 +1,4 @@
-import module namespace nosql = http://www.zorba-xquery.com/modules/oracle-nosqldb;;
+import module namespace nosql = http://zorba.io/modules/oracle-nosqldb;;
{
variable
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
The proposal to merge lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module has been updated. Commit Message changed to: - Use new zorba.io namespace. - Upgrade to latest Oracle Nosql DB version: kv-2.1.8. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-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/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
The proposal to merge lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-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/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-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/http-client-wrapper into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 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/expath-http-on-json-http into lp:zorba/http-client-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/http-client-based-on-json-http-client into lp:zorba/http-client-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/http-client-based-on-json-http-client/+merge/169578 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/install_mysql_update into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/install_mysql_update/+merge/171032 Your team Zorba Coders is subscribed to branch 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/json-http-module into lp:zorba
Review: Approve Checked the integer issue and is fixed also done more testing. Looks good. -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/json-http-module into lp:zorba
Review: Needs Fixing Also, add a note on the module documentation section about using the header jsoniq version 1.0; at the top and put a link to a page that describes this header. -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/json-http-module into lp:zorba
timeout option has a bug. Uncomment timeout in the following script and get
this error:
$ ./zorba -i -f -q q.jq
error [zerr:ZSTR0040]: type error: Item::getIntValue() not defined for type
xs:integer
jsoniq version 1.0;
import module namespace http=http://zorba.io/modules/http-client;;
http:send-request(
{
method: POST,
href: http://requestb.in/13727yx1;,
authentication:
{
username : user,
password : pass,
auth-method : Basic
},
options:
{
status-only: true,
override-media-type: text/plain,
follow-redirect: true,
(: timeout: 30, :)
user-agent: Mozilla/5.0
},
headers:
{
name: value
},
body:
{
media-type: text/plain,
content: ...
}
})
--
https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579
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/json-http-module into lp:zorba
Cezar, it is not necessary for users to have a jsoniq version header in their queries to use this module. They can use (field) object accessors instead of .field . My point was to mention these options somewhere in the doc and link to a page which better describes this. IMHO it's confusing if you also count in the file extension .jq. -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/json-http-module into lp:zorba
Code looks good. I need a few more tests to make sure everything is fine. -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/json-http-module into lp:zorba
Review: Needs Fixing In the Doc examples use WWW.zorba.io... but the module is registered without WWW: xqDoc: import module namespace http=http://www.zorba.io/modules/http-client;; http:get(http://www.example.com;) -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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-1181360 into lp:zorba
Looks like the whole validate.cpp file is changed. Please make sure you maintain the same whitespace chars. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1181360/+merge/166946 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-2 into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-2/+merge/164485 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/schema-tools-module-2 into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/schema-tools-module-2 into lp:zorba/schema-tools-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-2/+merge/164485 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-2/+merge/164485 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/schema-tools-module into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 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/bug1167400-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 Your team Zorba Coders is 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/bug1167400-valType into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 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/fix_disputed_tc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_disputed_tc/+merge/162230 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/util-jvm_core_module into lp:zorba
Agreed, but we need to have them working before e check anything in. On May 1, 2013 5:31 PM, Chris Hillery chillery+launch...@lambda.nu wrote: Fixing ExternalModules.conf should be trivial. As to the other modules, we'll have to update them after merging this proposal. If we remove the FIND_PACKAGE() from them first, they'll have build errors. If we leave them as-is and merge this one first, then they will quietly get skipped by the remote queue, which is better. We'll just need to immediately commit changes to each of them after the main merge. -- https://code.launchpad.net/~zorba-coders/zorba/util-jvm_core_module/+merge/161854 You are reviewing the proposed merge of lp:~zorba-coders/zorba/util-jvm_core_module into lp:zorba. -- https://code.launchpad.net/~zorba-coders/zorba/util-jvm_core_module/+merge/161854 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Let's get this is and open up a new bug for the 8 failures. -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Status of the last run: - Passing but marked as expected failure: - prod-CastExpr/CastAs674a - prod-CastExpr/CastAsNamespaceSensitiveType-10 - prod-CastExpr/K-SeqExprCast-71b - WrongError - prod-CastExpr/CastAs675a - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/CastAsNamespaceSensitiveType-1 - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/CastAsNamespaceSensitiveType-2 - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/CastAsNamespaceSensitiveType-8 - Expected error: XPTY0117. Found error: FORG0001 - prod-CastExpr/CastAsNamespaceSensitiveType-9 - Expected error: XPTY0117. Found error: FORG0001 - prod-CastExpr/CastAsNamespaceSensitiveType-11 - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/CastAsNamespaceSensitiveType-12 - Expected error: XPTY0117. Found error: XPTY0004 - prod-CastExpr/K-SeqExprCast-4a - Expected error: XPST0080. Found error: ZXQP0002 - prod-CastExpr/K-SeqExprCast-422a - Expected error: FORG0001. Found error: XPTY0004 And test w3c_update_testsuite/XQueryX/ValTrans/revalidate-valtrans-ins-003 is reported as failed but the details show: Test output test w3c_update_testsuite/XQueryX/ValTrans/revalidate-valtrans-ins-003 updtestdriver: success Sorin, can you take a look at revalidate-valtrans-ins-003? -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba has been updated. Commit Message changed to: Fixes for bug1167400 validate type failures (at least 9) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba has been updated. Description changed to: Fixes for Fixes for bug1167400 validate type failures (at least 9) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Review: Approve Looks good. It will most likely not pass in the current remote queue setup because it's still running libxercesc 2.8). It has been tested with libxerces 3.1.1 and is running correctly, should pass when Chris will update remote queue to use the newer xerces. -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
In trunk at least the following tests are passing: cbcl-schema-element-1 2,4,5,8. Which makes them a regression. -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_FOTSExpectedFailures into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_FOTSExpectedFailures/+merge/159691 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/fix_FOTSExpectedFailures into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_FOTSExpectedFailures into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_FOTSExpectedFailures/+merge/159691 -- https://code.launchpad.net/~zorba-coders/zorba/fix_FOTSExpectedFailures/+merge/159691 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Review: Needs Fixing A few comments: - for following method, getting the type of the content of a global element shouldn't have anything to do with element's nillable property. Please add a different method to return the nillable of a global element or it's definition. void Schema::getTypeNameFromElementName( const store::Item* qname, store::Item_t typeName, + bool nillable, const QueryLoc loc); Same comment goes for: - CTX_TM-get_schema_element_typename(elemQNameItem, typeQNameItem, nillable, loc); - Schema:: createXQTypeFromElementName(typeManager, 503 + sourceNode-getNodeName(), 504 + false, 505 + nillable, 506 + loc); -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Review: Needs Fixing I still think that the overhead of an extra call makes the code more readable and it's worth it in the long run. Still the nillable is not a property of the type of the element but of the element itself. Please leave the create word in createXQTypeFromElementName, these methods have side effects they aren't just simple gets and I think a good name should tell this. A more correct name for this method would be: createXQTypeFromElementNameAndGetNillable. But I still think makes more sense to have them separate and leave the compiler do the optimizations for this case. At least leave createXQTypeFromElementName name if you think the first part has a significant effect on performance. -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
1. Sounds good. 2. It's exactly what I'm talking about, since it's called getTypeInfo...() and not createType...() it looks like a noop. It does actually do something which is also described in the previous line comments: // ask for the type of the root element to populate the cache with anonymous types. That's why I want to keep the createType.. name. -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1103819-catchAll into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/bug1103819-catchAll
into lp:zorba.
Commit message:
Fix catch ( ... ) in XML loaders.
Requested reviews:
Cezar Andrei (cezar-andrei)
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1103819 in Zorba: Use of catch (...) should be reduced or mitigated
https://bugs.launchpad.net/zorba/+bug/1103819
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053
Fix catch ( ... ) in XML loaders.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/loader_dtd.cpp'
--- src/store/naive/loader_dtd.cpp 2013-03-05 22:57:42 +
+++ src/store/naive/loader_dtd.cpp 2013-04-16 00:50:38 +
@@ -355,6 +355,16 @@
FragmentXmlLoader::endDocument(theFragmentStream-ctxt-userData); // this would not be called otherwise
}
+ catch( std::exception const e )
+ {
+theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR,
+ ERROR_PARAMS( e.what() )));
+
+abortload();
+thePathStack.clear();
+return NULL;
+ }
catch (...)
{
abortload();
@@ -849,8 +859,19 @@
return NULL;
}
}
+ catch( std::exception const e )
+ {
+theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR, ERROR_PARAMS( e.what() )));
+
+abortload();
+return NULL;
+ }
catch(...)
{
+theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+
abortload();
thePathStack.clear();
return NULL;
@@ -1070,6 +1091,12 @@
{
loader.theXQueryDiagnostics-add_error( e );
}
+ catch( std::exception const e )
+ {
+loader.theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics-add_error(
@@ -1152,6 +1179,12 @@
{
loader.theXQueryDiagnostics-add_error( e );
}
+ catch( std::exception const e )
+ {
+loader.theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics-add_error(
@@ -1446,6 +1479,12 @@
{
loader.theXQueryDiagnostics-add_error( e );
}
+ catch( std::exception const e )
+ {
+loader.theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics-
@@ -1578,6 +1617,12 @@
{
loader.theXQueryDiagnostics-add_error( e );
}
+ catch( std::exception const e )
+ {
+loader.theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics-add_error(
@@ -1629,6 +1674,12 @@
{
loader.theXQueryDiagnostics-add_error( e );
}
+ catch( std::exception const e )
+ {
+loader.theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics-add_error(
@@ -1682,6 +1733,12 @@
{
loader.theXQueryDiagnostics-add_error( e );
}
+ catch( std::exception const e )
+ {
+loader.theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics-add_error(
@@ -1732,6 +1789,12 @@
{
loader.theXQueryDiagnostics-add_error( e );
}
+ catch( std::exception const e )
+ {
+loader.theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics-add_error(
@@ -1775,6 +1838,12 @@
{
loader.theXQueryDiagnostics-add_error( e );
}
+ catch( std::exception const e )
+ {
+loader.theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics-add_error(
=== modified file 'src/store/naive/loader_fast.cpp'
--- src/store/naive/loader_fast.cpp 2013-04-08 22:59:58 +
+++ src/store/naive/loader_fast.cpp 2013-04-16 00:50:38 +
@@ -445,7 +445,7 @@
if (numChars 0)
{
theXQueryDiagnostics-
- add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1103819-catchAll into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1103819-catchAll into lp:zorba has been updated. Commit Message changed to: Fix catch ( ... ) in XML loaders. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 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/bug1103819-catchAll into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1090083-deepEqual into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/bug1090083-deepEqual
into lp:zorba.
Commit message:
Fix deep-equal bug 1090083.
Requested reviews:
Cezar Andrei (cezar-andrei)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1090083 in Zorba: deep-equal doesn't check type annotations
https://bugs.launchpad.net/zorba/+bug/1090083
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509
Fix deep-equal bug 1090083.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp 2013-03-26 18:10:32 +
+++ src/runtime/sequences/sequences_impl.cpp 2013-04-11 23:41:34 +
@@ -926,6 +926,17 @@
if (! item1-getNodeName()-equals(item2-getNodeName()))
return false;
+ TypeManager* tm = sctx-get_typemanager();
+
+ xqtref_t type1 = tm-create_value_type(item1.getp());
+ xqtref_t type2 = tm-create_value_type(item2.getp());
+
+ const NodeXQType* nodeType1 = static_castconst NodeXQType *(type1.getp());
+ const NodeXQType* nodeType2 = static_castconst NodeXQType *(type2.getp());
+
+ if ( nodeType1-get_content_type()-content_kind() != nodeType2-get_content_type()-content_kind() )
+return false;
+
return (DeepEqualAttributes(loc,
sctx,
dctx,
@@ -1093,6 +1104,13 @@
item1-isJSONArray() != item2-isJSONArray())
return false;
+
+ xqtref_t type1 = tm-create_value_type(item1.getp());
+ xqtref_t type2 = tm-create_value_type(item2.getp());
+
+ if ( type1-content_kind() != type2-content_kind() )
+return false;
+
if (item1-isAtomic())
{
assert(item2-isAtomic());
@@ -1102,9 +1120,6 @@
collator = sctx-get_default_collator(QueryLoc::null);
// check NaN
-xqtref_t type1 = tm-create_value_type(item1.getp());
-xqtref_t type2 = tm-create_value_type(item2.getp());
-
if (((TypeOps::is_subtype(tm, *type1, *rtm.FLOAT_TYPE_ONE)
item1-getFloatValue().isNaN())
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-11 18:13:48 +
+++ test/fots/CMakeLists.txt 2013-04-11 23:41:34 +
@@ -130,8 +130,6 @@
EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)
EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-36 0)
EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-37 0)
-EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-38 0)
-EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-39 0)
EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002 0)
EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002b 0)
EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-005 0)
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1090083-deepEqual into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1090083-deepEqual into lp:zorba has been updated. Commit Message changed to: Fix deep-equal bug 1090083. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 -- https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 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/bug1090083-deepEqual into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1160028-valType into lp:zorba
since they are different bugs I would merge this one and keep the bug opened or add a new bug for the rest. -- https://code.launchpad.net/~zorba-coders/zorba/bug1160028-valType/+merge/157193 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/bug1158975-sxDateTimeStamp into lp:zorba
This has already been merged with a different branch. Rejecting the proposal. -- https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597 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/bug1158975-sxDateTimeStamp into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1158975-sxDateTimeStamp into lp:zorba has been updated. Status: Needs review = Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597 -- https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597 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/bug1156249-minusZero into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 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/bug1040564 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1040564/+merge/157500 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/bug1040564 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1040564 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1040564/+merge/157500 -- https://code.launchpad.net/~zorba-coders/zorba/bug1040564/+merge/157500 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/bug1156249-minusZero into lp:zorba
Added EXPECTED failures to test cases failing because of decimal -0. https://www.w3.org/Bugs/Public/show_bug.cgi?id=21619 -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 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/bug1160028-valType into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/bug1160028-valType
into lp:zorba.
Requested reviews:
Cezar Andrei (cezar-andrei)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1160028 in Zorba: validate type failures (at least 14)
https://bugs.launchpad.net/zorba/+bug/1160028
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1160028-valType/+merge/157193
Fix for bug1160028. Fix URI of the type when validating with xsi:type attribute
specified.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1160028-valType/+merge/157193
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/types/schema/SchemaValidatorFilter.cpp'
--- src/types/schema/SchemaValidatorFilter.cpp 2013-02-26 04:12:43 +
+++ src/types/schema/SchemaValidatorFilter.cpp 2013-04-04 18:24:31 +
@@ -1028,7 +1028,9 @@
{
const ElemStack::StackElem* topElem = fElemStack.topElement();
DatatypeValidator *currentDV = 0;
- if(topElem-fThisElement-isDeclared())
+ if(topElem-fThisElement-isDeclared() ||
+ theXsiType // this is when there is no schema import but xsiType is used
+)
{
ComplexTypeInfo *currentTypeInfo = ((XercSchemaValidator*)fValidator)-getCurrentTypeInfo();
if(currentTypeInfo)
--
Mailing list: https://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/bug1160028-valType into lp:zorba
Review: Approve Fix for bug1160028. Fix URI of the type when validating with xsi:type attribute specified. -- https://code.launchpad.net/~zorba-coders/zorba/bug1160028-valType/+merge/157193 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/bug1160028-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1160028-valType into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1160028-valType/+merge/157193 -- https://code.launchpad.net/~zorba-coders/zorba/bug1160028-valType/+merge/157193 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/bug1160559-unionTypeError into lp:zorba
Cezar Andrei has proposed merging
lp:~zorba-coders/zorba/bug1160559-unionTypeError into lp:zorba.
Commit message:
Fixes bug when creating derived union types.
Fix for bug#1160559 Seg Fault in Union Types (3 test cases).
Requested reviews:
Cezar Andrei (cezar-andrei)
Nicolae Brinza (nbrinza)
Related bugs:
Bug #1160559 in Zorba: Seg Fault in Union Types (3 test cases)
https://bugs.launchpad.net/zorba/+bug/1160559
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760
Fix for bug#1160559 Seg Fault in Union Types (3 test cases).
--
https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/types/schema/schema.cpp'
--- src/types/schema/schema.cpp 2013-03-12 17:03:31 +
+++ src/types/schema/schema.cpp 2013-04-03 07:58:25 +
@@ -929,14 +929,14 @@
xqtref_t baseXQType;
XSTypeDefinition* baseTypeDef = xsTypeDef-getBaseType();
-if (!baseTypeDef)
+if (baseTypeDef)
{
baseXQType = createXQTypeFromTypeDefinition(tm, baseTypeDef);
}
-//cout creating UDT Simple Union Type:
-// qname-getLocalName()-c_str() @
-// qname-getNamespace()-c_str() of: ;
+//std::cout creating UDT Simple Union Type:
+// qname-getLocalName() @
+// qname-getNamespace() of: ;
std::vectorxqtref_t unionItemTypes;
for (csize i = 0; i memberTypesDefList-size(); ++i)
@@ -947,7 +947,7 @@
xqtref_t itemXQType = createXQTypeFromTypeDefinition(tm, itemTypeDef);
unionItemTypes.push_back(itemXQType);
- //cout itemXQType-toString();
+ //std::cout itemXQType-toString();
if (itemXQType-type_kind() == XQType::USER_DEFINED_KIND)
{
@@ -955,7 +955,7 @@
addTypeToCache(itemXQType);
}
}
-//cout endl; cout.flush();
+//std::cout std::endl; std::cout.flush();
xqtref_t xqType = new UserDefinedXQType(tm,
qname,
@@ -963,8 +963,8 @@
TypeConstants::QUANT_ONE,
unionItemTypes);
-//cout created UDT Union Type: xqType-toString() endl;
-// cout.flush();
+//std::cout created UDT Union Type: xqType-toString() std::endl;
+// std::cout.flush();
addTypeToCache(xqType);
result = xqType;
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-03 07:30:48 +
+++ test/fots/CMakeLists.txt 2013-04-03 07:58:25 +
@@ -103,9 +103,9 @@
EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00976 1070533)
EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00976a 1070533)
EXPECTED_FOTS_FAILURE (CRASH fn-unparsed-text-lines fn-unparsed-text-lines-052 1123835)
-EXPECTED_FOTS_FAILURE (CRASH prod-InstanceofExpr instanceof139 1160559)
-EXPECTED_FOTS_FAILURE (CRASH prod-CastExpr.schema CastAs-UnionType-26 1160559)
-EXPECTED_FOTS_FAILURE (CRASH prod-CastExpr.schema CastAs-UnionType-30 1160559)
+EXPECTED_FOTS_FAILURE (CRASH prod-InstanceofExpr instanceof139 1160559) # failing but not crushing
+#EXPECTED_FOTS_FAILURE (CRASH prod-CastExpr.schema CastAs-UnionType-26 1160559)
+#EXPECTED_FOTS_FAILURE (CRASH prod-CastExpr.schema CastAs-UnionType-30 1160559)
# Next three possibly unique to old RQ machine, but they need to be
# marked for the RQ to pass.
=== modified file 'test/fots_driver/cli.xq'
--- test/fots_driver/cli.xq 2013-03-27 02:24:41 +
+++ test/fots_driver/cli.xq 2013-04-03 07:58:25 +
@@ -99,9 +99,9 @@
: EXPECTED_FOTS_FAILURE (CRASH TEST_SET_NAME TEST_CASE_NAME BUG_NO)
:)
declare variable $exceptedTestCases as xs:string* := (
- (instanceof139,
+(: (instanceof139,
CastAs-UnionType-26,
- CastAs-UnionType-30), (:see bug lp:1160559 :)
+ CastAs-UnionType-30) , :) (:see bug lp:1160559 :)
fn-unparsed-text-lines-052, (:see bug lp:1123835 :)
(cbcl-subsequence-011,
cbcl-subsequence-012,
--
Mailing list: https://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/bug1160559-unionTypeError into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1160559-unionTypeError into lp:zorba has been updated. Commit Message changed to: Fixes bug when creating derived union types. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760 -- https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760 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/bug1160559-unionTypeError into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1160559-unionTypeError into lp:zorba has been updated. Commit Message changed to: Fixes bug when creating derived union types. Fix for bug#1160559 Seg Fault in Union Types (3 test cases). For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760 -- https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760 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/bug1160559-unionTypeError into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760 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/bug1160559-unionTypeError into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1160559-unionTypeError into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760 -- https://code.launchpad.net/~zorba-coders/zorba/bug1160559-unionTypeError/+merge/156760 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/bug1156249-minusZero into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 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/bug1156249-minusZero into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 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/bug1132937 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1158975-sxDateTimeStamp into lp:zorba
Cezar Andrei has proposed merging
lp:~zorba-coders/zorba/bug1158975-sxDateTimeStamp into lp:zorba.
Commit message:
Fix for bug1158975 - query 1: casting from xs:dateTime to xs:dateTimeStamp.
Requested reviews:
Till Westmann (tillw)
Related bugs:
Bug #1158975 in Zorba: errors casting to xs:dateTimeStamp
https://bugs.launchpad.net/zorba/+bug/1158975
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597
Fix for bug1158975 - query 1: casting from xs:dateTime to xs:dateTimeStamp.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp 2013-03-17 04:02:46 +
+++ src/store/naive/simple_item_factory.cpp 2013-03-26 20:15:27 +
@@ -584,7 +584,7 @@
{
if( value-hasTimezone() )
{
-result = new DateTimeItem(store::XS_DATETIME, value);
+result = new DateTimeItem(store::XS_DATETIME_STAMP, value);
return true;
}
else
--
Mailing list: https://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/bug1158975-sxDateTimeStamp into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1158975-sxDateTimeStamp into lp:zorba has been updated. Commit Message changed to: Fix for bug1158975 - query 1: casting from xs:dateTime to xs:dateTimeStamp. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597 -- https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597 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/bug1158975-sxDateTimeStamp into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1158975-sxDateTimeStamp into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597 -- https://code.launchpad.net/~zorba-coders/zorba/bug1158975-sxDateTimeStamp/+merge/155597 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/bug1156249-minusZero into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/bug1156249-minusZero
into lp:zorba.
Commit message:
Fix for bug1156249: FOTS: XSD 1.1: 0 vs -0 . Enables -0 as a valid xs:decimal.
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1156249 in Zorba: FOTS: XSD 1.1: 0 vs -0
https://bugs.launchpad.net/zorba/+bug/1156249
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599
Fix for bug1156249: FOTS: XSD 1.1: 0 vs -0 . Enables -0 as a valid xs:decimal.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/zorbatypes/mapm/mapm_set.c'
--- src/zorbatypes/mapm/mapm_set.c 2013-02-07 17:24:36 +
+++ src/zorbatypes/mapm/mapm_set.c 2013-03-26 20:20:30 +
@@ -339,7 +339,7 @@
if (zflag)
{
ctmp-m_apm_exponent = 0;
-ctmp-m_apm_sign = 0;
+// ctmp-m_apm_sign = 0; this line is commented to implement xsd 1.1 -0 change.
ctmp-m_apm_datalength = 1;
}
else
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-03-23 15:23:57 +
+++ test/fots/CMakeLists.txt 2013-03-26 20:20:30 +
@@ -527,8 +527,6 @@
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-030 0)
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-031 0)
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-032 0)
-EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy20 0)
-EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy21 0)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 0)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 0)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy49 0)
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba has been updated. Commit Message changed to: Fix for bug1156249: FOTS: XSD 1.1: 0 vs -0 . Enables -0 as a valid xs:decimal. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 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/bug1156249-minusZero into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 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/bug1158975 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1158975/+merge/155600 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/bug1132937 into lp:zorba
Review: Needs Fixing Please also add xs:dateTimeStamp to the API. I see you removed zorba_api_wrapper.php and zorba_api.php and php tests 3, 12, 13, 14. Why? -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug924756-xsDateTimeStamp into lp:zorba
Of 32 prod-SchemaImport cases: 3 - correct answer - xml comparator needs to be better qischema005 qischema032c qischema070 1 - resource not found qischema016 3 - castable bug qischema031 qischema040 qischema040a 17 - bug in testcase schema or Xerces nor implementing xsd1.1 substitution-001 substitution-002 substitution-003 substitution-004 substitution-005 substitution-006 substitution-007 substitution-008 substitution-009 substitution-010 substitution-011 substitution-020 substitution-021 substitution-022 substitution-023 substitution-024 substitution-025 8 - schema-element-head cbcl-schema-element-1 cbcl-schema-element-2 cbcl-schema-element-4 cbcl-schema-element-5 cbcl-schema-element-8 cbcl-validated-schema-element-1 cbcl-validated-schema-element-3 cbcl-validated-schema-element-4 -- https://code.launchpad.net/~zorba-coders/zorba/bug924756-xsDateTimeStamp/+merge/149901 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/read-pdf-installer-changes into lp:zorba/read-pdf-module
Juan, please make sure this works on Windows platforms. -- https://code.launchpad.net/~zorba-coders/zorba/read-pdf-installer-changes/+merge/149359 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug924756-xsDateTimeStamp into lp:zorba
Review: Approve Looks like modules/w3c/xpath_functions.xq already declares fn:current-dateTime() as xs:dateTimeStamp. While modules/w3c/xpath_functions.xq declares datetime:current-dateTime() as xs:dateTime. Verified FOTS/xs-dateTimeStamp tests are passing. Verified import module namespace schema = http://www.zorba-xquery.com/modules/schema;; schema:schema-type( fn:current-dateTime() ) returns xs:dateTimeStamp. -- https://code.launchpad.net/~zorba-coders/zorba/bug924756-xsDateTimeStamp/+merge/149901 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/bug924756-xsDateTimeStamp into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug924756-xsDateTimeStamp into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug924756-xsDateTimeStamp/+merge/149901 -- https://code.launchpad.net/~zorba-coders/zorba/bug924756-xsDateTimeStamp/+merge/149901 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/bug924756-xsDateTimeStamp into lp:zorba
I fixed the 2 +INF tests. -- https://code.launchpad.net/~zorba-coders/zorba/bug924756-xsDateTimeStamp/+merge/149901 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/bug924756-xsDateTimeStamp into lp:zorba
Cezar Andrei has proposed merging
lp:~zorba-coders/zorba/bug924756-xsDateTimeStamp into lp:zorba.
Commit message:
Add support for xs:dateTimeStamp XMLSchema 1.1 built-in type.
Requested reviews:
Cezar Andrei (cezar-andrei)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #924754 in Zorba: support for the xs:dateTimeStamp type
https://bugs.launchpad.net/zorba/+bug/924754
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug924756-xsDateTimeStamp/+merge/149901
Add support for xs:dateTimeStamp XMLSchema 1.1 built-in type.
--
https://code.launchpad.net/~zorba-coders/zorba/bug924756-xsDateTimeStamp/+merge/149901
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/store_consts.h'
--- include/zorba/store_consts.h 2012-12-05 03:33:46 +
+++ include/zorba/store_consts.h 2013-02-21 18:17:25 +
@@ -24,7 +24,7 @@
/***
!!! ATTENTION: The order of the enum values within SchemaTypeCode is important.
- !!! DO NOT change this order
+ !!! DO NOT change this order DO NOT insert in the middle
/
enum SchemaTypeCode
{
@@ -86,6 +86,7 @@
XS_NOTATION = 44,
JS_NULL = 45,
+ XS_DATETIME_STAMP= 46,
XS_LAST
};
=== modified file 'src/api/store_consts.cpp'
--- src/api/store_consts.cpp 2012-12-12 19:34:45 +
+++ src/api/store_consts.cpp 2013-02-21 18:17:25 +
@@ -70,6 +70,7 @@
xs:QNAME, // 43
xs:NOTATION,// 44
js:null,// 45
+xs:dateTimeStamp, // 46
};
if ( c = 0 c XS_LAST )
=== modified file 'src/store/api/item_factory.h'
--- src/store/api/item_factory.h 2013-02-12 04:20:23 +
+++ src/store/api/item_factory.h 2013-02-21 18:17:25 +
@@ -407,6 +407,50 @@
* @param xs:time Item (might be NULL)
*/
virtual bool createDateTime(Item_t result, const Item_t, const Item_t) = 0;
+
+
+ virtual bool createDateTimeStamp(
+ Item_t result,
+ const xs_dateTime* value) = 0;
+
+ virtual bool createDateTimeStamp(
+ store::Item_t result,
+ const xs_date* date,
+ const xs_time* time) = 0;
+
+
+ /**
+ * @param year
+ * @param month
+ * @param day
+ * @param hour
+ * @param minute
+ * @param second
+ * @param timeZone_hours Difference in hours to UTC
+ */
+ virtual bool createDateTimeStamp(
+ Item_t result,
+ short year,
+ short month,
+ short day,
+ short hour,
+ short minute,
+ double second,
+ short timeZone_hours) = 0;
+
+ /**
+ * Specification: [http://www.w3.org/TR/xmlschema11-2/#dateTimeStamp]
+ * @param value string representation of the value
+ */
+ virtual bool createDateTimeStamp(Item_t result, const char* str, ulong strlen) = 0;
+
+ /**
+ * Specification: [http://www.w3.org/TR/xpath-functions/] Section 5.2
+ *
+ * @param xs:date Item (might be NULL)
+ * @param xs:time Item (must not be NULL)
+ */
+ virtual bool createDateTimeStamp(Item_t result, const Item_t, const Item_t) = 0;
virtual bool createDate(Item_t result, const xs_date* value) = 0;
=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp 2013-02-18 14:54:25 +
+++ src/store/naive/simple_item_factory.cpp 2013-02-21 18:17:25 +
@@ -580,6 +580,114 @@
}
+bool BasicItemFactory::createDateTimeStamp(store::Item_t result, const xs_dateTime* value)
+{
+ if( value-hasTimezone() )
+ {
+result = new DateTimeItem(store::XS_DATETIME, value);
+return true;
+ }
+ else
+ {
+result = NULL;
+return false;
+ }
+}
+
+
+bool BasicItemFactory::createDateTimeStamp(
+ store::Item_t result,
+ const xs_date* date,
+ const xs_time* time)
+{
+ std::auto_ptrDateTimeItem dtin(new DateTimeItem(store::XS_DATETIME_STAMP));
+ int err = DateTime::createDateTime(date, time, dtin-theValue);
+ if (err == 0 time-hasTimezone())
+ {
+result = dtin.get();
+dtin.release();
+return true;
+ }
+ else
+ {
+result = NULL;
+return false;
+ }
+}
+
+
+bool BasicItemFactory::createDateTimeStamp(
+ store::Item_t result,
+ short year ,
+ short month,
+ short day,
+ short hour
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug924756-xsDateTimeStamp into lp:zorba
What about changing fn:current-dateTime() and our other nondeterministic dateTime functions? Sorin brought it up, we're trying to figure out a way to have it enabled. It's on my list, looking at it right now. -- https://code.launchpad.net/~zorba-coders/zorba/bug924756-xsDateTimeStamp/+merge/149901 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/oracle-ctest-j8 into lp:zorba/oracle-nosql-db-module
The proposal to merge lp:~zorba-coders/zorba/oracle-ctest-j8 into lp:zorba/oracle-nosql-db-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/oracle-ctest-j8/+merge/147338 -- https://code.launchpad.net/~zorba-coders/zorba/oracle-ctest-j8/+merge/147338 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-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/oracle-ctest-j8 into lp:zorba/oracle-nosql-db-module
Review: Approve Looks good -- https://code.launchpad.net/~zorba-coders/zorba/oracle-ctest-j8/+merge/147338 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-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/bug867068-fixErrorXQDY0027 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 -- https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 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
