[Exist-commits] SF.net SVN: exist: [6636] trunk/eXist/src/org/exist/xquery/functions/util

[<wol...@us...>]

Revision: 6636
          http://exist.svn.sourceforge.net/exist/?rev=6636&view=rev
Author:   wolfgang_m
Date:     2007-09-27 06:03:24 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
Added new function util:parse-html, which uses the neko HTML parser to parse an HTML string into well-formed XML.

Modified Paths:
--------------
    trunk/eXist/src/org/exist/xquery/functions/util/Parse.java
    trunk/eXist/src/org/exist/xquery/functions/util/UtilModule.java

Modified: trunk/eXist/src/org/exist/xquery/functions/util/Parse.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/util/Parse.java	2007-09-26 18:11:25 UTC (rev 6635)
+++ trunk/eXist/src/org/exist/xquery/functions/util/Parse.java	2007-09-27 13:03:24 UTC (rev 6636)
@@ -21,19 +21,31 @@
 
 public class Parse extends BasicFunction {
 
-    public final static FunctionSignature signature =
+    public final static FunctionSignature signatures[] = {
         new FunctionSignature(
             new QName( "parse", UtilModule.NAMESPACE_URI, UtilModule.PREFIX),
             "Parses the passed string value into an XML fragment. The string has to be " +
             "well-formed XML. An empty sequence is returned if the argument is an " +
             "empty string or sequence.",
             new SequenceType[] {
-                new SequenceType( Type.STRING, Cardinality.ZERO_OR_ONE ),
+                new SequenceType( Type.STRING, Cardinality.ZERO_OR_ONE )
             },
             new SequenceType( Type.NODE, Cardinality.ZERO_OR_MORE )
-        );
+        ),
+        new FunctionSignature(
+            new QName( "parse-html", UtilModule.NAMESPACE_URI, UtilModule.PREFIX),
+            "Parses the passed string value into an XML fragment. The HTML string may not be " +
+            "well-formed XML. It will be passed through the Neko HTML parser to make it well-formed. " +
+            "An empty sequence is returned if the argument is an " +
+            "empty string or sequence.",
+            new SequenceType[] {
+                new SequenceType( Type.STRING, Cardinality.ZERO_OR_ONE )
+            },
+            new SequenceType( Type.NODE, Cardinality.ZERO_OR_MORE )
+        )
+    };
 
-    public Parse(XQueryContext context) {
+    public Parse(XQueryContext context, FunctionSignature signature) {
         super(context, signature);
     }
 
@@ -48,8 +60,25 @@
             SAXParserFactory factory = SAXParserFactory.newInstance();
             factory.setNamespaceAware(true);
             InputSource src = new InputSource(reader);
-            SAXParser parser = factory.newSAXParser();
-            XMLReader xr = parser.getXMLReader();
+
+            XMLReader xr = null;
+            if (isCalledAs("parse-html")) {
+                try {
+                    Class clazz = Class.forName( "org.cyberneko.html.parsers.SAXParser" );
+                    xr = (XMLReader) clazz.newInstance();
+                    //do not modify the case of elements and attributes
+                    xr.setProperty("http://cyberneko.org/html/properties/names/elems", "match");
+                    xr.setProperty("http://cyberneko.org/html/properties/names/attrs", "no-change");
+                } catch (Exception e) {
+                    LOG.warn("Could not instantiate neko HTML parser for function util:parse-html, falling back to " +
+                            "default XML parser.", e);
+                }
+            }
+            if (xr == null) {
+                SAXParser parser = factory.newSAXParser();
+                xr = parser.getXMLReader();
+            }
+
             SAXAdapter adapter = new SAXAdapter();
             xr.setContentHandler(adapter);
             xr.parse(src);

Modified: trunk/eXist/src/org/exist/xquery/functions/util/UtilModule.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/util/UtilModule.java	2007-09-26 18:11:25 UTC (rev 6635)
+++ trunk/eXist/src/org/exist/xquery/functions/util/UtilModule.java	2007-09-27 13:03:24 UTC (rev 6636)
@@ -96,7 +96,8 @@
         new FunctionDef(UUID.signature, UUID.class),
         new FunctionDef(DeepCopyFunction.signature, DeepCopyFunction.class),
         new FunctionDef(GetSequenceType.signature, GetSequenceType.class),
-        new FunctionDef(Parse.signature, Parse.class),
+        new FunctionDef(Parse.signatures[0], Parse.class),
+        new FunctionDef(Parse.signatures[1], Parse.class),
 
         // deprecated functions
         new FunctionDef(GetVersion.deprecated, GetVersion.class),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.