merge of localization branch into HEAD. mh and zap

[mir.git] / source / mir / misc / HTMLTemplateProcessor.java

diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java
index f203920..d9e4e8e 100755 (executable)
--- a/source/mir/misc/HTMLTemplateProcessor.java
+++ b/source/mir/misc/HTMLTemplateProcessor.java
@@ -32,6 +32,9 @@ public final class HTMLTemplateProcessor {
   private static String               imageHost;
   private static String               imagePath;
   private static String               openAction;
+  private static String               defEncoding;
+  private static String               generateFO;
+  private static String               generatePDF;
   protected static String producerDocRoot =
                MirConfig.getProp("Producer.DocRoot");
   protected static String producerStorageRoot =
@@ -40,7 +43,7 @@ public final class HTMLTemplateProcessor {
   //
   // init
 
-  static {
+    static {
     /** @todo either in the above block or here :) //rk */
     templateDir = MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir");
     templateCache = new FileTemplateCache(templateDir);
@@ -60,14 +63,17 @@ public final class HTMLTemplateProcessor {
 
     actionRoot = docRoot + "/servlet/Mir";
 
+    defEncoding = MirConfig.getProp("Mir.DefaultEncoding");
     openAction = MirConfig.getProp("Producer.OpenAction");
     productionHost = MirConfig.getProp("Producer.ProductionHost");
-    videoHost = MirConfig.getProp("Producer.VideoHost");
-    audioHost = MirConfig.getProp("Producer.AudioHost");
+    videoHost = MirConfig.getProp("Producer.Video.Host");
+    audioHost = MirConfig.getProp("Producer.Audio.Host");
     imageHost = MirConfig.getProp("Producer.Image.Host");
     imagePath = MirConfig.getProp("Producer.Image.Path");
     producerDocRoot = MirConfig.getProp("Producer.DocRoot");
     producerStorageRoot = MirConfig.getProp("Producer.StorageRoot");
+    generateFO = MirConfig.getProp("GenerateFO");
+    generatePDF = MirConfig.getProp("GeneratePDF");
   }
 
   /**
@@ -226,8 +232,12 @@ public final class HTMLTemplateProcessor {
                        session=res.encodeURL("");
                }
 
+    // @todo wouldn't it be so much easier to just pass the whole damn config
+    // Hash here from Mirconfig... ??????? than we could access arbitrary config
+    // values in the templates. -mh
                // put standard configuration into tempalteRootmodel
                SimpleHash configHash = new SimpleHash();
+               configHash.put("defEncoding", new SimpleScalar(defEncoding));
                configHash.put("producerDocRoot", new SimpleScalar(producerDocRoot));
                configHash.put("storageRoot", new SimpleScalar(producerStorageRoot));
     configHash.put("productionHost", new SimpleScalar(productionHost));
@@ -241,8 +251,10 @@ public final class HTMLTemplateProcessor {
                configHash.put("imageHost", new SimpleScalar(imageHost));
                configHash.put("imagePath", new SimpleScalar(imagePath));
                configHash.put("mirVersion", new SimpleScalar(MirConfig.getProp("Mir.Version")));
-               // this conform to updated freemarker syntax
+                // this conform to updated freemarker syntax
                configHash.put("compressWhitespace", new freemarker.template.utility.CompressWhitespace() );
+               configHash.put("generateFO", new SimpleScalar(generateFO));
+               configHash.put("generatePDF", new SimpleScalar(generatePDF));
 
                SimpleHash outPutHash = new SimpleHash();