[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba
Validation queue job bug-1055608-node-kinds-for-roundtrip-2012-09-27T05-41-43.261Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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-1055608-node-kinds-for-roundtrip into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog text conflict in src/runtime/xqdoc/xqdoc_impl.cpp -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/expath_geo_doc into lp:zorba/geo-module
The proposal to merge lp:~zorba-coders/zorba/expath_geo_doc into lp:zorba/geo-module has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/expath_geo_doc/+merge/126447 -- https://code.launchpad.net/~zorba-coders/zorba/expath_geo_doc/+merge/126447 Your team Zorba Coders is subscribed to branch lp:zorba/geo-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/expath_http_doc into lp:zorba/http-client-module
Thanks a lot I didn't catch it. I will fix this and merge the branch. -- https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqdoc-extensions-2012-09-27T08-26-19.927Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba
Validation queue job xqdoc-extensions-2012-09-27T08-26-19.927Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job markos-scratch-2012-09-27T10-00-01.485Z is finished. The final status was: 4 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-27T11-32-56.524Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-27T11-32-56.524Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-27T11-57-46.104Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xpath_doc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xpath_doc into lp:zorba has been updated. Commit Message changed to: Update the XPath module documentation. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/126681 -- https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/126681 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/expath_http_doc into lp:zorba/http-client-module
The proposal to merge lp:~zorba-coders/zorba/expath_http_doc into lp:zorba/http-client-module has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 -- https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog text conflict in modules/com/zorba-xquery/www/modules/xqdoc.xq -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/126382 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/new-xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-xqdoc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/126382 -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/126382 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/fread-pdf-trunk into lp:zorba
It's strange that a few tests where failing because pdfbox was trying to use lob4j. The website clearly says it depends on commons-logging which can use log4j if available but fall down to java's default logging api. I added explicit checks for jempbox and commons-lib to read-pdf module. And also added them to classpath. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/process_doc into lp:zorba/process-module
William Candillon has proposed merging lp:~zorba-coders/zorba/process_doc into lp:zorba/process-module. Commit message: Minor documentation improvements. Requested reviews: William Candillon (wcandillon) Cezar Andrei (cezar-andrei) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/process_doc/+merge/126738 Minor documentation improvements. -- https://code.launchpad.net/~zorba-coders/zorba/process_doc/+merge/126738 Your team Zorba Coders is subscribed to branch lp:zorba/process-module. === modified file 'src/com/zorba-xquery/www/modules/process.xq' --- src/com/zorba-xquery/www/modules/process.xq 2012-04-11 09:50:21 + +++ src/com/zorba-xquery/www/modules/process.xq 2012-09-27 16:56:39 + @@ -21,22 +21,22 @@ : (i.e. exit code, result on standard out and error). : : Example: - :pre class=brush: xquery; + :pre class=ace-static ace-mode=xquery : import module namespace proc = http://www.zorba-xquery.com/modules/process;; : proc:exec(ls) :/pre : : Potential result: - : pre - : lt;result xmlns=http://www.zorba-xquery.com/modules/process; - : lt;stdoutmyfile.txtlt;/stout - : lt;stderr/ - : lt;exit-code0lt;/exit-code - : lt;/result - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[ + : result xmlns=http://www.zorba-xquery.com/modules/process; + : stdoutmyfile.txt/stout + : stderr/ + : exit-code0/exit-code + : /result + : ]]/pre : : @author Cezar Andrei - : @project external + : @project Zorba/IO/Process : :) module namespace process = http://www.zorba-xquery.com/modules/process;; -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/process_doc into lp:zorba/process-module
The proposal to merge lp:~zorba-coders/zorba/process_doc into lp:zorba/process-module has been updated. Commit Message changed to: Minor documentation improvements. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/process_doc/+merge/126738 -- https://code.launchpad.net/~zorba-coders/zorba/process_doc/+merge/126738 Your team Zorba Coders is subscribed to branch lp:zorba/process-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/system_doc into lp:zorba/process-module
William Candillon has proposed merging lp:~zorba-coders/zorba/system_doc into
lp:zorba/process-module.
Commit message:
Minor documentation improvement
Requested reviews:
William Candillon (wcandillon)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/system_doc/+merge/126739
Minor documentation improvement
--
https://code.launchpad.net/~zorba-coders/zorba/system_doc/+merge/126739
Your team Zorba Coders is subscribed to branch lp:zorba/process-module.
=== added file 'CMakeLists.txt'
--- CMakeLists.txt 1970-01-01 00:00:00 +
+++ CMakeLists.txt 2012-09-27 16:59:25 +
@@ -0,0 +1,29 @@
+# Copyright 2006-2010 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+PROJECT (zorba_system_module)
+ENABLE_TESTING ()
+INCLUDE (CTest)
+
+LIST (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules)
+
+FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
+INCLUDE (${Zorba_USE_FILE})
+
+ADD_TEST_DIRECTORY(${PROJECT_SOURCE_DIR}/test)
+ADD_SUBDIRECTORY(src)
+
+DONE_DECLARING_ZORBA_URIS()
=== renamed file 'CMakeLists.txt' = 'CMakeLists.txt.moved'
=== added directory 'src'
=== renamed directory 'src' = 'src.moved'
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/CMakeLists.txt 2012-09-27 16:59:25 +
@@ -0,0 +1,19 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# all external module libraries are generated in the directory
+# of the corresponding .xq file
+MESSAGE(STATUS Add com)
+ADD_SUBDIRECTORY(com)
+MESSAGE(STATUS End modules)
=== added directory 'src/com'
=== added file 'src/com/CMakeLists.txt'
--- src/com/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/com/CMakeLists.txt 2012-09-27 16:59:25 +
@@ -0,0 +1,14 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+ADD_SUBDIRECTORY(zorba-xquery)
=== added directory 'src/com/zorba-xquery'
=== added file 'src/com/zorba-xquery/CMakeLists.txt'
--- src/com/zorba-xquery/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/com/zorba-xquery/CMakeLists.txt 2012-09-27 16:59:25 +
@@ -0,0 +1,14 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+ADD_SUBDIRECTORY(www)
=== added directory 'src/com/zorba-xquery/www'
=== added file 'src/com/zorba-xquery/www/CMakeLists.txt'
--- src/com/zorba-xquery/www/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/com/zorba-xquery/www/CMakeLists.txt 2012-09-27 16:59:25 +
@@ -0,0 +1,14 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+#
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/system_doc into lp:zorba/system-module
William Candillon has proposed merging lp:~zorba-coders/zorba/system_doc into lp:zorba/system-module. Commit message: Minor documentation improvement. Requested reviews: William Candillon (wcandillon) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/system_doc/+merge/126740 Minor documentation improvement -- https://code.launchpad.net/~zorba-coders/zorba/system_doc/+merge/126740 Your team Zorba Coders is subscribed to branch lp:zorba/system-module. === modified file 'src/com/zorba-xquery/www/modules/system.xq' --- src/com/zorba-xquery/www/modules/system.xq 2012-04-11 09:50:31 + +++ src/com/zorba-xquery/www/modules/system.xq 2012-09-27 16:59:28 + @@ -24,7 +24,7 @@ : all environment variables are prefixed with ienv./i. : br / : For instance, the following query: br / - : pre class=brush: xquery; + : pre class=ace-static : import module namespace system = http://www.zorba-xquery.com/modules/system;; : : for $prop in system:properties() @@ -33,7 +33,7 @@ : /pre : br / : Will output: - : pre + : pre class=ace-static : env.TERM_PROGRAM: Apple_Terminal : ... : /pre @@ -41,7 +41,7 @@ : with the key env.PATH. : : @author Markus Pilman - : @project external + : @project Zorba/IO/System :) module namespace system = 'http://www.zorba-xquery.com/modules/system'; -- Mailing list: https://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/system_doc into lp:zorba/process-module
The proposal to merge lp:~zorba-coders/zorba/system_doc into lp:zorba/process-module has been updated. Commit Message changed to: Minor documentation improvement For more details, see: https://code.launchpad.net/~zorba-coders/zorba/system_doc/+merge/126739 -- https://code.launchpad.net/~zorba-coders/zorba/system_doc/+merge/126739 Your team Zorba Coders is subscribed to branch lp:zorba/process-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/fread-pdf-trunk into
lp:zorba.
Requested reviews:
Cezar Andrei (cezar-andrei)
Matthias Brantner (matthias-brantner)
Juan Zacarias (juan457)
Related bugs:
Bug #1012417 in Zorba: PDF to XML data convertor
https://bugs.launchpad.net/zorba/+bug/1012417
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743
Make doc comments for createBaser64Binary more explicit on what parameters they
expect and what they do.
Change, return value to xs_int for getIntValue() method.
--
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-27 10:33:31 +
+++ ChangeLog 2012-09-27 17:07:28 +
@@ -17,10 +17,11 @@
* Implemented semantics of null for comparison and arithmetics operations.
* Positional pagination support for index probes
* Recognize the no-copy pragma to avoid copying nodes before insertion into a collection.
- * Added createUntypedAtomic to API's ItemFactory.
+ * Added createUntypedAtomic to API's ItemFactory.
* new xqDoc feature; reporting collections and indexes
* new xqDoc function parameter to enable/disable xqDoc generation of
certain components
+ * Adding new external module read-pdf, it converts PDF documents to text or rendered images.
Optimizations:
* New memory management for compiler expressions (no more ref counting)
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2012-09-17 00:36:37 +
+++ cmake_modules/ZorbaModule.cmake 2012-09-27 17:07:28 +
@@ -114,9 +114,20 @@
# relative to CMAKE_CURRENT_SOURCE_DIR)
# LINK_LIBRARIES - (optional) List of libraries to link external
# function library against
+# CONFIG_FILES - (optional) List of files to configure with package
+# information; see below
# TEST_ONLY - (optional) Module is for testcases only and should not
# be installed
#
+# CONFIG_FILES - any files specific here will be copied to
+# CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
+# the following @VARIABLES@ which will be substituted:
+# ZORBA_MODULE_RELATIVE_DIR - directory portion of mangled URI
+# ZORBA_MODULE_LIBFILE_WE - filename (without extension) portion of
+# mangled URI
+# The input files should have a .in extension. The resulting file in
+# the build directory will have the .in removed.
+#
# QQQ this currently doesn't support modules with multiple component
# .xq files. (Neither does Zorba's automatic loading mechanism, so
# this probably isn't a huge deal, but worth thinking about.)
@@ -125,7 +136,7 @@
# file enough to deduce the URI and version?
MACRO (DECLARE_ZORBA_MODULE)
# Parse and validate arguments
- PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES
+ PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES
URI;FILE;VERSION TEST_ONLY ${ARGN})
IF (NOT MODULE_FILE)
MESSAGE (FATAL_ERROR 'FILE' argument is required for ZORBA_DECLARE_MODULE())
@@ -353,6 +364,20 @@
${version_infix} 1 ${MODULE_TEST_ONLY})
ENDFOREACH (version_infix)
+ # Configure any module-specified config files.
+ SET (ZORBA_MODULE_RELATIVE_DIR ${module_path})
+ SET (ZORBA_MODULE_LIBFILE_WE ${module_filewe})
+ FOREACH (_config_file ${MODULE_CONFIG_FILES})
+# Strip off .in - can't use GET_FILENAME_COMPONENT as it always removes
+# the longest possible extension
+STRING (REGEX REPLACE \\.in$ _config_filename_we ${_config_file})
+IF (NOT IS_ABSOLUTE ${_config_file})
+ SET (_config_file ${CMAKE_CURRENT_SOURCE_DIR}/${_config_file})
+ENDIF (NOT IS_ABSOLUTE ${_config_file})
+CONFIGURE_FILE (${_config_file}
+ ${CMAKE_CURRENT_BINARY_DIR}/${_config_filename_we} @ONLY)
+ ENDFOREACH (_config_file)
+
# Last but not least, whip up a test case that ensures the module
# can at least be compiled. Don't bother for test-only modules
# (presumably they're there to be tested!).
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2012-09-26 17:09:11 +
+++ include/zorba/item_factory.h 2012-09-27 17:07:28 +
@@ -123,8 +123,8 @@
/** \brief Creates a Base64Binary Item
* see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
*
- * @param aBinData a pointer to the base6c4 binary data.
- * @param aLength the length of the base64 binary data.
+ * @param aBinData a pointer to the base64 encoded data. The data is copied from aBinData.
+ * @param aLength the length of the base64 encoded data.
* @return The Base64Binary Item.
*/
virtual Item
@@ -133,7 +133,7 @@
/** \brief Creates a Base64Binary Item
* see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
*
- * @param aStream
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/fread-pdf-trunk into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/email_doc into lp:zorba/email-module
William Candillon has proposed merging lp:~zorba-coders/zorba/email_doc into lp:zorba/email-module. Commit message: Minor documentation improvements. Requested reviews: William Candillon (wcandillon) Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126746 Minor documentation improvements. -- https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126746 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. === modified file 'src/com/zorba-xquery/www/modules/email/imap.xq' --- src/com/zorba-xquery/www/modules/email/imap.xq 2012-04-11 09:50:26 + +++ src/com/zorba-xquery/www/modules/email/imap.xq 2012-09-27 17:12:24 + @@ -25,21 +25,21 @@ : in the email schema: codehttp://www.zorba-xquery.com/modules/email/code. : : For example: - : pre - : lt;email:hostInfogt; - : lt;email:hostNamegt;imap.example.comlt;/email:hostNamegt; - : lt;email:userNamegt;myuserlt;/email:userNamegt; - : lt;email:passwordgt;mypasswordlt;/email:passwordgt; - : lt;/email:hostInfogt; - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[ + : email:hostInfo + : email:hostNameimap.example.com/email:hostName + : email:userNamemyuser/email:userName + : email:passwordmypassword/email:password + : /email:hostInfo + : ]]/pre : : The codehostInfoType/code only needs to be in the email schema namespace : (codehttp://www.zorba-xquery.com/modules/email/code). It does not need : to be validated since it's validated by the module. : : @author Daniel Thomas, Gabriel Petrovay - : @library a href=http://www.washington.edu/imap/;c-client library part of UW IMAP toolkit/a - : @project communication + : @see a href=http://www.washington.edu/imap/;c-client library part of UW IMAP toolkit/a + : @project Zorba/IO/IMAP :) module namespace imap = 'http://www.zorba-xquery.com/modules/email/imap'; === modified file 'src/com/zorba-xquery/www/modules/email/smtp.xq' --- src/com/zorba-xquery/www/modules/email/smtp.xq 2012-04-11 09:50:26 + +++ src/com/zorba-xquery/www/modules/email/smtp.xq 2012-09-27 17:12:24 + @@ -27,8 +27,8 @@ : documentation associated with this function. : : @author Sorin Nasoi, Daniel Thomas - : @library a href=http://www.washington.edu/imap/;c-client Library part of UW IMAP toolkit/a - : @project communication + : @see a href=http://www.washington.edu/imap/;c-client Library part of UW IMAP toolkit/a + : @project Zorba/IO/SMTP :) module namespace smtp = http://www.zorba-xquery.com/modules/email/smtp;; @@ -55,13 +55,13 @@ : /ul : : The code$host-info/code parameter could then look like this: - : pre - : lt;hostInfogt; - : lt;hostNamegt;smtp.gmail.com:587/tls/novalidate-certlt;hostNamegt; - : lt;userNamegt;usernamelt;userNamegt; - : lt;passwordgt;passwordlt;passwordgt; - : lt;/hostInfogt; - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[ + : hostInfo + : hostNamesmtp.gmail.com:587/tls/novalidate-cert/hostName + : userNameusername/userName + : passwordpassword/password + : /hostInfo + : ]]/pre : : For a complete of the structure of an email message, see the imported email : schema: codehttp://www.zorba-xquery.com/modules/email/code -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/email_doc into lp:zorba/email-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126746 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/system_doc into lp:zorba/process-module
Review: Needs Information You were trying to merge the system into the process module. Is that on purpose? -- https://code.launchpad.net/~zorba-coders/zorba/system_doc/+merge/126739 Your team Zorba Coders is subscribed to branch lp:zorba/process-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/email_doc into lp:zorba/email-module
The proposal to merge lp:~zorba-coders/zorba/email_doc into lp:zorba/email-module has been updated. Commit Message changed to: Minor documentation improvements. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126746 -- https://code.launchpad.net/~zorba-coders/zorba/email_doc/+merge/126746 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125356 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- Mailing list: https://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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126757 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126757 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- Mailing list: https://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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental has been updated. Commit Message changed to: Testing doc for new read-pdf module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126757 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126757 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- Mailing list: https://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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126757 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- Mailing list: https://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/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental
The attempt to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:~zorba-coders/zorba/zorba-experimental failed. Below is the output from the failed tests. experimental build started for lp:~zorba-coders/zorba/fread-pdf-trunk. Check out http://fread-pdf-trunk.zorba-xquery.com/ in half an hour or so. Logfile at http://zorbatest.lambda.nu:8080/remotequeue/experimental/fread-pdf-trunk.log . -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126757 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/fread-pdf-trunk. -- Mailing list: https://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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Commit Message changed to: Add read-pdf module for getting text and rendered images from pdf documents. Make doc comments for createBaser64Binary more explicit on what parameters they expect and what they do. Change, return value to xs_int for getIntValue() method. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/fread-pdf-trunk into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fread-pdf-trunk-2012-09-27T19-32-56.467Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/prep-2.7 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/prep-2.7 into
lp:zorba.
Commit message:
2.7 release preparations
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810
--
https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-09-17 00:36:37 +
+++ CMakeLists.txt 2012-09-27 21:40:26 +
@@ -472,7 +472,7 @@
# zorba versioning
SET(ZORBA_MAJOR_NUMBER 2)
-SET(ZORBA_MINOR_NUMBER 6)
+SET(ZORBA_MINOR_NUMBER 7)
SET(ZORBA_PATCH_NUMBER 0)
SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
MESSAGE(STATUS Zorba version number: ${ZORBA_VERSION})
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-27 10:33:31 +
+++ ChangeLog 2012-09-27 21:40:26 +
@@ -3,19 +3,19 @@
version 2.7
New Features:
- * New XQuery 3.0 simple map operator http://www.w3.org/TR/xquery-30/#id-map-operator
- * New node copy function added to the node module
+ * XQuery 3.0 simple map operator http://www.w3.org/TR/xquery-30/#id-map-operator
+ * Copy function added to the node module
* Allow prolog variables to be referenced before they are declared (XQuery 3.0 feature)
+ * Module http://www.jsoniq.org/modules/function-library with handy JSONiq functions
+ * jn:parse-json can parse multiple top-level JSON items
+ * New semantics of null for comparison and arithmetics operations
* xml:parse (fragment parsing) now allows for a DOCTYPE declaration at the
beginning of the XML document (requested in bug #1016606).
- * New module http://jsoniq.org/modules/function-library with handy JSONiq
-functions. jn:object is also supported.
- * jn:parse-json can parse multiple top-level JSON items. Also, there is jn:parse-json#2 that
-takes options to parameterize the parsing process (see bug #1047547)
* Roundtripping of JSON items has been moved from the serializer to encoding functions.
* Best-effort serialization of atomic values in JSON items.
- * Implemented semantics of null for comparison and arithmetics operations.
* Positional pagination support for index probes
+ * Recognize the {http://www.zorba-xquery.com/extensions}no-copy pragma to avoid
+ copying nodes before insertion into a collection.
* Recognize the no-copy pragma to avoid copying nodes before insertion into a collection.
* Added createUntypedAtomic to API's ItemFactory.
* new xqDoc feature; reporting collections and indexes
@@ -23,8 +23,8 @@
certain components
Optimizations:
- * New memory management for compiler expressions (no more ref counting)
- * Exteneded some optimization rules (variable inlining/elimination and positional
+ * Improved memory management for compiler expressions (no more ref counting)
+ * Exteneded optimization rules (for variable inlining/elimination and positional
predicate rewrite) to general flwor expressions.
* Early optimization of positional predicates to subsequence expressions: now
done at translation time, if possible.
@@ -47,8 +47,6 @@
variables in main module and provide api function to assign values to these
variables)
* Fixed bug #899366 (enforce the type declaration of a window variable)
- * Now using native UUID libraries.
- * Fixed bug in implementation of xqdoc functions
* Fixed bug #1034942 (improper variable inlining inside general flwor expr)
* Fixed bug #1024892 (index declaration references udf declared after the index)
* Fixed bug #1038410 (Memory leaks in parser, trace iterator, and general index)
@@ -59,9 +57,8 @@
* Fixed bug #1039488 (inserting more than one pair at once in a JSON object)
* Fixed bug #1042840 (qname pool free-list corruption)
* Fixed bug #866984 (better error message for an eval error)
+ * Fixed bug #1047538 (SourceFinder::findLocalNodeSources missing json expressions)
* Fixed bug #932374 (FOTS fn:matches failing tests)
- * Fixed bug #1047538 (jsoniq: SourceFinder::findLocalNodeSources missing
-json expressions)
* Fixed #1052383 (accessing context item in eval expr)
* Fixed bug #1046559 (dynamic resolution between function invocation and jsoniq
navigation)
@@ -72,6 +69,7 @@
* Fixed bug #866994 (a better error message when collection iterator not open)
* Fixed bug #1039254 (allow empty sequence as position value in positional LET
var iterator)
+ * Use platform's native UUID library
version 2.6
=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf 2012-09-17 00:36:37 +
+++ modules/ExternalModules.conf 2012-09-27 21:40:26 +
@@ -26,24 +26,24 @@
# tag is the VCS tag to check out (optional - defaults to HEAD;
# currently only works for bzr, since svn tags are just different URLS)
-archive bzr lp:zorba/archive-module zorba-2.6
-csv
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/prep-2.7 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/prep-2.7-2012-09-27T21-41-40.063Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/prep-2.7 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/prep-2.7 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prep-2.7 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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-1055608-node-kinds-for-roundtrip into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/prep-2.7 into lp:zorba
Review: Needs Fixing Exteneded - Extended -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/prep-2.7 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/prep-2.7 into lp:zorba
Review: Approve This changes everything. -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/prep-2.7 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prep-2.7 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/prep-2.7 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/prep-2.7-2012-09-27T22-29-41.744Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/fread-pdf-trunk into lp:zorba
Review: Approve Fixed fonts on build box and changed tests to be machine independent. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/fread-pdf-trunk into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/prep-2.7 into lp:zorba
Validation queue job prep-2.7-2012-09-27T22-29-41.744Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/prep-2.7 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prep-2.7 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 -- https://code.launchpad.net/~zorba-coders/zorba/prep-2.7/+merge/126810 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/fread-pdf-trunk into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in modules/ExternalModules.conf -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126743 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/fread-pdf-trunk into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/fread-pdf-trunk into
lp:zorba.
Commit message:
Add read-pdf module for getting text and rendered images from pdf documents.
Make doc comments for createBaser64Binary more explicit on what parameters they
expect and what they do.
Change, return value to xs_int for getIntValue() method.
Requested reviews:
Cezar Andrei (cezar-andrei)
Matthias Brantner (matthias-brantner)
Juan Zacarias (juan457)
Related bugs:
Bug #1012417 in Zorba: PDF to XML data convertor
https://bugs.launchpad.net/zorba/+bug/1012417
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126822
Add read-pdf module for getting text and rendered images from pdf documents.
Make doc comments for createBaser64Binary more explicit on what parameters they
expect and what they do.
Change, return value to xs_int for getIntValue() method.
--
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126822
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-27 22:25:40 +
+++ ChangeLog 2012-09-27 23:07:25 +
@@ -17,10 +17,11 @@
* Recognize the {http://www.zorba-xquery.com/extensions}no-copy pragma to avoid
copying nodes before insertion into a collection.
* Recognize the no-copy pragma to avoid copying nodes before insertion into a collection.
- * Added createUntypedAtomic to API's ItemFactory.
+ * Added createUntypedAtomic to API's ItemFactory.
* new xqDoc feature; reporting collections and indexes
* new xqDoc function parameter to enable/disable xqDoc generation of
certain components
+ * Adding new external module read-pdf, it converts PDF documents to text or rendered images.
Optimizations:
* Improved memory management for compiler expressions (no more ref counting)
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2012-09-17 00:36:37 +
+++ cmake_modules/ZorbaModule.cmake 2012-09-27 23:07:25 +
@@ -114,9 +114,20 @@
# relative to CMAKE_CURRENT_SOURCE_DIR)
# LINK_LIBRARIES - (optional) List of libraries to link external
# function library against
+# CONFIG_FILES - (optional) List of files to configure with package
+# information; see below
# TEST_ONLY - (optional) Module is for testcases only and should not
# be installed
#
+# CONFIG_FILES - any files specific here will be copied to
+# CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
+# the following @VARIABLES@ which will be substituted:
+# ZORBA_MODULE_RELATIVE_DIR - directory portion of mangled URI
+# ZORBA_MODULE_LIBFILE_WE - filename (without extension) portion of
+# mangled URI
+# The input files should have a .in extension. The resulting file in
+# the build directory will have the .in removed.
+#
# QQQ this currently doesn't support modules with multiple component
# .xq files. (Neither does Zorba's automatic loading mechanism, so
# this probably isn't a huge deal, but worth thinking about.)
@@ -125,7 +136,7 @@
# file enough to deduce the URI and version?
MACRO (DECLARE_ZORBA_MODULE)
# Parse and validate arguments
- PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES
+ PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES
URI;FILE;VERSION TEST_ONLY ${ARGN})
IF (NOT MODULE_FILE)
MESSAGE (FATAL_ERROR 'FILE' argument is required for ZORBA_DECLARE_MODULE())
@@ -353,6 +364,20 @@
${version_infix} 1 ${MODULE_TEST_ONLY})
ENDFOREACH (version_infix)
+ # Configure any module-specified config files.
+ SET (ZORBA_MODULE_RELATIVE_DIR ${module_path})
+ SET (ZORBA_MODULE_LIBFILE_WE ${module_filewe})
+ FOREACH (_config_file ${MODULE_CONFIG_FILES})
+# Strip off .in - can't use GET_FILENAME_COMPONENT as it always removes
+# the longest possible extension
+STRING (REGEX REPLACE \\.in$ _config_filename_we ${_config_file})
+IF (NOT IS_ABSOLUTE ${_config_file})
+ SET (_config_file ${CMAKE_CURRENT_SOURCE_DIR}/${_config_file})
+ENDIF (NOT IS_ABSOLUTE ${_config_file})
+CONFIGURE_FILE (${_config_file}
+ ${CMAKE_CURRENT_BINARY_DIR}/${_config_filename_we} @ONLY)
+ ENDFOREACH (_config_file)
+
# Last but not least, whip up a test case that ensures the module
# can at least be compiled. Don't bother for test-only modules
# (presumably they're there to be tested!).
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2012-09-26 17:09:11 +
+++ include/zorba/item_factory.h 2012-09-27 23:07:25 +
@@ -123,8 +123,8 @@
/** \brief Creates a Base64Binary Item
* see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
*
- * @param aBinData a pointer to the base6c4 binary data.
- * @param aLength the length of the base64 binary data.
+ * @param aBinData a pointer to the base64 encoded
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba
Review: Approve Merged and solved conflict. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126822 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/fread-pdf-trunk into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in modules/ExternalModules.conf -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126822 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126822 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126822 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/fread-pdf-trunk into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/fread-pdf-trunk into
lp:zorba.
Commit message:
Add read-pdf module for getting text and rendered images from pdf documents.
Make doc comments for createBaser64Binary more explicit on what parameters they
expect and what they do.
Change, return value to xs_int for getIntValue() method.
Requested reviews:
Matthias Brantner (matthias-brantner)
Cezar Andrei (cezar-andrei)
Juan Zacarias (juan457)
Related bugs:
Bug #1012417 in Zorba: PDF to XML data convertor
https://bugs.launchpad.net/zorba/+bug/1012417
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126823
Add read-pdf module for getting text and rendered images from pdf documents.
Make doc comments for createBaser64Binary more explicit on what parameters they
expect and what they do.
Change, return value to xs_int for getIntValue() method.
--
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126823
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-27 22:25:40 +
+++ ChangeLog 2012-09-27 23:12:27 +
@@ -17,10 +17,11 @@
* Recognize the {http://www.zorba-xquery.com/extensions}no-copy pragma to avoid
copying nodes before insertion into a collection.
* Recognize the no-copy pragma to avoid copying nodes before insertion into a collection.
- * Added createUntypedAtomic to API's ItemFactory.
+ * Added createUntypedAtomic to API's ItemFactory.
* new xqDoc feature; reporting collections and indexes
* new xqDoc function parameter to enable/disable xqDoc generation of
certain components
+ * Adding new external module read-pdf, it converts PDF documents to text or rendered images.
Optimizations:
* Improved memory management for compiler expressions (no more ref counting)
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2012-09-17 00:36:37 +
+++ cmake_modules/ZorbaModule.cmake 2012-09-27 23:12:27 +
@@ -114,9 +114,20 @@
# relative to CMAKE_CURRENT_SOURCE_DIR)
# LINK_LIBRARIES - (optional) List of libraries to link external
# function library against
+# CONFIG_FILES - (optional) List of files to configure with package
+# information; see below
# TEST_ONLY - (optional) Module is for testcases only and should not
# be installed
#
+# CONFIG_FILES - any files specific here will be copied to
+# CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
+# the following @VARIABLES@ which will be substituted:
+# ZORBA_MODULE_RELATIVE_DIR - directory portion of mangled URI
+# ZORBA_MODULE_LIBFILE_WE - filename (without extension) portion of
+# mangled URI
+# The input files should have a .in extension. The resulting file in
+# the build directory will have the .in removed.
+#
# QQQ this currently doesn't support modules with multiple component
# .xq files. (Neither does Zorba's automatic loading mechanism, so
# this probably isn't a huge deal, but worth thinking about.)
@@ -125,7 +136,7 @@
# file enough to deduce the URI and version?
MACRO (DECLARE_ZORBA_MODULE)
# Parse and validate arguments
- PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES
+ PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES
URI;FILE;VERSION TEST_ONLY ${ARGN})
IF (NOT MODULE_FILE)
MESSAGE (FATAL_ERROR 'FILE' argument is required for ZORBA_DECLARE_MODULE())
@@ -353,6 +364,20 @@
${version_infix} 1 ${MODULE_TEST_ONLY})
ENDFOREACH (version_infix)
+ # Configure any module-specified config files.
+ SET (ZORBA_MODULE_RELATIVE_DIR ${module_path})
+ SET (ZORBA_MODULE_LIBFILE_WE ${module_filewe})
+ FOREACH (_config_file ${MODULE_CONFIG_FILES})
+# Strip off .in - can't use GET_FILENAME_COMPONENT as it always removes
+# the longest possible extension
+STRING (REGEX REPLACE \\.in$ _config_filename_we ${_config_file})
+IF (NOT IS_ABSOLUTE ${_config_file})
+ SET (_config_file ${CMAKE_CURRENT_SOURCE_DIR}/${_config_file})
+ENDIF (NOT IS_ABSOLUTE ${_config_file})
+CONFIGURE_FILE (${_config_file}
+ ${CMAKE_CURRENT_BINARY_DIR}/${_config_filename_we} @ONLY)
+ ENDFOREACH (_config_file)
+
# Last but not least, whip up a test case that ensures the module
# can at least be compiled. Don't bother for test-only modules
# (presumably they're there to be tested!).
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2012-09-26 17:09:11 +
+++ include/zorba/item_factory.h 2012-09-27 23:12:27 +
@@ -123,8 +123,8 @@
/** \brief Creates a Base64Binary Item
* see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
*
- * @param aBinData a pointer to the base6c4 binary data.
- * @param aLength the length of the base64 binary data.
+ * @param aBinData a pointer to the base64 encoded
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Commit Message changed to: Add read-pdf module for getting text and rendered images from pdf documents. Make doc comments for createBaser64Binary more explicit on what parameters they expect and what they do. Change, return value to xs_int for getIntValue() method. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126823 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126823 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/fread-pdf-trunk into lp:zorba
Review: Approve Merged and solved conflict. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126823 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/fread-pdf-trunk into lp:zorba
Review: Approve Now with tag for read-pdf. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126824 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-1057792-serialize-nested-xdm-nodes into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1057792-serialize-nested-xdm-nodes/+merge/126833 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1057792-serialize-nested-xdm-nodes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1057792-serialize-nested-xdm-nodes into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1057792-serialize-nested-xdm-nodes/+merge/126833 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1057792-serialize-nested-xdm-nodes/+merge/126833 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
