Permalink
Browse files

Attempt to fix issue #135 by removing bogus references to URI schemes

  • Loading branch information...
ndw committed Feb 6, 2014
1 parent bc259ca commit 8943ffec8bd9f18bfccdf8a1cd3e71ebb266e802
Showing with 5 additions and 4 deletions.
  1. +5 −4 src/com/xmlcalabash/util/UserArgs.java
@@ -251,7 +251,8 @@ public void addOutput(String port, String uri) {
if ("-".equals(uri)) {
outputs.put(port, new Output(uri));
} else {
- outputs.put(port, new Output("file://" + fixUpURI(uri)));
+ URI cwd = URIUtils.cwdAsURI();
+ outputs.put(port, new Output(cwd.resolve(uri).toASCIIString()));
}
}
@@ -306,11 +307,11 @@ public void addInput(String port, String uri, Type type) {
}
public void addInput(String port, String uri, Type type, String contentType) {
- if ("-".equals(uri) || uri.startsWith("http:") || uri.startsWith("https:") || uri.startsWith("file:")
- || "p:empty".equals(uri)) {
+ if ("-".equals(uri) || "p:empty".equals(uri)) {
curStep.addInput(port, uri, type, contentType);
} else {
- curStep.addInput(port, "file://" + fixUpURI(uri), type, contentType);
+ URI cwd = URIUtils.cwdAsURI();
+ curStep.addInput(port, cwd.resolve(uri).toASCIIString(), type, contentType);
}
}

0 comments on commit 8943ffe

Please sign in to comment.