Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189862-stack into lp:zorba/stack-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412 Your team Zorba Coders is subscribed to branch lp:zorba/stack-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/bug-1189862-queue into lp:zorba/queue-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414 Your team Zorba Coders is subscribed to branch lp:zorba/queue-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/bug-1189862 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 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-1189862 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 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-1189862 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412 https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 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-1189862-stack into lp:zorba/stack-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412 Your team Zorba Coders is subscribed to branch lp:zorba/stack-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/bug-1189862 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189862 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 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-1189862 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 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-1189862-queue into lp:zorba/queue-module
The proposal to merge lp:~zorba-coders/zorba/bug-1189862-queue into lp:zorba/queue-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414 Your team Zorba Coders is subscribed to branch lp:zorba/queue-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/bug-1189862-stack into lp:zorba/stack-module
The proposal to merge lp:~zorba-coders/zorba/bug-1189862-stack into lp:zorba/stack-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412 Your team Zorba Coders is subscribed to branch lp:zorba/stack-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/bug-1189862-queue into lp:zorba/queue-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414 Your team Zorba Coders is subscribed to branch lp:zorba/queue-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/bug-1188048 into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188048 into lp:zorba/html-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1188048
into lp:zorba/html-module.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
Related bugs:
Bug #1188048 in Zorba: Update non-core module html
https://bugs.launchpad.net/zorba/+bug/1188048
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730
Your team Zorba Coders is subscribed to branch lp:zorba/html-module.
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2013-03-28 01:02:11 +
+++ src/CMakeLists.txt 2013-10-17 21:45:52 +
@@ -29,8 +29,8 @@
INCLUDE_DIRECTORIES (${LIBTIDY_INCLUDE_DIR})
INCLUDE_DIRECTORIES (html.xq.src)
DECLARE_ZORBA_SCHEMA (FILE html-options.xsd
- URI http://www.zorba-xquery.com/modules/converters/html-options;)
-DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/converters/html; VERSION 1.0 FILE html.xq LINK_LIBRARIES ${LIBTIDY_LIBRARIES})
+ URI http://zorba.io/modules/html-options;)
+DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/html; VERSION 1.0 FILE html.xq LINK_LIBRARIES ${LIBTIDY_LIBRARIES})
ADD_TEST_DIRECTORY (${PROJECT_SOURCE_DIR}/test)
ADD_TEST(zorba_html_module/link_crawler_test_for_compilation ${ZORBA_EXE} -f -q ${PROJECT_SOURCE_DIR}/test/Queries/link_crawler2.xq2 --compile-only)
=== modified file 'src/html-options.xsd'
--- src/html-options.xsd 2012-08-04 02:18:50 +
+++ src/html-options.xsd 2013-10-17 21:45:52 +
@@ -1,6 +1,6 @@
xs:schema xmlns:xs=http://www.w3.org/2001/XMLSchema;
- xmlns:ho=http://www.zorba-xquery.com/modules/converters/html-options;
- targetNamespace=http://www.zorba-xquery.com/modules/converters/html-options;
+ xmlns:ho=http://zorba.io/modules/html-options;
+ targetNamespace=http://zorba.io/modules/html-options;
elementFormDefault=qualified attributeFormDefault=unqualified
!--
@@ -37,4 +37,4 @@
/xs:sequence
/xs:complexType
/xs:element
-/xs:schema
\ No newline at end of file
+/xs:schema
=== modified file 'src/html.xq'
--- src/html.xq 2013-09-26 21:33:49 +
+++ src/html.xq 2013-10-17 21:45:52 +
@@ -18,7 +18,8 @@
(:~
: p
- : This module provides functions to a href=http://www.w3.org/People/Raggett/tidy/; target=_blanktidy/a a HTML document. br /
+ : This module provides functions to a href=http://www.w3.org/People/Raggett/tidy/; target=_blanktidy/a a HTML document. /p
+ : p
: The functions in this module take an HTML document (a string) as parameter,
: tidy it in order to result in valid XHTML, and return this XHTML document as a document-node.
: /p
@@ -29,14 +30,14 @@
: @project Zorba/Data Converters/HTML
:
:)
-module namespace html = http://www.zorba-xquery.com/modules/converters/html;;
+module namespace html = http://zorba.io/modules/html;;
(:~
: Import module for checking if html options element is validated.
:)
import module namespace schema = http://zorba.io/modules/schema;;
-import schema namespace html-options = http://www.zorba-xquery.com/modules/converters/html-options;;
+import schema namespace html-options = http://zorba.io/modules/html-options;;
declare namespace err = http://ww.w3.org/2005/xqt-errors;;
@@ -72,7 +73,7 @@
{
let $validated-options :=
validate {
- options xmlns=http://www.zorba-xquery.com/modules/converters/html-options;
+ options xmlns=http://zorba.io/modules/html-options;
tidyParam name=output-xml value=yes /
tidyParam name=doctype value=omit /
tidyParam name=quote-nbsp value=no /
@@ -98,7 +99,7 @@
: @param $html the HTML string to tidy
: @param $options a set of name and value pairs that provide options
:to configure the tidy process that have to be validated against the
- :http://www.zorba-xquery.com/modules/converters/html-options; schema.
+ :http://zorba.io/modules/html-options; schema.
: @return the tidied XHTML document node
:
: @error err:XQDY0027 if $options can not be validated against the
=== modified file 'src/html.xq.src/html.h'
--- src/html.xq.src/html.h 2013-08-05 14:21:05 +
+++ src/html.xq.src/html.h 2013-10-17 21:45:52 +
@@ -54,7 +54,7 @@
virtual ~HtmlModule();
virtual String
- getURI() const { return http://www.zorba-xquery.com/modules/converters/html;; }
+ getURI() const { return http://zorba.io/modules/html;; }
virtual ExternalFunction*
getExternalFunction(const String aLocalname);
=== modified file 'src/html.xq.src/tidy_wrapper.h'
--- src/html.xq.src/tidy_wrapper.h 2013-08-05 15:14:21 +
+++ src/html.xq.src/tidy_wrapper.h 2013-10-17 21:45:52 +
@@ -91,7 +91,7 @@
if (rc 1)
{
zorba::Item lError = Zorba::getInstance(0)-getItemFactory()-
-createQName(http://www.zorba-xquery.com/modules/converters/html;,
+createQName(http://zorba.io/modules/html;,
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188048 into lp:zorba/html-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188048 into lp:zorba/html-module has been updated. Commit Message changed to: Changes for Zorba 3.0 for HTML module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
