bugfix

[mir.git] / source / mircoders / producer / PDFGeneratingProducerNode.java

diff --git a/source/mircoders/producer/PDFGeneratingProducerNode.java b/source/mircoders/producer/PDFGeneratingProducerNode.java
index 64274ff..4a6e720 100755 (executable)
--- a/source/mircoders/producer/PDFGeneratingProducerNode.java
+++ b/source/mircoders/producer/PDFGeneratingProducerNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,38 +18,41 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License, 
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
+ * (or with modified versions of the above that use the same license as the above), 
+ * and distribute linked combinations including the two.  You must obey the 
+ * GNU General Public License in all respects for all of the code used other than 
+ * the above mentioned libraries.  If you modify this file, you may extend this 
+ * exception to your version of the file, but you are not obligated to do so.  
+ * If you do not wish to do so, delete this exception statement from your version.
  */
 
 package mircoders.producer;
 
-import java.util.*;
-import java.io.*;
-import mir.util.*;
-import mir.producer.*;
+import java.util.Map;
+
+import mir.log.LoggerWrapper;
 import mir.misc.PDFUtil;
+import mir.producer.ProducerNode;
+import mir.util.ParameterExpander;
 
 public class PDFGeneratingProducerNode implements ProducerNode {
   private String generatorExpression;
   private String destinationExpression;
+  private String stylesheet;
 
-  public PDFGeneratingProducerNode(String aGenerator, String aDestination) {
+  public PDFGeneratingProducerNode(String aGenerator, String aDestination,String aStylesheet) {
     generatorExpression=aGenerator;
     destinationExpression=aDestination;
+    stylesheet=aStylesheet;
   }
 
-  public void produce(Map aValueMap, String aVerb, PrintWriter aLogger) throws ProducerFailure {
+  public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) {
 
     String generatorIdentifier;
     String destinationIdentifier;
+    String stylesheetIdentifier;
 
           long startTime;
           long endTime;
@@ -59,24 +62,22 @@ public class PDFGeneratingProducerNode implements ProducerNode {
 
       destinationIdentifier = ParameterExpander.expandExpression( aValueMap, destinationExpression );
       generatorIdentifier = ParameterExpander.expandExpression( aValueMap, generatorExpression );
+      stylesheetIdentifier = ParameterExpander.expandExpression( aValueMap, stylesheet);
 
-      aLogger.println("Generating " + generatorIdentifier + " into " + destinationIdentifier);
-      aLogger.flush();
+      aLogger.info("Generating " + generatorIdentifier + " into " + destinationIdentifier + " using "+ stylesheetIdentifier);
 
-      PDFUtil.makePDF(generatorIdentifier,destinationIdentifier);
+      PDFUtil.makePDF(generatorIdentifier,destinationIdentifier,stylesheetIdentifier);
 
-        }
-        catch (Throwable t) {
-          aLogger.println("  error while generating: " + t.getMessage());
-      aLogger.flush();
+    }
+    catch (Throwable t) {
+      t.printStackTrace(aLogger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
+      aLogger.error("  error while generating: " + t.getMessage() + t.toString());
     }
     endTime = System.currentTimeMillis();
 
-    aLogger.println("  Time: " + (endTime-startTime) + " ms<br>");
-    aLogger.flush();
-  }
-
-  public Set buildVerbSet() {
-    return new HashSet();
+    aLogger.info("  Time: " + (endTime-startTime) + " ms<br>");
   }
 }
+
+
+