Minor fixes

ndw · Oct 24, 2021 · f0889e7 · f0889e7
1 parent e6026ed
commit f0889e7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/scala/com/xmlcalabash/runtime/PrintingConsumer.scala b/src/main/scala/com/xmlcalabash/runtime/PrintingConsumer.scala
@@ -26,7 +26,7 @@ class PrintingConsumer private(config: XMLCalabashRuntime, output: DeclareOutput
   }
 
   override def consume(port: String, message: Message): Unit = {
-    logger.debug(s"PrintingConsumer received message on ${port}")
+    logger.debug(s"Received message on ${port}")
     message match {
       case msg: XProcItemMessage =>
         // Check that the message content type is allowed on the output port
@@ -60,6 +60,7 @@ class PrintingConsumer private(config: XMLCalabashRuntime, output: DeclareOutput
               outstream.write(buf, 0, len)
               len = instream.read(buf, 0, buf.length)
             }
+            logger.debug(s"${outstream.toByteArray.length} byte message")
             pos.write(outstream.toByteArray)
           case msg: XdmValueItemMessage =>
             val stream = new ByteArrayOutputStream()
@@ -73,7 +74,12 @@ class PrintingConsumer private(config: XMLCalabashRuntime, output: DeclareOutput
             }
 
             S9Api.serialize(config.config, msg.item, serializer)
-            pos.print(stream.toString("UTF-8"))
+            val content = stream.toString("UTF-8")
+            logger.debug(s"Message: ${content}")
+            pos.print(content)
+            if (!content.endsWith("\n")) {
+              pos.println()
+            }
           case _ =>
             throw new RuntimeException(s"Don't know how to print ${msg.item}")
         }

diff --git a/src/main/scala/com/xmlcalabash/util/CachingErrorListener.scala b/src/main/scala/com/xmlcalabash/util/CachingErrorListener.scala
@@ -121,6 +121,8 @@ class CachingErrorListener(errors: Errors) extends ErrorListener with ErrorHandl
   }
 
   override def report(xmlProcessingError: XmlProcessingError): Unit = {
-    println("wat?")
+    if (showErrors) {
+      println(xmlProcessingError)
+    }
   }
 }