From: fh <fh>
Date: Wed, 5 Sep 2001 09:09:59 +0000 (+0000)
Subject: no message
X-Git-Tag: prexmlproducerconfig~531
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=68a8686f6eb3baa2910f95ed2e2ca256e8527201;p=mir.git

no message
---

diff --git a/source/mircoders/module/ModuleLinksImcs.java b/source/mircoders/module/ModuleLinksImcs.java
index 4f293ab1..9fbbdf56 100755
--- a/source/mircoders/module/ModuleLinksImcs.java
+++ b/source/mircoders/module/ModuleLinksImcs.java
@@ -35,8 +35,8 @@ public class ModuleLinksImcs extends AbstractModule
 	      theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("Module.LinksImcs.Logfile"));
     }
 
-    public SimpleList getLinksImcsAsSimpleList() {
-	    return ((DatabaseLinksImcs)theStorage).getPopupData();
+    public SimpleHash getLinksImcsAsSimpleHash() {
+	    return ((DatabaseLinksImcs)theStorage).getHashData();
     }
 
 }
diff --git a/source/mircoders/servlet/ServletModuleLinksImcs.java b/source/mircoders/servlet/ServletModuleLinksImcs.java
index 7e9efaeb..1d4720c5 100755
--- a/source/mircoders/servlet/ServletModuleLinksImcs.java
+++ b/source/mircoders/servlet/ServletModuleLinksImcs.java
@@ -33,6 +33,7 @@ public class ServletModuleLinksImcs extends ServletModule
   private static ServletModuleLinksImcs instance = new ServletModuleLinksImcs();
   public static ServletModule getInstance() { return instance; }
 
+
   private ServletModuleLinksImcs() {
     theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("ServletModule.LinksImcs.Logfile"));
     templateListString = Configuration.getProperty("ServletModule.LinksImcs.ListTemplate");
@@ -49,15 +50,23 @@ public class ServletModuleLinksImcs extends ServletModule
   public void add(HttpServletRequest req, HttpServletResponse res)
     throws ServletModuleException {
     try {
+      SimpleHash mergeData = new SimpleHash();
       EntityList   theList;
+      mergeData.put("new", "1");
+
       PrintWriter out = res.getWriter();
       int offset = 0;
 
-      theList = mainModule.getByWhereClause(null, offset);
+      theList = mainModule.getByWhereClause("to_parent_id=0", offset);
+      mergeData.put("contentlist",((ModuleLinksImcs)mainModule).getLinksImcsAsSimpleHash());
+
       if (theList == null || theList.getCount() == 0 || theList.getCount()>1){
-        HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateObjektString, theList, out);
+        //HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateObjektString, theList, out);
+        HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateObjektString, mergeData, out);
+
       } else {
-        deliver(req, res, theList.elementAt(0), templateObjektString);
+        //deliver(req, res, theList.elementAt(0), templateObjektString);
+        deliver(req, res, mergeData, templateObjektString);
       }
 
     } catch(ModuleException e) {