[MOD] Parsers: Handling of embedded query exceptions

Author: ChristianGruen

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

@@ -77,15 +77,16 @@ private static IO toXml(final IO io, final Parser parser, final HtmlOptions hopt
       final StringWriter sw = new StringWriter();
       final XMLReader reader = parser.reader(hopts, sw);
 
-      // define input
+      // check encoding, define input
+      final String encoding = Strings.normEncoding(hopts.get(ENCODING), false);
+      if(encoding != null) {
+        final String error = Strings.checkEncoding(encoding);
+        if(error != null) throw INVALIDOPTION_X.getIO(error);
+      }
       try(InputStream in = io.inputStream()) {
         final InputSource is = new InputSource(in);
-        final String enc = io.encoding() != null ? io.encoding() : hopts.get(ENCODING);
-        if(enc != null) {
-          final String error = Strings.checkEncoding(enc);
-          if(error != null) throw INVALIDOPTION_X.getIO("Unknown encoding: " + error + '.');
-          is.setEncoding(Strings.normEncoding(enc, false));
-        }
+        final String enc = io.encoding() != null ? io.encoding() : encoding;
+        if(enc != null) is.setEncoding(enc);
         reader.parse(is);
       }
       return new IOContent(token(sw.toString()), io.name());

basex-core/src/main/java/org/basex/query/func/fn/FnUnparsedBinary.java

@@ -27,6 +27,11 @@ Str parse(final TextInput ti, final Options options, final QueryContext qc) {
     throw Util.notExpected();
   }
 
+  @Override
+  public QueryError error() {
+    return QueryError.RESINPUT_X;
+  }
+
   @Override
   protected Options options(final QueryContext qc) {
     return new Options();

basex-core/src/main/java/org/basex/query/func/fn/ParseFn.java

@@ -37,13 +37,24 @@ boolean nl() {
   }
 
   /**
-   * Returns a format-specific error code for invalid input.
-   * @return error code
+   * Returns a parser-specific exception.
+   * @param ex original exception
+   * @return embedded or new exception
    */
-  QueryError error() {
-    return null;
+  final QueryException exception(final IOException ex) {
+    if(ex instanceof final QueryIOException qio) {
+      final QueryException qe = qio.getCause();
+      if(qe.error() == QueryError.INVALIDOPTION_X) return qe;
+    }
+    return error().get(info, ex);
   }
 
+  /**
+   * Returns a parser-specific error.
+   * @return error code
+   */
+  abstract QueryError error();
+
   /**
    * Returns parse options.
    * @param qc query context
@@ -72,7 +83,7 @@ protected Value parse(final QueryContext qc) throws QueryException {
     } catch(final DecodingException ex) {
       throw RECDECODING_X.get(info, ex);
     } catch(final IOException ex) {
-      throw error().get(info, ex);
+      throw exception(ex);
     }
   }
 
@@ -111,7 +122,7 @@ protected Value doc(final QueryContext qc) throws QueryException {
     } catch(final DecodingException ex) {
       throw RECDECODING_X.get(info, ex);
     } catch(final InputException ex) {
-      throw error().get(info, ex);
+      throw exception(ex);
     } catch(final IOException ex) {
       Util.debug(ex);
       throw RESWHICH_X.get(info, io);

basex-core/src/main/java/org/basex/query/func/fn/ParseHtml.java

@@ -57,7 +57,7 @@ private DBNode parse(final IO io, final QueryContext qc) throws QueryException {
     try {
       return new DBNode(new HtmlParser(io, prsr, new MainOptions(), options));
     } catch(final IOException ex) {
-      throw error().get(info, ex);
+      throw exception(ex);
     }
   }
 

basex-core/src/main/java/org/basex/util/Strings.java

@@ -217,7 +217,7 @@ private static String hash(final String string, final String algo) {
 
   /**
    * Returns a unified representation of the specified encoding.
-   * @param encoding input encoding
+   * @param encoding input encoding (can be {@code null})
    * @param dflt return default values if supplied encoding is {@code null} or ambiguous
    * @return encoding or {@code null}
    */