X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fservlet%2FServletModule.java;h=6bd2d879dc6a167ca1aa1958653242a5f63e5c8e;hb=5f4cb1941d49eb2085964e66fb9125d81a3ad29e;hp=9dbfbdb5d913246d510a2ccbec79dbde275b17c0;hpb=4fc1f870f5d977dbc89bfab497516fc7b784afb4;p=mir.git

diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java
index 9dbfbdb5..6bd2d879 100755
--- a/source/mir/servlet/ServletModule.java
+++ b/source/mir/servlet/ServletModule.java
@@ -1,9 +1,3 @@
-/*
- * put your module comment here
- *
- */
-
-
 package  mir.servlet;
 
 import  java.io.*;
@@ -46,10 +40,10 @@ public abstract class ServletModule {
    * get the session binded language
    */
   public String getLanguage(HttpServletRequest req){
-    HttpSession session = req.getSession();
+    HttpSession session = req.getSession(false);
     String language = (String)session.getAttribute("Language");
     if(language==null){
-      language=Configuration.getProperty("StandardLanguage");
+      language=MirConfig.getProp("StandardLanguage");
     }
     return language;
   }
@@ -72,26 +66,27 @@ public abstract class ServletModule {
     try {
       EntityList   theList;
       String       offsetParam = req.getParameter("offset");
-      int          offset;
+      int          offset=0;
       PrintWriter out = res.getWriter();
 
       // hier offsetcode bearbeiten
-      if (offsetParam != null || !offsetParam.equals("")){
+      if (offsetParam != null && !offsetParam.equals("")){
         offset = Integer.parseInt(offsetParam);
-      } else {
-        offset = 0;
       }
-      if (req.getParameter("next") != null)
+      if (req.getParameter("next") != null){
           offset=Integer.parseInt(req.getParameter("nextoffset"));
-      else
-          if (req.getParameter("prev") != null)
+      } else {
+          if (req.getParameter("prev") != null){
             offset = Integer.parseInt(req.getParameter("prevoffset"));
+          }
+      }
       theList = mainModule.getByWhereClause(null, offset);
       //theList = mainModule.getByWhereClause((String)null, offset);
-      if (theList == null || theList.getCount() == 0 || theList.getCount()>1)
-        HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateListString, theList, out);
-      else
+      if (theList == null || theList.getCount() == 0 || theList.getCount()>1){
+        HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString, theList, out);
+      } else {
         deliver(req, res, theList.elementAt(0), templateObjektString);
+      }
     } catch (Exception e) {
       throw new ServletModuleException(e.toString());
     }
@@ -131,7 +126,8 @@ public abstract class ServletModule {
       HashMap withValues = getIntersectingValues(req, mainModule.getStorageObject());
       String id = mainModule.add(withValues);
       // theLog.printDebugInfo("--trying to deliver..."+id);
-      deliver(req, res, mainModule.getById(id), templateObjektString);
+      list(req,res);
+      //deliver(req, res, mainModule.getById(id), templateObjektString);
     }
     catch (Exception e) { throw new ServletModuleException(e.toString());}
   }
@@ -266,7 +262,7 @@ public abstract class ServletModule {
     try {
       //PrintWriter out =  new LineFilterWriter(res.getWriter());
       PrintWriter out =  res.getWriter();
-      HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateFilename, rtm , out);
+      HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateFilename, rtm , out);
       out.close();
     } catch (HTMLParseException e) {
       throw new ServletModuleException(e.toString());
@@ -288,6 +284,7 @@ public abstract class ServletModule {
     throws ServletModuleException {
     deliver(req, res,HTMLTemplateProcessor.makeSimpleHash(ent), templateFilename);
   }
+
   /**
    * deliver liefert das Template mit dem Filenamen templateFilename
    * an den HttpServletResponse res aus, nachdem es mit den Daten aus
@@ -299,9 +296,9 @@ public abstract class ServletModule {
    * @param tmpl Name des Templates
    * @exception ServletModuleException
    */
-  private void deliver(HttpServletRequest req, PrintWriter out, TemplateModelRoot rtm, String templateFilename)
+  private void deliver(HttpServletResponse res,HttpServletRequest req, PrintWriter out, TemplateModelRoot rtm, String templateFilename)
     throws HTMLParseException {
-    HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateFilename, rtm , out);
+    HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateFilename, rtm , out);
   }
 
   /**