make necessary changes to output UTF8 files and pages instead of ISO8859-1 and make...

diff --git a/source/Mir.java b/source/Mir.java
index de34636..f6c70f4 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -62,7 +62,8 @@ public class Mir extends AbstractServlet {
         session = req.getSession(true);
 
         if (req.getServerPort() == 443) http = "https"; else http = "http";
-        res.setContentType("text/html");
+        res.setContentType("text/html; charset="
+                            +MirConfig.getProp("Mir.DefaultEncoding"));
         String moduleName = req.getParameter("module");
 
         checkLanguage(session, req);
@@ -302,7 +303,7 @@ public class Mir extends AbstractServlet {
     }
 
     public String getServletInfo() {
-        return "Mir 1.0 rev02 multilanguage";
+        return "Mir "+MirConfig.getProp("Mir.Version");
     }
 
     private void checkLanguage(HttpSession session, HttpServletRequest req) {

diff --git a/source/OpenMir.java b/source/OpenMir.java
index b855083..8a8bb9a 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -52,7 +52,8 @@ public class OpenMir extends AbstractServlet {
       setLanguage(session,getAcceptLanguage(req));
     }
 
-    res.setContentType("text/html");
+    res.setContentType("text/html; charset="
+                      +MirConfig.getProp("Mir.DefaultEncoding"));
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
     }
@@ -103,7 +104,9 @@ public class OpenMir extends AbstractServlet {
 
   }
 
-  public String getServletInfo(){ return "OpenIndy 1.0 rev01"; }
+  public String getServletInfo(){
+    return "OpenMir "+MirConfig.getProp("Mir.Version");
+  }
 
 }
 

diff --git a/source/config.properties-dist b/source/config.properties-dist
index 66534e4..ed949a9 100755 (executable)
--- a/source/config.properties-dist
+++ b/source/config.properties-dist
@@ -198,6 +198,11 @@ Entity.Logfile=log/dbentity.log
 # Servlet / Module configurations
 #
 
+# don't change this unless you really know your i18n.
+# The default encoding charset used in the written html files as well
+# as the dynamic output html.
+# also used for the HTML charset meta tag.
+Mir.DefaultEncoding=UTF8
 Mir.Logfile=log/mir.log
 Mir.ErrorTemplate=error.template
 Mir.UserErrorTemplate=usererror.template

diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java
index c2f10f2..062fd39 100755 (executable)
--- a/source/mir/misc/HTMLTemplateProcessor.java
+++ b/source/mir/misc/HTMLTemplateProcessor.java
@@ -32,6 +32,7 @@ public final class HTMLTemplateProcessor {
   private static String               imageHost;
   private static String               imagePath;
   private static String               openAction;
+  private static String               defEncoding;
   protected static String producerDocRoot =
                MirConfig.getProp("Producer.DocRoot");
   protected static String producerStorageRoot =
@@ -60,6 +61,7 @@ public final class HTMLTemplateProcessor {
 
     actionRoot = docRoot + "/servlet/Mir";
 
+    defEncoding = MirConfig.getProp("Mir.DefaultEncoding");
     openAction = MirConfig.getProp("Producer.OpenAction");
     productionHost = MirConfig.getProp("Producer.ProductionHost");
     videoHost = MirConfig.getProp("Producer.VideoHost");
@@ -231,6 +233,7 @@ public final class HTMLTemplateProcessor {
     // values in the templates. -mh
                // put standard configuration into tempalteRootmodel
                SimpleHash configHash = new SimpleHash();
+               configHash.put("defEncoding", new SimpleScalar(defEncoding));
                configHash.put("producerDocRoot", new SimpleScalar(producerDocRoot));
                configHash.put("storageRoot", new SimpleScalar(producerStorageRoot));
     configHash.put("productionHost", new SimpleScalar(productionHost));

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 9f56efc..c04e992 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -562,9 +562,8 @@ public class Database implements StorageObject {
                                // alle durchlaufen bis nix mehr da
                                theType = metadataTypes[i];
                                if (theType == java.sql.Types.LONGVARBINARY) {
-                                       InputStream us = rs.getAsciiStream(i + 1);
-                                       if (us != null) {
-                                               InputStreamReader is = new InputStreamReader(us);
+                                       InputStreamReader is = (InputStreamReader)rs.getCharacterStream(i + 1);
+                                       if (is != null) {
                                                char[] data = new char[32768];
                                                StringBuffer theResultString = new StringBuffer();
                                                int len;

diff --git a/source/mircoders/producer/Producer.java b/source/mircoders/producer/Producer.java
index b641371..28e42da 100755 (executable)
--- a/source/mircoders/producer/Producer.java
+++ b/source/mircoders/producer/Producer.java
@@ -74,27 +74,32 @@ abstract public class Producer {
                        File f = new File(producerStorageRoot + filename);
                        File dir = new File(f.getParent());
                        dir.mkdirs();
-                       FileWriter outputFile = new FileWriter(f);
+                       // it's important that we set the desired encoding. It should be UTF8
+      // not the platform default.
+      OutputStreamWriter outputFileStream =
+        new OutputStreamWriter(new FileOutputStream(f),
+                               MirConfig.getProp("Mir.DefaultEncoding"));
                        PrintWriter outStream;
                        if (compressed==true) {
-                               outStream = new LineFilterWriter(outputFile);
+                               outStream = new LineFilterWriter(outputFileStream);
                        } else {
-                               outStream = new PrintWriter(outputFile);
+                               outStream = new PrintWriter(outputFileStream);
                        }
 
                        HTMLTemplateProcessor.process(null,template, model, outStream,null);
-                       outputFile.close();
+                       outputFileStream.close();
                        outStream.close();
 
                        printHTML(htmlout, "Produced <a href=\"" + producerProductionHost+
                         filename + "\">" + filename + "</a>");
                        //theLog.printInfo("Produced: " + producerStorageRoot + filename);
-                       //theLog.printDebugInfo("free mem:" + java.lang.Runtime.getRuntime().freeMemory());
+       //theLog.printDebugInfo("free mem:" + java.lang.Runtime.getRuntime().freeMemory());
       //theLog.printDebugInfo("total mem:" + java.lang.Runtime.getRuntime().totalMemory());
                        return true;
 
                } catch(IOException exception){
                        logHTML(htmlout, "Producer: File could not be written " + filename);
+      System.out.println(exception.toString());
                        return false;
                } catch(HTMLParseException exception){
                        logHTML(htmlout,"Producer: Error in HTML-parsing: " + filename);

diff --git a/templates-dist/admin/start_admin.template b/templates-dist/admin/start_admin.template
index 24dd61d..0e529b6 100755 (executable)
--- a/templates-dist/admin/start_admin.template
+++ b/templates-dist/admin/start_admin.template
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>${lang("start.htmltitle")}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta http-equiv="Content-Type" content="text/html; charset=${config.defEncoding}">
   </head>
 
 <body bgcolor="#FFFFFF" link="#666666" vlink="#990000" alink="#990000">

diff --git a/templates-dist/producer/content.template b/templates-dist/producer/content.template
index 58f41c8..53e0026 100755 (executable)
--- a/templates-dist/producer/content.template
+++ b/templates-dist/producer/content.template
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>${lang("producer.content.htmltitle")}${content.title}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=${config.defEncoding}">
 <link rel="stylesheet" href="/style/mir.css" type="text/css">
                        <if data.content.to_media_images>
                 <meta name="keywords" content="images"></meta>

diff --git a/templates-dist/producer/featuresRSS.template b/templates-dist/producer/featuresRSS.template
index 3e137cf..74b3ac7 100755 (executable)
--- a/templates-dist/producer/featuresRSS.template
+++ b/templates-dist/producer/featuresRSS.template
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding=${config.defEncoding}?>
 
 <rdf:RDF
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

diff --git a/templates-dist/producer/openposting.template b/templates-dist/producer/openposting.template
index 595f9cc..407f340 100755 (executable)
--- a/templates-dist/producer/openposting.template
+++ b/templates-dist/producer/openposting.template
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>${lang("producer.openposting.htmltitle")}${topic.title}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=${config.defEncoding}">
 <link rel="stylesheet" href="/style/mir.css" type="text/css">
 </head>
 

diff --git a/templates-dist/producer/startpage.template b/templates-dist/producer/startpage.template
index f738c49..3483698 100755 (executable)
--- a/templates-dist/producer/startpage.template
+++ b/templates-dist/producer/startpage.template
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>${lang("producer.startpage.htmltitle")}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=${config.defEncoding}">
 <link rel="stylesheet" href="/style/mir.css" type="text/css">
 </head>
 

diff --git a/templates-dist/producer/topiclist.template b/templates-dist/producer/topiclist.template
index 1da84cd..aaa02a7 100755 (executable)
--- a/templates-dist/producer/topiclist.template
+++ b/templates-dist/producer/topiclist.template
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>${lang("producer.topiclist.htmltitle")}${topic.title}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=${config.defEncoding}">
 <link rel="stylesheet" href="/style/mir.css" type="text/css">
 </head>
 

diff --git a/templates-dist/producer/wml2.xsl b/templates-dist/producer/wml2.xsl
index 3787604..601ebb9 100755 (executable)
--- a/templates-dist/producer/wml2.xsl
+++ b/templates-dist/producer/wml2.xsl
@@ -4,7 +4,7 @@
 
 <xsl:output
                   method="xml"
-                  encoding="iso-8859-1"
+                  encoding="${config.defEncoding}"
                   omit-xml-declaration="yes"
                   doctype-public="-//WAPFORUM//DTD WML 1.1//EN"
                   doctype-system="http://www.wapforum.org/DTD/wml_1.1.xml"