[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Validation queue job csv_conv_module-2012-02-14T13-36-36.362Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/csv_conv_module-2012-02-14T13-36-36.362Z/log.html -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Review: Approve -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Validation queue job csv_conv_module-2012-02-08T18-47-40.291Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/csv_conv_module-2012-02-08T18-47-40.291Z/log.html -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Review: Approve -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module has been updated. Commit Message changed to: Changed type in csv options from xs:string to xs:boolean For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. Requested reviews: Zorba Coders (zorba-coders) Cezar Andrei (cezar-andrei) Related bugs: Bug #925133 in Zorba: "replace string restriction with xs:boolean in csv-options.xsd" https://bugs.launchpad.net/zorba/+bug/925133 For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Changed type in csv options from xs:string to xs:boolean -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/92072 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. === modified file 'src/com/zorba-xquery/www/modules/converters/csv-options.xsd' --- src/com/zorba-xquery/www/modules/converters/csv-options.xsd 2011-08-17 23:28:43 + +++ src/com/zorba-xquery/www/modules/converters/csv-options.xsd 2012-02-08 16:49:52 + @@ -35,20 +35,8 @@ - - - - - - - - - - - - - - + + -- Mailing list: https://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:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Review: Approve Not 100% backwards compatible in the schema sense but previous instances should still be valid. Daniel, you still need to fix the 3 tests failing. -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
The attempt to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module 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 csv_conv_module-2012-02-04T03-11-59.159Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/csv_conv_module-2012-02-04T03-11-59.159Z/log.html -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. Requested reviews: Cezar Andrei (cezar-andrei) Zorba Coders (zorba-coders) Related bugs: Bug #925133 in Zorba: "replace string restriction with xs:boolean in csv-options.xsd" https://bugs.launchpad.net/zorba/+bug/925133 For more details, see: https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 Changed type in csv options from xs:string to xs:boolean -- https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module. === modified file 'src/com/zorba-xquery/www/modules/converters/csv-options.xsd' --- src/com/zorba-xquery/www/modules/converters/csv-options.xsd 2011-08-17 23:28:43 + +++ src/com/zorba-xquery/www/modules/converters/csv-options.xsd 2012-02-02 19:36:21 + @@ -35,20 +35,8 @@ - - - - - - - - - - - - - - + + -- Mailing list: https://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:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/csv_conv_module
into lp:zorba/data-converters-module.
Requested reviews:
Cezar Andrei (cezar-andrei)
Daniel Turcanu (danielturcanu)
For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91335
Changed type in csvOptions from xs:string to xs:boolean.
--
https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91335
Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module.
=== modified file 'src/com/zorba-xquery/www/modules/converters/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/converters/CMakeLists.txt 2012-01-23 19:28:30 +
+++ src/com/zorba-xquery/www/modules/converters/CMakeLists.txt 2012-02-02 19:16:18 +
@@ -40,6 +40,38 @@
ENDIF (ZORBA_SUPPRESS_LIBTIDY)
MESSAGE (STATUS "")
+<<< TREE
+===
+
+#
+# Jansson
+#
+IF (ZORBA_SUPPRESS_JANSSON)
+ MESSAGE (STATUS "ZORBA_SUPPRESS_JANSSON is true - not searching for Jansson.")
+ELSE (ZORBA_SUPPRESS_JANSSON)
+
+ MESSAGE (STATUS "Looking for Jansson")
+ FIND_PACKAGE (Jansson)
+
+ IF (Jansson_FOUND)
+MESSAGE (STATUS "Found Jansson library -- " ${Jansson_LIBRARIES})
+
+SET (JSON_LINK_LIBRARIES ${Jansson_LIBRARIES})
+INCLUDE_DIRECTORIES (${Jansson_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES ("json.xq.src")
+DECLARE_ZORBA_SCHEMA (FILE "json-options.xsd"
+ URI "http://www.zorba-xquery.com/modules/converters/json-options";)
+DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/converters/json"; VERSION 1.0 FILE "json.xq" LINK_LIBRARIES "${Jansson_LIBRARIES}")
+ADD_TEST_DIRECTORY ("${PROJECT_SOURCE_DIR}/test_json")
+
+ ELSE (Jansson_FOUND)
+MESSAGE (STATUS "Jansson library not found -- if you want to use Json functionality please set Jansson_INCLUDE_DIRS and Jansson_LIBRARIES cmake parameters.")
+ ENDIF (Jansson_FOUND)
+ENDIF (ZORBA_SUPPRESS_JANSSON)
+MESSAGE (STATUS "")
+
+
+>>> MERGE-SOURCE
# csv
DECLARE_ZORBA_SCHEMA (FILE csv-options.xsd
URI "http://www.zorba-xquery.com/modules/converters/csv-options";)
@@ -59,7 +91,10 @@
ADD_TEST ("streamable_string_streambuf" StreambufUnitTests "streambuftest")
ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
+<<< TREE
IF(ZORBA_NO_UNICODE)
SET_TESTS_PROPERTIES(zorba_data-converters_module/converters/csv/csv_parse_utf8_11.xq
PROPERTIES WILL_FAIL TRUE)
ENDIF(ZORBA_NO_UNICODE)
+===
+>>> MERGE-SOURCE
=== modified file 'src/com/zorba-xquery/www/modules/converters/csv-options.xsd'
--- src/com/zorba-xquery/www/modules/converters/csv-options.xsd 2011-08-17 23:28:43 +
+++ src/com/zorba-xquery/www/modules/converters/csv-options.xsd 2012-02-02 19:16:18 +
@@ -35,20 +35,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
=== modified file 'test_html/Queries/converters/html/link_crawler2.xq2'
--- test_html/Queries/converters/html/link_crawler2.xq2 2011-10-06 07:40:17 +
+++ test_html/Queries/converters/html/link_crawler2.xq2 2012-02-02 19:16:18 +
@@ -18,6 +18,7 @@
import module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";;
import module namespace html = "http://www.zorba-xquery.com/modules/converters/html";;
import module namespace parse-xml = "http://www.zorba-xquery.com/modules/xml";;
+import module namespace file = "http://expath.org/ns/file";;
declare namespace ann = "http://www.zorba-xquery.com/annotations";;
declare namespace xhtml="http://www.w3.org/1999/xhtml";;
@@ -25,16 +26,23 @@
declare namespace err="http://www.w3.org/2005/xqt-errors";;
declare namespace httpsch = "http://expath.org/ns/http-client";;
-declare variable $top-uri as xs:string := "http://www.zorba-xquery.com/site2/html/index.html";;
-declare variable $uri-host as xs:string := "http://www.zorba-xquery.com/site2/";;
-
-
-declare variable $supported-media-types as xs:string+ := ("text/xml", "application/xml", "text/xml-external-parsed-entity", "application/xml-external-parsed-entity",
- "application/atom+xml", "text/html");
-
-
-declare variable $local:processed-internal-links:=xs:QName("processed-internal-links");
-declare variable $local:processed-external-links :=xs:QName("processed-external-links");
+declare variable $top-uri as xs:string := "http://www.zorba-xquery.com/site2/";;
+declare variable $uri-host as xs:string := "http://www.zorba-xquery.com";;
+
+
+
+declare variable $local:processed-internal-links := xs:QName("processed-internal-links");
+declare variable $local:processed-external-links := xs:QName("processed-external-links");
+declare variable $local:tidy-options := http://www.zorba-xquery.com/modules/converters/html-options"; >
+
+
+
+
