From: mh <mh>
Date: Mon, 23 Dec 2002 03:12:46 +0000 (+0000)
Subject: merge no-cache stuff into AbstractServlet's setNoChaching method
X-Git-Tag: BEFORE_MERGE_1_1~374
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=d6bc50f1affaa770d3a3942f9c13c06ed68ad019;p=mir.git

merge no-cache stuff into AbstractServlet's setNoChaching method
---

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 81902800..6f85ad3d 100755
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -51,7 +51,7 @@ import mircoders.storage.*;
  *  OpenMir.java - main servlet for open posting and comment feature to articles
  *
  *  @author RK 1999-2001, the mir-coders group
- *  @version $Id: OpenMir.java,v 1.16 2002/12/06 08:12:42 mh Exp $
+ *  @version $Id: OpenMir.java,v 1.17 2002/12/23 03:12:46 mh Exp $
  *
  */
 
@@ -95,15 +95,11 @@ public class OpenMir extends AbstractServlet {
     if (req.getParameter("language")!=null)
       setLocale(session, new Locale(req.getParameter("language"), "") );
 
-    //nothing in Mir can or should be cached as it's all dynamic...
-    //
-    //this needs to be done here and not per page (via meta tags) as some
-    //browsers have problems w/ it per-page -mh
-    res.setHeader("Pragma", "no-cache");
-    res.setDateHeader("Expires", 0);
-    res.setHeader("Cache-Control", "no-cache");
+    //make sure client browsers don't cache anything
+    setNoCaching(res);
+
     res.setContentType("text/html; charset="
-                      +MirConfig.getProp("Mir.DefaultEncoding"));
+                      +MirConfig.getProp("Mir.DefaultHTMLCharset"));
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
     }
diff --git a/source/mir/servlet/AbstractServlet.java b/source/mir/servlet/AbstractServlet.java
index 66ae8f0a..90516c3a 100755
--- a/source/mir/servlet/AbstractServlet.java
+++ b/source/mir/servlet/AbstractServlet.java
@@ -39,6 +39,7 @@ import mir.storage.StorageObjectException;
 import javax.servlet.UnavailableException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.util.Locale;
 import java.util.Random;
@@ -49,24 +50,32 @@ import java.util.Random;
  * Copyright:    Copyright (c) 2001, 2002
  * Company:      Mir-coders group
  * @author       idfx, the Mir-coders group
- * @version      $Id: AbstractServlet.java,v 1.18 2002/11/27 08:22:03 mh Exp $
+ * @version      $Id: AbstractServlet.java,v 1.19 2002/12/23 03:12:46 mh Exp $
  */
 
 public abstract class AbstractServlet extends HttpServlet {
     protected static String lang;
     protected static Logfile theLog;
 
+    protected void setNoCaching(HttpServletResponse res) {
+      //nothing in Mir can or should be cached as it's all dynamic...
+      //
+      //this needs to be done here and not per page (via meta tags) as some
+      //browsers have problems w/ it per-page -mh
+      res.setHeader("Pragma", "no-cache");
+      res.setDateHeader("Expires", 0);
+      res.setHeader("Cache-Control", "no-cache");
+    }
+
     /**
      * the configration
      */
     protected boolean getConfig(HttpServletRequest req)
             throws UnavailableException {
 
-        //String RealPath = super.getServletContext().getRealPath("/");
         String name = super.getServletName();
 
         // init config
-        //MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config"));
         MirConfig.initConfig(super.getServletContext(), req.getContextPath(),
                               name, getInitParameter("Config"));
 
@@ -137,16 +146,6 @@ public abstract class AbstractServlet extends HttpServlet {
     protected String getAcceptLanguage(HttpServletRequest req) {
         Locale loc = req.getLocale();
         lang = loc.getLanguage();
-        /* not needed anymore due to new i18n
-          File f = new File(HTMLTemplateProcessor.templateDir+"/"+lang);
-        //is there an existing template-path?
-        if(!f.isDirectory()){
-          //no there isn't. we use standard-language
-          lang = MirConfig.getProp("StandardLanguage");
-          theLog.printDebugInfo("language not existing");
-        }
-        theLog.printDebugInfo("Language: " + lang);
-        */
         return lang;
     }
 }