zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #24431
[Merge] lp:~zorba-coders/zorba/bug-1189807-html into lp:zorba/html-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1189807-html into lp:zorba/html-module.
Commit message:
Fixes for new XML module.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189807-html/+merge/176636
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189807-html/+merge/176636
Your team Zorba Coders is subscribed to branch lp:zorba/html-module.
=== 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 @@
import module namespace http = "http://www.zorba-xquery.com/modules/http-client";
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 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";
declare namespace an = "http://www.zorba-xquery.com/annotations";
@@ -218,7 +219,10 @@
map:insert($local:processed-internal-links, (<MESSAGE>{concat("cannot tidy: ", $err:description)}</MESSAGE>,
<RESULT>broken</RESULT>), $x);
try{
- $content:=parse-xml:parse-xml-fragment ($string-content, "");
+ $content:=x:parse($string-content,
+ <opt:options>
+ <opt:parse-external-parsed-entity/>
+ </opt:options>);
}
catch *
{ map:insert($local:processed-internal-links, <MESSAGE>{concat("cannot parse: ", $err:description)}</MESSAGE>, $x);}
Follow ups