zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #26290
[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 +0000
+++ src/CMakeLists.txt 2013-10-17 21:45:52 +0000
@@ -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 +0000
+++ src/html-options.xsd 2013-10-17 21:45:52 +0000
@@ -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 +0000
+++ src/html.xq 2013-10-17 21:45:52 +0000
@@ -18,7 +18,8 @@
(:~
: <p>
- : This module provides functions to <a href="http://www.w3.org/People/Raggett/tidy/"; target="_blank">tidy</a> a HTML document. <br />
+ : This module provides functions to <a href="http://www.w3.org/People/Raggett/tidy/"; target="_blank">tidy</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 +0000
+++ src/html.xq.src/html.h 2013-10-17 21:45:52 +0000
@@ -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 +0000
+++ src/html.xq.src/tidy_wrapper.h 2013-10-17 21:45:52 +0000
@@ -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";,
"InternalError");
throw USER_EXCEPTION(lError, errMsg );
@@ -109,7 +109,7 @@
if (ok != yes)
{
zorba::Item lError = Zorba::getInstance(0)->getItemFactory()->
- createQName("http://www.zorba-xquery.com/modules/converters/html";,
+ createQName("http://zorba.io/modules/html";,
"TidyOption");
std::ostringstream lErrorMsg;
=== modified file 'test/Queries/link_crawler2.xq2'
--- test/Queries/link_crawler2.xq2 2013-09-03 13:33:20 +0000
+++ test/Queries/link_crawler2.xq2 2013-10-17 21:45:52 +0000
@@ -16,7 +16,7 @@
import module namespace http = "http://www.zorba-xquery.com/modules/http-client";;
import module namespace map = "http://zorba.io/modules/unordered-maps";;
-import module namespace html = "http://www.zorba-xquery.com/modules/converters/html";;
+import module namespace html = "http://zorba.io/modules/html";;
import module namespace x = "http://zorba.io/modules/xml";;
import schema namespace opt = "http://zorba.io/modules/xml-options";;
import module namespace file = "http://expath.org/ns/file";;
@@ -34,7 +34,7 @@
declare variable $local:processed-internal-links := "processed-internal-links";
declare variable $local:processed-external-links := "processed-external-links";
-declare variable $local:tidy-options := <options xmlns="http://www.zorba-xquery.com/modules/converters/html-options"; >
+declare variable $local:tidy-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" />
=== modified file 'test/Queries/tidy_1.xq'
--- test/Queries/tidy_1.xq 2012-08-04 02:23:35 +0000
+++ test/Queries/tidy_1.xq 2013-10-17 21:45:52 +0000
@@ -1,10 +1,10 @@
(: tidy a html using different tidy options :)
-import module namespace html="http://www.zorba-xquery.com/modules/converters/html";;
-import schema namespace html-options="http://www.zorba-xquery.com/modules/converters/html-options";;
+import module namespace html="http://zorba.io/modules/html";;
+import schema namespace html-options="http://zorba.io/modules/html-options";;
html:parse('<title>Foo</title><p>Foo!',
- <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" />
=== modified file 'test/Queries/tidy_2.xq'
--- test/Queries/tidy_2.xq 2012-08-04 02:23:35 +0000
+++ test/Queries/tidy_2.xq 2013-10-17 21:45:52 +0000
@@ -1,6 +1,6 @@
(: tidy a html using default tidy options :)
-import module namespace html="http://www.zorba-xquery.com/modules/converters/html";;
-import schema namespace html-options="http://www.zorba-xquery.com/modules/converters/html-options";;
+import module namespace html="http://zorba.io/modules/html";;
+import schema namespace html-options="http://zorba.io/modules/html-options";;
html:parse('<title>Foo</title><p>Foo!')
\ No newline at end of file
=== modified file 'test/Queries/tidy_3.xq'
--- test/Queries/tidy_3.xq 2012-08-04 02:23:35 +0000
+++ test/Queries/tidy_3.xq 2013-10-17 21:45:52 +0000
@@ -1,5 +1,5 @@
-import module namespace html="http://www.zorba-xquery.com/modules/converters/html";;
-import schema namespace html-options="http://www.zorba-xquery.com/modules/converters/html-options";;
+import module namespace html="http://zorba.io/modules/html";;
+import schema namespace html-options="http://zorba.io/modules/html-options";;
html:parse('<HTML>
<HEAD>
=== modified file 'test/Queries/tidy_4.xq'
--- test/Queries/tidy_4.xq 2012-08-04 02:23:35 +0000
+++ test/Queries/tidy_4.xq 2013-10-17 21:45:52 +0000
@@ -1,5 +1,5 @@
-import module namespace html="http://www.zorba-xquery.com/modules/converters/html";;
-import schema namespace html-options="http://www.zorba-xquery.com/modules/converters/html-options";;
+import module namespace html="http://zorba.io/modules/html";;
+import schema namespace html-options="http://zorba.io/modules/html-options";;
html:parse('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
=== modified file 'test/Queries/tidy_5_wrong_options.spec'
--- test/Queries/tidy_5_wrong_options.spec 2012-08-04 02:23:35 +0000
+++ test/Queries/tidy_5_wrong_options.spec 2013-10-17 21:45:52 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/converters/html:TidyOption
+Error: http://zorba.io/modules/html:TidyOption
=== modified file 'test/Queries/tidy_5_wrong_options.xq'
--- test/Queries/tidy_5_wrong_options.xq 2012-08-04 02:23:35 +0000
+++ test/Queries/tidy_5_wrong_options.xq 2013-10-17 21:45:52 +0000
@@ -1,9 +1,9 @@
(: tidy a html using wrong tidy option for a value :)
-import module namespace html="http://www.zorba-xquery.com/modules/converters/html";;
-import schema namespace html-options="http://www.zorba-xquery.com/modules/converters/html-options";;
+import module namespace html="http://zorba.io/modules/html";;
+import schema namespace html-options="http://zorba.io/modules/html-options";;
html:parse('<title>Foo</title><p>Foo!',
- <options xmlns="http://www.zorba-xquery.com/modules/converters/html-options"; >
+ <options xmlns="http://zorba.io/modules/html-options"; >
<tidyParam name="output-xml" value="maybe" />
</options>)
\ No newline at end of file
=== modified file 'test/Queries/tidy_6_wrong_options.xq'
--- test/Queries/tidy_6_wrong_options.xq 2012-08-04 02:23:35 +0000
+++ test/Queries/tidy_6_wrong_options.xq 2013-10-17 21:45:52 +0000
@@ -1,10 +1,10 @@
(: tidy a html using correct tidy options/values but wrongly formated as html-options :)
-import module namespace html="http://www.zorba-xquery.com/modules/converters/html";;
-import schema namespace html-options="http://www.zorba-xquery.com/modules/converters/html-options";;
+import module namespace html="http://zorba.io/modules/html";;
+import schema namespace html-options="http://zorba.io/modules/html-options";;
html:parse('<title>Foo</title><p>Foo!',
- <options xmlns="http://www.zorba-xquery.com/modules/converters/html-options"; >
+ <options xmlns="http://zorba.io/modules/html-options"; >
<tidyaram name="output-xml" value="yes" />
<tidyParam name="doctype" value="omit" />
<tidyParam name="quote-nbsp" value="no" />
