From 2f94046fd435357173e0fb3aed8ab340711177b0 Mon Sep 17 00:00:00 2001 From: fh Date: Wed, 5 Sep 2001 12:49:04 +0000 Subject: [PATCH] no message --- source/mircoders/servlet/ServletModuleLinksImcs.java | 12 +++++++----- templates-dist/de/linksimcs.template | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/mircoders/servlet/ServletModuleLinksImcs.java b/source/mircoders/servlet/ServletModuleLinksImcs.java index c5803e7c..27b5524b 100755 --- a/source/mircoders/servlet/ServletModuleLinksImcs.java +++ b/source/mircoders/servlet/ServletModuleLinksImcs.java @@ -50,21 +50,23 @@ public class ServletModuleLinksImcs extends ServletModule public void add(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException { try { - SimpleHash mergeData = new SimpleHash(); + SimpleHash modelRoot = new SimpleHash(); EntityList theList; int offset = 0; + theList = mainModule.getByWhereClause("", offset); - mergeData.put("contentlist",HTMLTemplateProcessor.makeSimpleHash(theList)); - mergeData.put("new", "1"); + modelRoot.put("new", "1"); + modelRoot.put("contentlist",HTMLTemplateProcessor.makeSimpleHash(theList)); + //modelRoot.put("contentlist", DatabaseLinksImcs.getInstance().getHashData()); PrintWriter out = res.getWriter(); if (theList == null || theList.getCount() == 0 || theList.getCount()>1){ //HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateObjektString, theList, out); - HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateObjektString, mergeData, out); + HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateObjektString, modelRoot, out); } else { //deliver(req, res, theList.elementAt(0), templateObjektString); - deliver(req, res, mergeData, templateObjektString); + deliver(req, res, modelRoot, templateObjektString); } } catch(ModuleException e) { diff --git a/templates-dist/de/linksimcs.template b/templates-dist/de/linksimcs.template index a14dd477..e5e854f1 100755 --- a/templates-dist/de/linksimcs.template +++ b/templates-dist/de/linksimcs.template @@ -30,7 +30,7 @@