[MOD] XQuery: Base URI resolutions

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/func/StandardFunc.java

@@ -363,7 +363,7 @@ protected final IO toIO(final int i, final QueryContext qc) throws QueryExceptio
    * @throws QueryException query exception
    */
   protected final IO toIO(final byte[] uri) throws QueryException {
-    final IO io = new QueryInput(string(uri), sc).io;
+    final IO io = sc.resolve(string(uri));
     if(!io.exists()) throw WHICHRES_X.get(info, io);
     if(io instanceof IOFile && io.isDir()) throw RESDIR_X.get(info, io);
     return io;

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

@@ -36,7 +36,7 @@ public Empty item(final QueryContext qc, final InputInfo ii) throws QueryExcepti
     final Updates updates = qc.updates();
     final DBNode target = updates.determineDataRef(nd, qc);
 
-    final String path = new QueryInput(string(uri.string()), sc).io.path();
+    final String path = sc.resolve(string(uri.string())).path();
     // check if all target paths are unique
     if(!updates.putPaths.add(path)) throw UPURIDUP_X.get(info, path);
 

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

@@ -36,28 +36,22 @@ public abstract class Parse extends StandardFunc {
   final Item unparsedText(final QueryContext qc, final boolean check, final boolean encoding)
       throws QueryException {
 
-    final byte[] path = toTokenOrNull(exprs[0], qc);
-    if(path == null) return check ? Bln.FALSE : Empty.VALUE;
+    final byte[] token = toTokenOrNull(exprs[0], qc);
+    if(token == null) return check ? Bln.FALSE : Empty.VALUE;
+    final String path = string(token);
 
     String enc;
     IO io;
     try {
       enc = encoding ? toEncodingOrNull(1, ENCODING_X, qc) : null;
 
-      final String p = string(path);
-      if(p.indexOf('#') != -1) throw FRAGID_X.get(info, p);
-      final Uri uri = Uri.uri(p);
-      if(!uri.isValid()) throw INVURL_X.get(info, p);
-
-      if(uri.isAbsolute()) {
-        io = IO.get(p);
-      } else {
-        if(sc.baseURI() == Uri.EMPTY) throw STBASEURI.get(info);
-        io = sc.resolve(p);
-      }
+      if(contains(token, '#')) throw FRAGID_X.get(info, path);
+      if(sc.baseURI() == Uri.EMPTY) throw STBASEURI.get(info);
+      if(!Uri.uri(path).isValid()) throw INVURL_X.get(info, path);
+      io = sc.resolve(path);
 
       // overwrite path with global resource files
-      String[] rp = qc.resources.text(p);
+      String[] rp = qc.resources.text(path);
       if(rp == null) rp = qc.resources.text(io.path());
       if(rp != null && rp.length > 0) {
         io = IO.get(rp[0]);