[MOD] HTML Parsing, no parser: return contents as text

Author: ChristianGruen

basex-core/src/main/java/org/basex/build/html/HtmlParser.java

@@ -4,12 +4,14 @@
 import static org.basex.build.html.HtmlOptions.NOCDATA;
 import static org.basex.query.QueryError.*;
 import static org.basex.util.Token.*;
+import static org.basex.util.XMLToken.*;
 
 import java.io.*;
 
 import org.basex.build.xml.*;
 import org.basex.core.*;
 import org.basex.io.*;
+import org.basex.io.serial.*;
 import org.basex.query.*;
 import org.basex.query.value.item.*;
 import org.basex.util.*;
@@ -70,8 +72,14 @@ public HtmlParser(final IO source, final Parser parser, final MainOptions option
    */
   private static IO toXml(final IO io, final Parser parser, final HtmlOptions hopts)
       throws IOException {
-    // parser unavailable: fall back to XML
-    if(parser == null) return io;
+
+    // parser unavailable: wrap contents as text
+    if(parser == null) {
+      final TokenBuilder xml = new TokenBuilder().add(ELEM_O).add(HTML).add(ELEM_C).add(
+          Serializer.value(io.read(), false, true, false)).add(ELEM_OS).add(HTML).add(ELEM_C);
+      return new IOContent(xml.finish(), io.name());
+    }
+
     try {
       // define output
       final StringWriter sw = new StringWriter();
@@ -273,10 +281,11 @@ public boolean available(final HtmlOptions options) {
     };
 
     /** The default parser: TAGSOUP if available, NU if available, {@code null} otherwise. */
-    public static final Parser DEFAULT;
+    public static final Parser PARSER;
+
     static {
       final HtmlOptions opts = new HtmlOptions();
-      DEFAULT = TAGSOUP.available(opts) ? TAGSOUP : NU.available(opts) ? NU : null;
+      PARSER = TAGSOUP.available(opts) ? TAGSOUP : NU.available(opts) ? NU : null;
     }
 
     /** String representation. */
@@ -343,7 +352,7 @@ static void ensureAvailable(final String className, final QNm name,
      * @return parser (can be {@code null})
      */
     public static Parser of(final HtmlOptions options) {
-      return of(options, Parser.DEFAULT);
+      return of(options, Parser.PARSER);
     }
 
     /**

basex-core/src/main/java/org/basex/io/serial/AdaptiveSerializer.java

@@ -126,7 +126,8 @@ protected void atomic(final Item item) throws IOException {
         printChars(basex ? item.string(null) : ((QNm) item).unique());
       } else {
         final boolean simple = type == BOOLEAN || type.instanceOf(DECIMAL);
-        final byte[] value = simple ? Token.token(item) : value(item.string(null), '"', false);
+        final byte[] value = simple ? Token.token(item) :
+          value(item.string(null), true, false, false);
         if(basex || simple || type.instanceOf(STRING) || type.oneOf(UNTYPED_ATOMIC, ANY_URI)) {
           printChars(value);
         } else {

basex-core/src/main/java/org/basex/io/serial/Serializer.java

@@ -656,14 +656,15 @@ private void prepare() throws IOException {
   /**
    * Serializes the specified value.
    * @param value value
+   * @param quote quote strings
+   * @param xml serialize as XML string value
    * @param chop chop large tokens
-   * @param quote character for quoting the value; ignored if {@code 0}
    * @return value
    */
-  public static byte[] value(final byte[] value, final char quote, final boolean chop) {
-    final boolean quoting = quote != 0;
+  public static byte[] value(final byte[] value, final boolean quote, final boolean xml,
+      final boolean chop) {
     final TokenBuilder tb = new TokenBuilder();
-    if(quoting) tb.add(quote);
+    if(quote) tb.add('"');
 
     int c = 0;
     for(final TokenParser tp = new TokenParser(value); tp.more(); c++) {
@@ -675,11 +676,12 @@ public static byte[] value(final byte[] value, final char quote, final boolean c
       if(cp == '&') tb.add(E_AMP);
       else if(cp == '\r') tb.add(E_CR);
       else if(cp == '\n') tb.add(E_NL);
-      else if(cp == quote) tb.add(quote).add(quote);
+      else if(xml && cp == '<') tb.add(E_LT);
+      else if(quote && cp == '"') tb.add('"').add('"');
       else tb.add(cp);
     }
 
-    if(quoting) tb.add(quote);
+    if(quote) tb.add('"');
     return tb.finish();
   }
 }

basex-core/src/main/java/org/basex/query/QueryString.java

@@ -237,7 +237,7 @@ public String toString() {
    * @return string
    */
   public static byte[] toValue(final byte[] value) {
-    return Serializer.value(value, (char) 0, true);
+    return Serializer.value(value, false, false, true);
   }
 
   /**
@@ -246,6 +246,6 @@ public static byte[] toValue(final byte[] value) {
    * @return token
    */
   public static byte[] toQuoted(final byte[] value) {
-    return Serializer.value(value, '"', true);
+    return Serializer.value(value, true, false, true);
   }
 }

basex-core/src/main/java/org/basex/query/func/html/HtmlParse.java

@@ -23,7 +23,7 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   protected final Parser parser() {
-    return Parser.DEFAULT;
+    return Parser.PARSER;
   }
 
   /**

basex-core/src/main/java/org/basex/query/func/html/HtmlParser.java

@@ -15,7 +15,7 @@
 public final class HtmlParser extends StandardFunc {
   @Override
   public Item item(final QueryContext qc, final InputInfo ii) {
-    final Parser parser = Parser.DEFAULT;
+    final Parser parser = Parser.PARSER;
     return Str.get(parser != null ? parser.toString() : "");
   }
 }