Merge pull request #151 from jwcranford/fix147

Fix #147 in Pipeline, Input, Option, and Parameter classes. Use the entity media type not the variant.
ndw · May 6, 2014 · 58c03ea · 58c03ea
2 parents eb361d9 + bdc18b7
commit 58c03ea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/com/xmlcalabash/piperack/Input.java b/src/com/xmlcalabash/piperack/Input.java
@@ -51,7 +51,7 @@ protected Representation post(Representation entity, Variant variant) {
                 doc = runtime.parse(new InputSource(entity.getStream()));
             } else {
                 ReadablePipe pipe = null;
-                pipe = new ReadableData(runtime, XProcConstants.c_data, entity.getStream(), variant.getMediaType().toString());
+                pipe = new ReadableData(runtime, XProcConstants.c_data, entity.getStream(), entity.getMediaType().toString());
                 doc = pipe.read();
             }
             xpipeline.writeTo(port, doc);

diff --git a/src/com/xmlcalabash/piperack/Option.java b/src/com/xmlcalabash/piperack/Option.java
@@ -48,7 +48,7 @@ protected Representation post(Representation entity, Variant variant) {
                 XdmNode doc = runtime.parse(new InputSource(entity.getStream()));
                 pipe = new ReadableDocument(runtime, doc, null, null, null);
             } else {
-                pipe = new ReadableData(runtime, XProcConstants.c_data, entity.getStream(), variant.getMediaType().toString());
+                pipe = new ReadableData(runtime, XProcConstants.c_data, entity.getStream(), entity.getMediaType().toString());
             }
 
             while (pipe.moreDocuments()) {

diff --git a/src/com/xmlcalabash/piperack/Parameter.java b/src/com/xmlcalabash/piperack/Parameter.java
@@ -49,7 +49,7 @@ protected Representation post(Representation entity, Variant variant) {
                 XdmNode doc = runtime.parse(new InputSource(entity.getStream()));
                 pipe = new ReadableDocument(runtime, doc, null, null, null);
             } else {
-                pipe = new ReadableData(runtime, XProcConstants.c_data, entity.getStream(), variant.getMediaType().toString());
+                pipe = new ReadableData(runtime, XProcConstants.c_data, entity.getStream(), entity.getMediaType().toString());
             }
 
             while (pipe.moreDocuments()) {

diff --git a/src/com/xmlcalabash/piperack/Pipeline.java b/src/com/xmlcalabash/piperack/Pipeline.java
@@ -201,7 +201,7 @@ protected Representation post(Representation entity, Variant variant) {
                 doc = runtime.parse(new InputSource(entity.getStream()));
             } else {
                 ReadablePipe pipe = null;
-                pipe = new ReadableData(runtime, XProcConstants.c_data, entity.getStream(), variant.getMediaType().toString());
+                pipe = new ReadableData(runtime, XProcConstants.c_data, entity.getStream(), entity.getMediaType().toString()); 
                 doc = pipe.read();
             }