Added specific mp3 media handler. modified RealAudio handler to inherit from

[mir.git] / source / mir / servlet / ServletModule.java

diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java
index 0ac4a6c..6bd2d87 100755 (executable)
--- 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;
   }
@@ -89,7 +83,7 @@ public abstract class ServletModule {
       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);
+        HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString, theList, out);
       } else {
         deliver(req, res, theList.elementAt(0), templateObjektString);
       }
@@ -268,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());
@@ -290,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
@@ -301,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);
   }
 
   /**