Merge lp:~zorba-coders/zorba/bug-1189807-html into lp:zorba/html-module

Proposed by Chris Hillery on 2013-07-24
Status: Merged
Merged at revision: 93
Proposed branch: lp:~zorba-coders/zorba/bug-1189807-html
Merge into: lp:zorba/html-module
Diff against target: 25 lines (+6/-2)
1 file modified
test/Queries/link_crawler2.xq2 (+6/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1189807-html
Reviewer Review Type Date Requested Status
Luis Rodriguez Gonzalez Approve on 2013-08-07
Chris Hillery Approve on 2013-07-24
Review via email: mp+176636@code.launchpad.net

Commit message

Fixes for new XML module.

To post a comment you must log in.
Chris Hillery (ceejatec) :
review: Approve
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/Queries/link_crawler2.xq2'
--- test/Queries/link_crawler2.xq2 2012-08-04 02:23:35 +0000
+++ test/Queries/link_crawler2.xq2 2013-07-24 09:42:57 +0000
@@ -17,7 +17,8 @@
17import module namespace http = "http://www.zorba-xquery.com/modules/http-client";17import module namespace http = "http://www.zorba-xquery.com/modules/http-client";
18import module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";18import module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";
19import module namespace html = "http://www.zorba-xquery.com/modules/converters/html";19import module namespace html = "http://www.zorba-xquery.com/modules/converters/html";
20import module namespace parse-xml = "http://www.zorba-xquery.com/modules/xml";20import module namespace x = "http://zorba.io/modules/xml";
21import schema namespace opt = "http://zorba.io/modules/xml-options";
21import module namespace file = "http://expath.org/ns/file";22import module namespace file = "http://expath.org/ns/file";
2223
23declare namespace an = "http://www.zorba-xquery.com/annotations";24declare namespace an = "http://www.zorba-xquery.com/annotations";
@@ -218,7 +219,10 @@
218 map:insert($local:processed-internal-links, (<MESSAGE>{concat("cannot tidy: ", $err:description)}</MESSAGE>,219 map:insert($local:processed-internal-links, (<MESSAGE>{concat("cannot tidy: ", $err:description)}</MESSAGE>,
219 <RESULT>broken</RESULT>), $x); 220 <RESULT>broken</RESULT>), $x);
220 try{221 try{
221 $content:=parse-xml:parse-xml-fragment ($string-content, "");222 $content:=x:parse($string-content,
223 <opt:options>
224 <opt:parse-external-parsed-entity/>
225 </opt:options>);
222 }226 }
223 catch *227 catch *
224 { map:insert($local:processed-internal-links, <MESSAGE>{concat("cannot parse: ", $err:description)}</MESSAGE>, $x);}228 { map:insert($local:processed-internal-links, <MESSAGE>{concat("cannot parse: ", $err:description)}</MESSAGE>, $x);}

Subscribers

People subscribed via source and target branches

to all changes: