From 8943ffec8bd9f18bfccdf8a1cd3e71ebb266e802 Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Thu, 6 Feb 2014 15:46:34 -0600 Subject: [PATCH] Attempt to fix issue #135 by removing bogus references to URI schemes --- src/com/xmlcalabash/util/UserArgs.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/xmlcalabash/util/UserArgs.java b/src/com/xmlcalabash/util/UserArgs.java index 299e5680..0c8233ef 100644 --- a/src/com/xmlcalabash/util/UserArgs.java +++ b/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); } }