Persuant to issue #184 add more detail to the rest of the dynamic err…

…or 6 cases
ndw · Feb 5, 2015 · 5a34a54 · 5a34a54
1 parent 294f6e2
commit 5a34a54
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/src/com/xmlcalabash/library/Exec.java b/src/com/xmlcalabash/library/Exec.java
@@ -196,7 +196,7 @@ public void run() throws SaxonApiException {
                 XdmNode srcDoc = source.read();
 
                 if (source.moreDocuments()) {
-                    throw XProcException.dynamicError(6);
+                    throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
                 }
 
                 OutputStream os = process.getOutputStream();

diff --git a/src/com/xmlcalabash/library/Hash.java b/src/com/xmlcalabash/library/Hash.java
@@ -116,7 +116,7 @@ public void run() throws SaxonApiException {
         matcher.match(source.read(), getOption(_match));
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         result.write(matcher.getResult());

diff --git a/src/com/xmlcalabash/library/HttpRequest.java b/src/com/xmlcalabash/library/HttpRequest.java
@@ -402,7 +402,7 @@ public void run() throws SaxonApiException {
                         InputStream bodyStream = httpResult.getEntity().getContent();
                         readBodyContent(tree, bodyStream, httpResult);
                     } else {
-                        throw XProcException.dynamicError(6);
+                        throw XProcException.dynamicError(6, "Reading HTTP response on " + getStep().getName());
                     }
                 }
             }

diff --git a/src/com/xmlcalabash/library/MakeAbsoluteURIs.java b/src/com/xmlcalabash/library/MakeAbsoluteURIs.java
@@ -81,7 +81,7 @@ public void run() throws SaxonApiException {
         matcher.match(doc, getOption(_match));
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         result.write(matcher.getResult());

diff --git a/src/com/xmlcalabash/library/NamespaceRename.java b/src/com/xmlcalabash/library/NamespaceRename.java
@@ -105,7 +105,7 @@ public void run() throws SaxonApiException {
         }
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
     }
 

diff --git a/src/com/xmlcalabash/library/Rename.java b/src/com/xmlcalabash/library/Rename.java
@@ -91,7 +91,7 @@ public void run() throws SaxonApiException {
         matcher.match(source.read(), getOption(_match));
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         result.write(matcher.getResult());

diff --git a/src/com/xmlcalabash/library/Replace.java b/src/com/xmlcalabash/library/Replace.java
@@ -73,7 +73,7 @@ public void run() throws SaxonApiException {
         matcher.match(source.read(), getOption(_match));
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         result.write(matcher.getResult());

diff --git a/src/com/xmlcalabash/library/SetAttributes.java b/src/com/xmlcalabash/library/SetAttributes.java
@@ -88,7 +88,7 @@ public void run() throws SaxonApiException {
         matcher.match(source.read(), getOption(_match));
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         result.write(matcher.getResult());

diff --git a/src/com/xmlcalabash/library/Store.java b/src/com/xmlcalabash/library/Store.java
@@ -95,7 +95,7 @@ public void run() throws SaxonApiException {
         XdmNode doc = source.read();
 
         if (doc == null || source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         String href = null, base = null;

diff --git a/src/com/xmlcalabash/library/UUID.java b/src/com/xmlcalabash/library/UUID.java
@@ -82,7 +82,7 @@ public void run() throws SaxonApiException {
         matcher.match(source.read(), getOption(_match));
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         result.write(matcher.getResult());

diff --git a/src/com/xmlcalabash/library/WWWFormURLEncode.java b/src/com/xmlcalabash/library/WWWFormURLEncode.java
@@ -96,7 +96,7 @@ public void run() throws SaxonApiException {
         matcher.match(source.read(), getOption(_match));
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         result.write(matcher.getResult());

diff --git a/src/com/xmlcalabash/library/Wrap.java b/src/com/xmlcalabash/library/Wrap.java
@@ -116,7 +116,7 @@ public void run() throws SaxonApiException {
         matcher.match(doc,getOption(_match));
 
         if (source.moreDocuments()) {
-            throw XProcException.dynamicError(6);
+            throw XProcException.dynamicError(6, "Reading source on " + getStep().getName());
         }
 
         result.write(matcher.getResult());

diff --git a/src/com/xmlcalabash/runtime/XForEach.java b/src/com/xmlcalabash/runtime/XForEach.java
@@ -140,7 +140,7 @@ public void run() throws SaxonApiException {
                         }
 
                         if (docsCopied != 1 && !seqOk) {
-                            throw XProcException.dynamicError(6);
+                            throw XProcException.dynamicError(6, "Writing to " + wport + " on " + getStep().getName());
                         }
                     }
                 }

diff --git a/src/com/xmlcalabash/runtime/XUntilUnchanged.java b/src/com/xmlcalabash/runtime/XUntilUnchanged.java
@@ -140,7 +140,7 @@ public void run() throws SaxonApiException {
                         }
 
                         if (docsCopied != 1) {
-                            throw XProcException.dynamicError(6);
+                            throw XProcException.dynamicError(6, "Writing to " + iPortName + " on " + getStep().getName());
                         }
 
                         for (XStep step : subpipeline) {