From c0190d326d9d7f44de252cfccb45343bfca4e340 Mon Sep 17 00:00:00 2001
From: idfx <idfx>
Date: Fri, 21 Sep 2001 13:53:01 +0000
Subject: [PATCH] quickhack: config-problem with actionroot

---
 source/mir/misc/HTMLTemplateProcessor.java  | 4 +++-
 source/mir/servlet/AbstractServlet.java     | 6 ++----
 source/mircoders/producer/ProducerList.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java
index 1b2ae16b..06597da4 100755
--- a/source/mir/misc/HTMLTemplateProcessor.java
+++ b/source/mir/misc/HTMLTemplateProcessor.java
@@ -44,7 +44,9 @@ public final class HTMLTemplateProcessor {
       templateCache.startAutoUpdate();
       theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("HTMLTemplateProcessor.Logfile"));
       docRoot = MirConfig.getProp("RootUri");
-      actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName");
+      //quickhack: action-root is only for Mir!!!!, idfx
+      //actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName");
+      actionRoot = docRoot + "/servlet/Mir";
       openAction = MirConfig.getProp("Producer.OpenAction");
       productionHost = MirConfig.getProp("Producer.ProductionHost");
       videoHost = MirConfig.getProp("Producer.VideoHost");
diff --git a/source/mir/servlet/AbstractServlet.java b/source/mir/servlet/AbstractServlet.java
index 850798e5..d47b9c39 100755
--- a/source/mir/servlet/AbstractServlet.java
+++ b/source/mir/servlet/AbstractServlet.java
@@ -30,12 +30,10 @@ public abstract class AbstractServlet extends HttpServlet {
    */
   protected boolean getConfig(HttpServletRequest req) {
 
-    String RealPath = super.getServletContext().getRealPath("/"); 
+    String RealPath = super.getServletContext().getRealPath("/");
     String Uri = req.getRequestURI();
     String Name = super.getServletName();
-    //small quickhack, actionroot has to be /servlet/Mir
-    //String RootUri = StringUtil.replace(Uri, "/servlet/" + Name, "");
-    String RootUri = StringUtil.replace(Uri, "/servlet/Mir", "");
+    String RootUri = StringUtil.replace(Uri, "/servlet/" + Name, "");
 
 
     MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config"));
diff --git a/source/mircoders/producer/ProducerList.java b/source/mircoders/producer/ProducerList.java
index 27d10d0c..37968f2d 100755
--- a/source/mircoders/producer/ProducerList.java
+++ b/source/mircoders/producer/ProducerList.java
@@ -84,7 +84,7 @@ abstract public class ProducerList extends Producer {
       if (list!=null || force==true) {
         SimpleHash mergeData = HTMLTemplateProcessor.makeSimpleHashWithEntitylistInfos(list);
         //first we try to get the images
-        SimpleList itemList = HTMLTemplateProcessor.makeSimpleList(list);
+        
         if(list!=null){
           for (int k=0; k < list.size();k++) {
             currentContent = (EntityContent)list.elementAt(k);
@@ -111,7 +111,7 @@ abstract public class ProducerList extends Producer {
             }
           }
         }
-
+        SimpleList itemList = HTMLTemplateProcessor.makeSimpleList(list);
         //process hashmap additional and add to mergedata
         if (additional != null) {
           Set set = additional.keySet();
-- 
2.11.0