cos removed from the open posting system + misc. updates here and there

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 791e345..ccda981 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -29,25 +29,25 @@
  * not wish to do so, delete this exception statement from your version.
  */
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import mir.servlet.AbstractServlet;
-import mir.servlet.ServletModuleDispatch;
-import mir.servlet.ServletModuleUserExc;
-import mir.util.ExceptionFunctions;
-import mircoders.global.MirGlobal;
+import java.io.IOException;\r
+import java.io.PrintWriter;\r
+import javax.servlet.ServletException;\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+import javax.servlet.http.HttpSession;\r
+\r
+import mir.servlet.AbstractServlet;\r
+import mir.servlet.ServletModuleDispatch;\r
+import mir.servlet.ServletModuleUserExc;\r
+import mir.util.ExceptionFunctions;\r
+import mircoders.global.MirGlobal;\r
 import mircoders.servlet.ServletModuleOpenIndy;
 
 /**
  *  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.32 2003/04/16 03:26:44 zapata Exp $
+ *  @version $Id: OpenMir.java,v 1.33 2003/04/21 00:24:05 zapata Exp $
  *
  */
 

diff --git a/source/mir/generator/CompositeGeneratorLibrary.java b/source/mir/generator/CompositeGeneratorLibrary.java
index 3f17764..a338ca8 100755 (executable)
--- a/source/mir/generator/CompositeGeneratorLibrary.java
+++ b/source/mir/generator/CompositeGeneratorLibrary.java
@@ -31,7 +31,7 @@
 
 package mir.generator;
 
-import java.util.HashMap;
+import java.util.HashMap;\r
 import java.util.Map;
 
 public class CompositeGeneratorLibrary implements Generator.GeneratorLibrary {

diff --git a/source/mir/generator/FreemarkerGenerator.java b/source/mir/generator/FreemarkerGenerator.java
index ea0c69d..da2fe3c 100755 (executable)
--- a/source/mir/generator/FreemarkerGenerator.java
+++ b/source/mir/generator/FreemarkerGenerator.java
@@ -31,30 +31,26 @@
 
 package mir.generator;
 
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.apache.struts.util.MessageResources;
-import org.apache.commons.beanutils.PropertyUtils;
-
-
-import freemarker.template.FileTemplateCache;
-import freemarker.template.SimpleScalar;
-import freemarker.template.Template;
-import freemarker.template.TemplateHashModel;
-import freemarker.template.TemplateListModel;
-import freemarker.template.TemplateMethodModel;
-import freemarker.template.TemplateModel;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateModelRoot;
-import freemarker.template.TemplateScalarModel;
-
+import java.io.PrintWriter;\r
+import java.util.HashMap;\r
+import java.util.Iterator;\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.Vector;\r
+\r
+import org.apache.commons.beanutils.PropertyUtils;\r
+import freemarker.template.FileTemplateCache;\r
+import freemarker.template.SimpleScalar;\r
+import freemarker.template.Template;\r
+import freemarker.template.TemplateHashModel;\r
+import freemarker.template.TemplateListModel;\r
+import freemarker.template.TemplateMethodModel;\r
+import freemarker.template.TemplateModel;\r
+import freemarker.template.TemplateModelException;\r
+import freemarker.template.TemplateModelRoot;\r
+import freemarker.template.TemplateScalarModel;\r
+import mir.log.LoggerWrapper;\r
 import mir.util.RewindableIterator;
-import mir.util.*;
 
 
 public class FreemarkerGenerator implements Generator {
@@ -64,7 +60,7 @@ public class FreemarkerGenerator implements Generator {
     template = aTemplate;
   }
 
-  public void generate(Object anOutputWriter, Map aValues, PrintWriter aLogger) throws GeneratorExc, GeneratorFailure {
+  public void generate(Object anOutputWriter, Map aValues, LoggerWrapper aLogger) throws GeneratorExc, GeneratorFailure {
     if (!(anOutputWriter instanceof PrintWriter))
       throw new GeneratorExc("Writer for a FreemarkerGenerator must be a PrintWriter");
 
@@ -73,8 +69,8 @@ public class FreemarkerGenerator implements Generator {
     }
     catch (Throwable t) {
       t.printStackTrace();
-      aLogger.println("Exception occurred: "+t.getMessage());
-      t.printStackTrace(aLogger);
+      aLogger.error("Exception occurred: "+t.getMessage());
+      t.printStackTrace(aLogger.asPrintWriter(aLogger.DEBUG_MESSAGE));
       throw new GeneratorFailure( t );
     }
   }

diff --git a/source/mir/generator/Generator.java b/source/mir/generator/Generator.java
index 245dd3a..011c1c2 100755 (executable)
--- a/source/mir/generator/Generator.java
+++ b/source/mir/generator/Generator.java
@@ -31,12 +31,13 @@
 
 package mir.generator;
 
-import java.io.PrintWriter;
-import java.util.List;
-import java.util.Map;
+import java.util.List;\r
+import java.util.Map;\r
+\r
+import mir.log.LoggerWrapper;
 
 public interface Generator {
-  public void generate(Object anOutputWriter, Map aValues, PrintWriter aLogger) throws GeneratorExc, GeneratorFailure;
+  public void generate(Object anOutputWriter, Map aValues, LoggerWrapper aLogger) throws GeneratorExc, GeneratorFailure;
 
   public static interface GeneratorLibrary {
     public Generator makeGenerator(String anIdentifier) throws GeneratorExc, GeneratorFailure;

diff --git a/source/mir/generator/GeneratorLibraryRepository.java b/source/mir/generator/GeneratorLibraryRepository.java
index 639c9c1..a7116cf 100755 (executable)
--- a/source/mir/generator/GeneratorLibraryRepository.java
+++ b/source/mir/generator/GeneratorLibraryRepository.java
@@ -43,7 +43,7 @@ public class GeneratorLibraryRepository {
 
   public GeneratorLibraryRepository() {
     factories = new HashMap();
-    logger = new LoggerWrapper("TemplateEngine");
+    logger = new LoggerWrapper("Generator");
   }
 
   public void registerLibraryFactory(String aName, Generator.GeneratorLibraryFactory aFactory) {

diff --git a/source/mir/producer/GeneratingProducerNode.java b/source/mir/producer/GeneratingProducerNode.java
index 6ad421d..8787ea2 100755 (executable)
--- a/source/mir/producer/GeneratingProducerNode.java
+++ b/source/mir/producer/GeneratingProducerNode.java
@@ -77,7 +77,7 @@ public class GeneratingProducerNode implements ProducerNode {
 
       writer = writerEngine.openWriter( destinationIdentifier, parameters );
       generator = generatorLibrary.makeGenerator( generatorIdentifier );
-      generator.generate(writer, aValueMap, new PrintWriter(new LoggerToWriterAdapter(aLogger, LoggerWrapper.INFO_MESSAGE)));
+      generator.generate(writer, aValueMap, aLogger);
       writerEngine.closeWriter( writer );
 
       endTime = System.currentTimeMillis();

diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java
index c0444d7..88c44dc 100755 (executable)
--- a/source/mir/servlet/ServletModule.java
+++ b/source/mir/servlet/ServletModule.java
@@ -456,16 +456,7 @@ public abstract class ServletModule {
       HTTPRequestParser parser;
       List theFieldList;
 
-      logger.debug("using charset: " + req.getParameter("charset"));
-      logger.debug("using method: " + req.getParameter("do"));
-      if (req.getParameter("charset") != null) {
-        parser = new HTTPRequestParser(req, req.getParameter("charset"));
-        logger.debug("using charset: " + req.getParameter("charset"));
-        logger.debug("original charset: " + req.getCharacterEncoding());
-      }
-      else {
-        parser = new HTTPRequestParser(req);
-      }
+      parser = new HTTPRequestParser(req);
 
       theFieldList = theStorage.getFields();
 
@@ -487,5 +478,4 @@ public abstract class ServletModule {
       throw new ServletModuleFailure( "ServletModule.getIntersectingValues: " + e.getMessage(), e);
     }
   }
-
 }

diff --git a/source/mir/servlet/ServletModuleDispatch.java b/source/mir/servlet/ServletModuleDispatch.java
index 1c58dd9..f8ee7fe 100755 (executable)
--- a/source/mir/servlet/ServletModuleDispatch.java
+++ b/source/mir/servlet/ServletModuleDispatch.java
@@ -44,7 +44,7 @@ import mir.log.LoggerWrapper;
  * Dispatcher, calls the method passed to ServletModule Class, through the "do"
  * Parameter (via POST or GET)
  *
- * @version $Id: ServletModuleDispatch.java,v 1.13 2003/03/06 05:40:39 zapata Exp $
+ * @version $Id: ServletModuleDispatch.java,v 1.14 2003/04/21 00:24:05 zapata Exp $
  *
  * @Author rk
  *
@@ -61,25 +61,23 @@ public final class ServletModuleDispatch {
   private ServletModuleDispatch () {
   }
 
-        /**
-         *  Die Dispatch-Routine ruft das von dem Hauptservlet kommende ServletModule
-         *  mit dem per HttpServletRequest angegebenen Paramter <code>do</code> auf.
-         *  Ist kein Parameter angegeben, so wird versucht, in die <code>defaultAction</code>
-         *  des ServletModules zu springen.
-         *
-         * @param req Http-Request, das vom Dispatcher an die Methode des
-         *    ServletModules durchgereicht wird
-         * @param res Http-Response, die vom Dispatcher an die Methode des
-         *    ServletModules durchgereicht wird
-         * @param sMod ServletModule, an das dispatched wird.
-         * @param mod Name des Modules als String (f?r Logfile)
-         */
+  /**
+   *  Die Dispatch-Routine ruft das von dem Hauptservlet kommende ServletModule
+   *  mit dem per HttpServletRequest angegebenen Paramter <code>do</code> auf.
+   *  Ist kein Parameter angegeben, so wird versucht, in die <code>defaultAction</code>
+   *  des ServletModules zu springen.
+   *
+   * @param req Http-Request, das vom Dispatcher an die Methode des
+   *    ServletModules durchgereicht wird
+   * @param res Http-Response, die vom Dispatcher an die Methode des
+   *    ServletModules durchgereicht wird
+   * @param sMod ServletModule, an das dispatched wird.
+   * @param mod Name des Modules als String (f?r Logfile)
+   */
 
   public static void dispatch(ServletModule sMod, HttpServletRequest req,
           HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure
   {
-    //sMod.predeliver(req,res);
-
     String doParam = req.getParameter("do");
     logger.info("ServletModuleDispatch: " + sMod.toString() + " with method " + doParam);
     if (doParam == null) {
@@ -97,21 +95,15 @@ public final class ServletModuleDispatch {
       }
       else logger.debug("method lookup unsuccesful");
     }
-    catch ( NoSuchMethodException e) {
-      throw new ServletModuleFailure("no such method '"+doParam+"' (" + e.getMessage() + ")", e);
-    }
-    catch ( SecurityException e) {
-      throw new ServletModuleFailure("method not allowed!" + e.getMessage(), e);
-    }
     catch ( InvocationTargetException e) {
-      logger.debug( "invocation target exception: " + e.getMessage());
+      logger.error( "invocation target exception: " + e.getMessage());
+      e.getTargetException().printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
 
       throw new ServletModuleFailure(e.getTargetException().getMessage(), e.getTargetException());
     }
-    catch ( IllegalAccessException e) {
-      throw new ServletModuleFailure("illegal method not allowed!" + e.getMessage(), e);
-    }
     catch (Throwable t) {
+      logger.error( "ServletModuleDispatch: " + t.getMessage());
+      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
       throw new ServletModuleFailure(t);
     }
   }

diff --git a/source/mir/session/CommonsUploadedFileAdapter.java b/source/mir/session/CommonsUploadedFileAdapter.java
index 42b2d91..869f7b3 100755 (executable)
--- a/source/mir/session/CommonsUploadedFileAdapter.java
+++ b/source/mir/session/CommonsUploadedFileAdapter.java
@@ -1,27 +1,64 @@
-package mir.session;\r
-\r
-import org.apache.commons.fileupload.*;\r
-import java.io.*;\r
-\r
-public class CommonsUploadedFileAdapter implements UploadedFile {\r
-  private FileItem fileItem;\r
-  private Object container;\r
-\r
-  public CommonsUploadedFileAdapter(Object aContainer, FileItem aFileItem) {\r
-    container = aContainer;\r
-    fileItem = aFileItem;\r
-  }\r
-\r
-  public InputStream getInputStream() throws SessionExc, SessionFailure{\r
-    try {\r
-      return fileItem.getInputStream();\r
-    }\r
-    catch (Throwable t) {\r
-      throw new SessionFailure(t);\r
-    }\r
-  };\r
-\r
-  public String getContentType() {\r
-    return fileItem.getContentType();\r
-  };\r
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
+package mir.session;
+
+import org.apache.commons.fileupload.*;
+import java.io.*;
+
+public class CommonsUploadedFileAdapter implements UploadedFile {
+  private FileItem fileItem;
+
+  public CommonsUploadedFileAdapter(FileItem aFileItem) {
+    fileItem = aFileItem;
+  }
+
+  public InputStream getInputStream() throws SessionExc, SessionFailure{
+    try {
+      return fileItem.getInputStream();
+    }
+    catch (Throwable t) {
+      throw new SessionFailure(t);
+    }
+  };
+
+  public String getFileName() {
+    return fileItem.getName();
+  }
+
+  public String getFieldName() {
+    return fileItem.getFieldName();
+  }
+
+  public String getContentType() {
+    return fileItem.getContentType();
+  };
 }
\ No newline at end of file

diff --git a/source/mir/session/HTTPAdapters.java b/source/mir/session/HTTPAdapters.java
index b8d4181..cfb444f 100755 (executable)
--- a/source/mir/session/HTTPAdapters.java
+++ b/source/mir/session/HTTPAdapters.java
@@ -1,91 +1,121 @@
-package mir.session;\r
-\r
-import java.util.Arrays;\r
-import java.util.List;\r
-import java.util.Vector;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpSession;\r
-\r
-import org.apache.commons.fileupload.FileItem;\r
-\r
-import mir.util.HTTPParsedRequest;\r
-\r
-public class HTTPAdapters {\r
-  public static class HTTPRequestAdapter implements Request {\r
-    private HttpServletRequest request;\r
-\r
-    public HTTPRequestAdapter(HttpServletRequest aRequest) {\r
-      request = aRequest;\r
-    }\r
-\r
-    public String getParameter(String aName) {\r
-      return request.getParameter(aName);\r
-    };\r
-\r
-    public List getUploadedFiles() {\r
-      return new Vector();\r
-    };\r
-\r
-    public List getParameters(String aName) {\r
-      return Arrays.asList(request.getParameterValues(aName));\r
-    };\r
-\r
-    public HttpServletRequest getRequest() {\r
-      return request;\r
-    }\r
-  }\r
-\r
-  public static class HTTPParsedRequestAdapter implements Request {\r
-    private HTTPParsedRequest request;\r
-\r
-    public HTTPParsedRequestAdapter(HTTPParsedRequest aRequest) {\r
-      request = aRequest;\r
-    }\r
-\r
-    public String getParameter(String aName) {\r
-      return request.getParameter(aName);\r
-    };\r
-\r
-    public List getParameters(String aName) {\r
-      return request.getParameterList(aName);\r
-    };\r
-\r
-    public List getUploadedFiles() {\r
-      List result = new Vector();\r
-      List files = request.getFiles();\r
-\r
-      for (int i=0; i<files.size(); i++) {\r
-        result.add(new CommonsUploadedFileAdapter(request, (FileItem) files.get(i)));\r
-      }\r
-\r
-      return result;\r
-    };\r
-\r
-    public HttpServletRequest getRequest() {\r
-      return request.getRequest();\r
-    }\r
-  }\r
-\r
-  public static class HTTPSessionAdapter implements Session {\r
-    private HttpSession session;\r
-\r
-    public HTTPSessionAdapter(HttpSession aSession) {\r
-      session = aSession;\r
-    }\r
-    public Object getAttribute(String aName) {\r
-      return session.getAttribute(aName);\r
-    }\r
-\r
-    public void deleteAttribute(String aName) {\r
-      session.removeAttribute(aName);\r
-    }\r
-\r
-    public void setAttribute(String aName, Object aNewValue) {\r
-      session.setAttribute(aName, aNewValue);\r
-    }\r
-\r
-    public void terminate() {\r
-      session.invalidate();\r
-    }\r
-  }\r
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
+package mir.session;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.fileupload.FileItem;
+import mir.util.HTTPParsedRequest;
+
+public class HTTPAdapters {
+  public static class HTTPRequestAdapter implements Request {
+    private HttpServletRequest request;
+
+    public HTTPRequestAdapter(HttpServletRequest aRequest) {
+      request = aRequest;
+    }
+
+    public String getParameter(String aName) {
+      return request.getParameter(aName);
+    };
+
+    public List getUploadedFiles() {
+      return new Vector();
+    };
+
+    public List getParameters(String aName) {
+      return Arrays.asList(request.getParameterValues(aName));
+    };
+
+    public HttpServletRequest getRequest() {
+      return request;
+    }
+  }
+
+  public static class HTTPParsedRequestAdapter implements Request {
+    private HTTPParsedRequest request;
+
+    public HTTPParsedRequestAdapter(HTTPParsedRequest aRequest) {
+      request = aRequest;
+    }
+
+    public String getParameter(String aName) {
+      return request.getParameter(aName);
+    };
+
+    public List getParameters(String aName) {
+      return request.getParameterList(aName);
+    };
+
+    public List getUploadedFiles() {
+      List result = new Vector();
+      List files = request.getFiles();
+
+      for (int i=0; i<files.size(); i++) {
+        result.add(new CommonsUploadedFileAdapter((FileItem) files.get(i)));
+      }
+
+      return result;
+    };
+
+    public HttpServletRequest getRequest() {
+      return request.getRequest();
+    }
+  }
+
+  public static class HTTPSessionAdapter implements Session {
+    private HttpSession session;
+
+    public HTTPSessionAdapter(HttpSession aSession) {
+      session = aSession;
+    }
+    public Object getAttribute(String aName) {
+      return session.getAttribute(aName);
+    }
+
+    public void deleteAttribute(String aName) {
+      session.removeAttribute(aName);
+    }
+
+    public void setAttribute(String aName, Object aNewValue) {
+      session.setAttribute(aName, aNewValue);
+    }
+
+    public void terminate() {
+      session.invalidate();
+    }
+  }
 }
\ No newline at end of file

diff --git a/source/mir/session/Request.java b/source/mir/session/Request.java
index bc7fb2d..e0709bd 100755 (executable)
--- a/source/mir/session/Request.java
+++ b/source/mir/session/Request.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mir.session;
 
 import java.util.*;

diff --git a/source/mir/session/Response.java b/source/mir/session/Response.java
index 334139e..f472eaa 100755 (executable)
--- a/source/mir/session/Response.java
+++ b/source/mir/session/Response.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mir.session;
 
 import java.util.Map;

diff --git a/source/mir/session/Session.java b/source/mir/session/Session.java
index facd8ff..33fe3dd 100755 (executable)
--- a/source/mir/session/Session.java
+++ b/source/mir/session/Session.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mir.session;
 
 public interface Session {

diff --git a/source/mir/session/UploadedFile.java b/source/mir/session/UploadedFile.java
index ae6f454..574eefe 100755 (executable)
--- a/source/mir/session/UploadedFile.java
+++ b/source/mir/session/UploadedFile.java
@@ -1,8 +1,41 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mir.session;
 
 import java.io.InputStream;
 
 public interface UploadedFile {
   InputStream getInputStream() throws SessionExc, SessionFailure;
+  String getFileName();
+  String getFieldName();
   String getContentType();
 }
\ No newline at end of file

diff --git a/source/mir/storage/store/test/TestStore.java b/source/mir/storage/store/test/TestStore.java
index 574df42..e9a1e4d 100755 (executable)
--- a/source/mir/storage/store/test/TestStore.java
+++ b/source/mir/storage/store/test/TestStore.java
@@ -42,31 +42,31 @@ package mir.storage.store.test;
 
 import mir.storage.store.ObjectStore;
 import mir.storage.store.StorableObject;
-import mir.storage.store.StoreIdentifier;
+import mir.storage.store.*;
 
 public class TestStore {
 
-       private static ObjectStore o_store = ObjectStore.getInstance();
+        private static ObjectStore o_store = ObjectStore.getInstance();
 
-       public TestStore() {
+        public TestStore() {
 
-       }
+        }
 
-       public static void main(String[] args) {
-               long startTime = System.currentTimeMillis();
-               System.out.println("Starting testrun on ObjectStore...");
-               TestStore testStore1 = new TestStore();
-               testStore1.startTest();
-               System.out.println("Finished testrun on ObjectStore. ("
-                               + (System.currentTimeMillis() - startTime) + " ms)");
-       }
+        public static void main(String[] args) {
+                long startTime = System.currentTimeMillis();
+                System.out.println("Starting testrun on ObjectStore...");
+                TestStore testStore1 = new TestStore();
+                testStore1.startTest();
+                System.out.println("Finished testrun on ObjectStore. ("
+                                + (System.currentTimeMillis() - startTime) + " ms)");
+        }
 
-       public void startTest() {
+        public void startTest() {
 
-               EntityC1 c1 = new EntityC1("1");
-               o_store.add(c1.getStoreIdentifier());
-               EntityC1 c12 = new EntityC1("2");
-               o_store.add(c12.getStoreIdentifier());
+                EntityC1 c1 = new EntityC1("1");
+                o_store.add(c1.getStoreIdentifier());
+                EntityC1 c12 = new EntityC1("2");
+                o_store.add(c12.getStoreIdentifier());
     o_store.add(c12.getStoreIdentifier()); // should not be added as it's there already
 
     EntityC2 c2;
@@ -99,11 +99,11 @@ public class TestStore {
     search_sid=new StoreIdentifier(EntityC1.class,"1");
     o_store.invalidate(search_sid);
 
-               System.out.println(o_store.toString());
+                System.out.println(o_store.toString());
     /** @todo compare values of store and state failed if values are not
      *  right*/
 
 
 
-       }
+        }
 }
\ No newline at end of file

diff --git a/source/mir/util/HTTPParsedRequest.java b/source/mir/util/HTTPParsedRequest.java
index e49ba1b..961a40f 100755 (executable)
--- a/source/mir/util/HTTPParsedRequest.java
+++ b/source/mir/util/HTTPParsedRequest.java
@@ -1,159 +1,162 @@
-/*\r
- * Copyright (C) 2001, 2002  The Mir-coders group\r
- *\r
- * This file is part of Mir.\r
- *\r
- * Mir is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * Mir is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with Mir; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- *\r
- * In addition, as a special exception, The Mir-coders gives permission to link\r
- * the code of this program with the com.oreilly.servlet library, any library\r
- * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
- * the above that use the same license as the above), and distribute linked\r
- * combinations including the two.  You must obey the GNU General Public\r
- * License in all respects for all of the code used other than the above\r
- * mentioned libraries.  If you modify this file, you may extend this exception\r
- * to your version of the file, but you are not obligated to do so.  If you do\r
- * not wish to do so, delete this exception statement from your version.\r
- */\r
-\r
-package mir.util;\r
-\r
-import java.util.Arrays;\r
-import java.util.Enumeration;\r
-import java.util.HashMap;\r
-import java.util.Iterator;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.Vector;\r
-import javax.servlet.http.HttpServletRequest;\r
-\r
-import org.apache.commons.fileupload.FileItem;\r
-import org.apache.commons.fileupload.FileUpload;\r
-import mir.log.LoggerWrapper;\r
-\r
-public class HTTPParsedRequest {\r
-  static final String MULTIPART_FORMDATA_CONTENTTYPE = "multipart/form-data";\r
-\r
-  private HttpServletRequest request;\r
-  private String encoding;\r
-  private int maxUploadSize;\r
-  private String tempDir;\r
-\r
-  private Map stringValues;\r
-  private Map listValues;\r
-  private List files;\r
-\r
-  private LoggerWrapper logger;\r
-\r
-  public HTTPParsedRequest(HttpServletRequest aRequest, String anEncoding, int aMaxUploadSize, String aTempDir) throws UtilExc, UtilFailure {\r
-    logger = new LoggerWrapper("Utility,HTTPParsedRequest");\r
-\r
-    request = aRequest;\r
-    encoding = anEncoding;\r
-    maxUploadSize = aMaxUploadSize;\r
-    tempDir = aTempDir;\r
-\r
-    stringValues = new HashMap();\r
-    listValues = new HashMap();\r
-    files = new Vector();\r
-\r
-    parseRequest(aRequest);\r
-  }\r
-\r
-  public HTTPParsedRequest(HttpServletRequest aRequest, int aMaxUploadSize, String aTempDir) throws UtilExc, UtilFailure {\r
-    this(aRequest, aRequest.getCharacterEncoding(), aMaxUploadSize, aTempDir);\r
-  }\r
-\r
-  public HttpServletRequest getRequest() {\r
-    return request;\r
-  }\r
-\r
-  public String getParameter(String aName) {\r
-    return (String) stringValues.get(aName);\r
-  }\r
-\r
-  public List getFiles() {\r
-    return files;\r
-  }\r
-\r
-  public List getParameterList(String aName) {\r
-    return (List) listValues.get(aName);\r
-  }\r
-\r
-  protected void parseRequest(HttpServletRequest aRequest) throws UtilExc, UtilFailure {\r
-\r
-    try {\r
-      String contentType = aRequest.getContentType();\r
-      List parts = StringRoutines.splitString(contentType, ";");\r
-\r
-      Enumeration e = aRequest.getParameterNames();\r
-\r
-      while (e.hasMoreElements()) {\r
-        String name = (String) e.nextElement();\r
-\r
-        stringValues.put(name, aRequest.getParameter(name));\r
-        List listValue = new Vector(Arrays.asList(aRequest.getParameterValues(name)));\r
-        listValues.put(name, listValue);\r
-      }\r
-\r
-      if (parts.size()>0 && ((String) parts.get(0)).trim().toLowerCase().equals(MULTIPART_FORMDATA_CONTENTTYPE)) {\r
-        parseMultipartRequest();\r
-      }\r
-    }\r
-    catch (Throwable t) {\r
-      t.printStackTrace();\r
-\r
-      throw new UtilFailure(t);\r
-    }\r
-  }\r
-\r
-  protected void parseMultipartRequest() throws UtilExc, UtilFailure {\r
-    try {\r
-      FileUpload upload = new FileUpload();\r
-\r
-      upload.setSizeMax(maxUploadSize);\r
-      upload.setSizeThreshold(4096);\r
-      upload.setRepositoryPath(tempDir);\r
-\r
-      List items = upload.parseRequest(request);\r
-\r
-      Iterator i = items.iterator();\r
-      while (i.hasNext()) {\r
-        FileItem item = (FileItem) i.next();\r
-\r
-        if (item.isFormField()) {\r
-          if (!stringValues.containsKey(item.getName())) {\r
-            stringValues.put(item.getFieldName(), item.getString());\r
-          }\r
-\r
-          List listValue = (List) listValues.get(item.getFieldName());\r
-          if (listValue == null) {\r
-            listValue = new Vector();\r
-            listValues.put(item.getFieldName(), listValue);\r
-          }\r
-          listValue.add(item.getString());\r
-        }\r
-        else {\r
-          if (item.getSize()>0)\r
-            files.add(item);\r
-        }\r
-      }\r
-    }\r
-    catch (Throwable t) {\r
-      throw new UtilFailure(t);\r
-    }\r
-  }\r
-}\r
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
+package mir.util;
+
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUpload;
+import mir.log.LoggerWrapper;
+
+public class HTTPParsedRequest {
+  static final String MULTIPART_FORMDATA_CONTENTTYPE = "multipart/form-data";
+
+  private HttpServletRequest request;
+  private String encoding;
+  private int maxUploadSize;
+  private String tempDir;
+
+  private Map stringValues;
+  private Map listValues;
+  private List files;
+
+  private LoggerWrapper logger;
+
+  public HTTPParsedRequest(HttpServletRequest aRequest, String anEncoding, int aMaxUploadSize, String aTempDir) throws UtilExc, UtilFailure {
+    logger = new LoggerWrapper("Utility,HTTPParsedRequest");
+
+    request = aRequest;
+    encoding = anEncoding;
+    maxUploadSize = aMaxUploadSize;
+    tempDir = aTempDir;
+
+    stringValues = new HashMap();
+    listValues = new HashMap();
+    files = new Vector();
+
+    parseRequest(aRequest);
+  }
+
+  public HTTPParsedRequest(HttpServletRequest aRequest, int aMaxUploadSize, String aTempDir) throws UtilExc, UtilFailure {
+    this(aRequest, aRequest.getCharacterEncoding(), aMaxUploadSize, aTempDir);
+  }
+
+  public HttpServletRequest getRequest() {
+    return request;
+  }
+
+  public String getParameter(String aName) {
+    return (String) stringValues.get(aName);
+  }
+
+  public List getFiles() {
+    return files;
+  }
+
+  public List getParameterList(String aName) {
+    if (listValues.containsKey(aName))
+      return (List) listValues.get(aName);
+    else
+      return new Vector();
+  }
+
+  protected void parseRequest(HttpServletRequest aRequest) throws UtilExc, UtilFailure {
+
+    try {
+      String contentType = aRequest.getContentType();
+      List parts = StringRoutines.splitString(contentType, ";");
+
+      Enumeration e = aRequest.getParameterNames();
+
+      while (e.hasMoreElements()) {
+        String name = (String) e.nextElement();
+
+        stringValues.put(name, aRequest.getParameter(name));
+        List listValue = new Vector(Arrays.asList(aRequest.getParameterValues(name)));
+        listValues.put(name, listValue);
+      }
+
+      if (parts.size()>0 && ((String) parts.get(0)).trim().toLowerCase().equals(MULTIPART_FORMDATA_CONTENTTYPE)) {
+        parseMultipartRequest();
+      }
+    }
+    catch (Throwable t) {
+      t.printStackTrace();
+
+      throw new UtilFailure(t);
+    }
+  }
+
+  protected void parseMultipartRequest() throws UtilExc, UtilFailure {
+    try {
+      FileUpload upload = new FileUpload();
+
+      upload.setSizeMax(maxUploadSize);
+      upload.setSizeThreshold(4096);
+      upload.setRepositoryPath(tempDir);
+
+      List items = upload.parseRequest(request);
+
+      Iterator i = items.iterator();
+      while (i.hasNext()) {
+        FileItem item = (FileItem) i.next();
+
+        if (item.isFormField()) {
+          if (!stringValues.containsKey(item.getName())) {
+            stringValues.put(item.getFieldName(), item.getString(encoding));
+          }
+
+          List listValue = (List) listValues.get(item.getFieldName());
+          if (listValue == null) {
+            listValue = new Vector();
+            listValues.put(item.getFieldName(), listValue);
+          }
+          listValue.add(item.getString(encoding));
+        }
+        else {
+          if (item.getSize()>0)
+            files.add(item);
+        }
+      }
+    }
+    catch (Throwable t) {
+      throw new UtilFailure(t);
+    }
+  }
+}

diff --git a/source/mircoders/localizer/basic/MirBasicCommentPostingSessionHandler.java b/source/mircoders/localizer/basic/MirBasicCommentPostingSessionHandler.java
index bf219f8..522f116 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicCommentPostingSessionHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicCommentPostingSessionHandler.java
@@ -1,3 +1,34 @@
+/*\r
+ * Copyright (C) 2001, 2002  The Mir-coders group\r
+ *\r
+ * This file is part of Mir.\r
+ *\r
+ * Mir is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Mir is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with Mir; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ *\r
+ * In addition, as a special exception, The Mir-coders gives permission to link\r
+ * the code of this program with the com.oreilly.servlet library, any library\r
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
+ * the above that use the same license as the above), and distribute linked\r
+ * combinations including the two.  You must obey the GNU General Public\r
+ * License in all respects for all of the code used other than the above\r
+ * mentioned libraries.  If you modify this file, you may extend this exception\r
+ * to your version of the file, but you are not obligated to do so.  If you do\r
+ * not wish to do so, delete this exception statement from your version.\r
+ */\r
+\r
 package mircoders.localizer.basic;\r
 \r
 import java.util.*;\r
@@ -23,24 +54,13 @@ import mircoders.media.*;
  * @version 1.0\r
  */\r
 \r
-public class MirBasicCommentPostingSessionHandler implements SessionHandler {\r
-  protected LoggerWrapper logger;\r
-  protected MirPropertiesConfiguration configuration;\r
-  protected boolean initialRequest;\r
+public class MirBasicCommentPostingSessionHandler extends MirBasicPostingSessionHandler {\r
   protected ModuleComment commentModule;\r
   protected DatabaseCommentToMedia commentToMedia = DatabaseCommentToMedia.getInstance();\r
 \r
   public MirBasicCommentPostingSessionHandler() {\r
-    logger = new LoggerWrapper("Localizer.OpenPosting.Comment");\r
-    try {\r
-      configuration = MirPropertiesConfiguration.instance();\r
-    }\r
-    catch (Throwable t) {\r
-      logger.fatal("Cannont load configuration: " + t.toString());\r
+    super();\r
 \r
-      throw new RuntimeException("Cannont load configuration: " + t.toString());\r
-    }\r
-    initialRequest= true;\r
     commentModule= new ModuleComment(DatabaseComment.getInstance());\r
   }\r
 \r
@@ -54,113 +74,40 @@ public class MirBasicCommentPostingSessionHandler implements SessionHandler {
     }\r
   };\r
 \r
-  public String generateOnetimePassword() {\r
-    Random r = new Random();\r
-    int random = r.nextInt();\r
-\r
-    long l = System.currentTimeMillis();\r
+  protected void initializeResponseData(Request aRequest, Session aSession, Response aResponse) throws SessionExc, SessionFailure {\r
+    super.initializeResponseData(aRequest, aSession, aResponse);\r
 \r
-    l = (l*l*l*l)/random;\r
-    if (l<0)\r
-      l = l * -1;\r
-\r
-    String returnString = ""+l;\r
-\r
-    return returnString.substring(5);\r
-  }\r
-\r
-  public void initializeResponseData(Request aRequest, Session aSession, Response aResponse) throws SessionExc, SessionFailure {\r
-    if (MirGlobal.abuse().getOpenPostingPassword()) {\r
-      String password = (String) aSession.getAttribute("password");\r
-      if (password==null) {\r
-        password = generateOnetimePassword();\r
-        aSession.setAttribute("password", password);\r
-      }\r
-      aResponse.setResponseValue("password", password);\r
-    }\r
-    else {\r
-      aResponse.setResponseValue("password", null);\r
-      aSession.deleteAttribute("password");\r
+    Iterator i = DatabaseComment.getInstance().getFields().iterator();\r
+    while (i.hasNext()) {\r
+      String field = (String) i.next();\r
+      aResponse.setResponseValue(field, aRequest.getParameter(field));\r
     }\r
 \r
-    aResponse.setResponseValue("errors", null);\r
   };\r
 \r
   public void initialRequest(Request aRequest, Session aSession, Response aResponse) throws SessionExc, SessionFailure{\r
-    Iterator i = DatabaseContent.getInstance().getFields().iterator();\r
-    while (i.hasNext()) {\r
-      aResponse.setResponseValue( (String) i.next(), null);\r
-    }\r
+    super.initialRequest(aRequest, aSession, aResponse);\r
 \r
     String articleId = aRequest.getParameter("to_media");\r
-\r
     if (articleId == null)\r
       throw new SessionExc("MirBasicCommentPostingSessionHandler.initialRequest: article id not set!");\r
-\r
     aSession.setAttribute("to_media", articleId);\r
 \r
-    initializeResponseData(aRequest, aSession, aResponse);\r
-\r
-    try {\r
-      aResponse.setResponseGenerator(configuration.getString("Localizer.OpenSession.comment.EditTemplate"));\r
-    }\r
-    catch (Throwable e) {\r
-      throw new SessionFailure("Can't get configuration: " + e.getMessage(), e);\r
-    }\r
-\r
-  }\r
-\r
-  public boolean testFieldExists(Request aRequest, String aFieldName, String anErrorMessageResource, List aValidationResults) {\r
-    Object value = aRequest.getParameter(aFieldName);\r
-    if (value==null || !(value instanceof String) || ((String) value).trim().length()==0) {\r
-      logger.debug("  missing field " + aFieldName + " value = " + value);\r
-      aValidationResults.add(new ValidationError(aFieldName, anErrorMessageResource));\r
-      return false;\r
-    }\r
-    else\r
-      return true;\r
-  }\r
-\r
-  public boolean testFieldIsNumeric(Request aRequest, String aFieldName, String anErrorMessageResource, List aValidationResults) {\r
-    Object value = aRequest.getParameter(aFieldName);\r
-    if (value!=null) {\r
-      try {\r
-        Integer.parseInt((String) value);\r
-        return true;\r
-      }\r
-      catch (Throwable t) {\r
-        logger.debug("  field not numeric: " + aFieldName + " value = " + value);\r
-        aValidationResults.add(new ValidationError(aFieldName, anErrorMessageResource));\r
-        return false;\r
-      }\r
-    }\r
-    return true;\r
+    aResponse.setResponseGenerator(configuration.getString("Localizer.OpenSession.comment.EditTemplate"));\r
   }\r
 \r
-\r
   public List validate(Request aRequest, Session aSession) throws SessionExc, SessionFailure {\r
     List result = new Vector();\r
 \r
-    testFieldExists(aRequest, "title", "validationerror.missing", result);\r
-    testFieldExists(aRequest, "description", "validationerror.missing", result);\r
-    testFieldExists(aRequest, "creator", "validationerror.missing", result);\r
+    testFieldEntered(aRequest, "title", "validationerror.missing", result);\r
+    testFieldEntered(aRequest, "description", "validationerror.missing", result);\r
+    testFieldEntered(aRequest, "creator", "validationerror.missing", result);\r
 \r
     return result;\r
   }\r
 \r
   public void subsequentRequest(Request aRequest, Session aSession, Response aResponse) throws SessionExc, SessionFailure {\r
     try {\r
-      Map commentFields = new HashMap();\r
-\r
-      Iterator i = DatabaseContent.getInstance().getFields().iterator();\r
-      while (i.hasNext()) {\r
-        String field = (String) i.next();\r
-        aResponse.setResponseValue(field, aRequest.getParameter(field));\r
-        if (aRequest.getParameter(field)!=null) {\r
-          commentFields.put(field, aRequest.getParameter(field));\r
-        }\r
-      }\r
-\r
       initializeResponseData(aRequest, aSession, aResponse);\r
 \r
       List validationErrors = validate(aRequest, aSession);\r
@@ -170,7 +117,8 @@ public class MirBasicCommentPostingSessionHandler implements SessionHandler {
       }\r
       else {\r
         EntityComment comment = (EntityComment) commentModule.createNew ();\r
-        comment.setValues(commentFields);\r
+        Iterator i = DatabaseComment.getInstance().getFields().iterator();\r
+//        comment.setValues(commentFields);\r
 \r
         finishComment(aRequest, aSession, comment);\r
 \r
@@ -235,7 +183,7 @@ public class MirBasicCommentPostingSessionHandler implements SessionHandler {
 \r
   public void processMediaFile(Request aRequest, Session aSession, EntityComment aComment, UploadedFile aFile) throws SessionExc, SessionFailure {\r
     try {\r
-      Entity mediaItem = MediaUploadProcessor.processMediaUpload(aFile);\r
+      Entity mediaItem = MediaUploadProcessor.processMediaUpload(aFile, new HashMap());\r
       finishMedia(aRequest, aSession, aFile, mediaItem);\r
       mediaItem.update();\r
       commentToMedia.addMedia(aComment.getId(), mediaItem.getId());\r

diff --git a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
index 10995ba..67d5ca9 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
@@ -34,7 +34,7 @@ package mircoders.localizer.basic;
 import mir.generator.FreemarkerGenerator;
 import mir.generator.Generator;
 import mir.generator.GeneratorLibraryRepository;
-import mir.generator.WriterEngine;
+import mir.generator.*;
 import mir.log.LoggerWrapper;
 import mircoders.global.MirGlobal;
 import mircoders.localizer.MirGeneratorLocalizer;
@@ -54,9 +54,9 @@ public class MirBasicGeneratorLocalizer implements MirGeneratorLocalizer {
   }
 
   protected void buildRepository(GeneratorLibraryRepository aRepository) {
-    aRepository.registerLibraryFactory("freemarker",
-       new FreemarkerGenerator.FreemarkerGeneratorLibraryFactory(
-          MirGlobal.config().getString("Home") ) );
+    aRepository.registerLibraryFactory(
+        "freemarker",
+        new FreemarkerGenerator.FreemarkerGeneratorLibraryFactory(MirGlobal.config().getString("Home") ) );
   }
 
   public Generator.GeneratorLibrary makeProducerGeneratorLibrary() throws MirLocalizerExc, MirLocalizerFailure {

diff --git a/source/mircoders/localizer/basic/MirBasicLocalizer.java b/source/mircoders/localizer/basic/MirBasicLocalizer.java
index 06823a1..50922c4 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicLocalizer.java
@@ -67,5 +67,4 @@ public class MirBasicLocalizer implements MirLocalizer {
     return new MirBasicAdminInterfaceLocalizer();
   };
 
-
 }
\ No newline at end of file

diff --git a/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java b/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
index f4b5d5c..919678c 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
@@ -32,22 +32,20 @@
 package mircoders.localizer.basic;\r
 \r
 import java.util.List;\r
-import java.util.Locale;\r
-import java.util.*;\r
-import javax.servlet.http.HttpServletRequest;\r
+import java.util.Random;\r
 \r
+import mir.config.MirPropertiesConfiguration;\r
 import mir.log.LoggerWrapper;\r
-import mir.servlet.*;\r
-import mir.config.*;\r
 import mir.session.Request;\r
-import mir.session.Response;\r
-import mir.session.*;\r
-\r
+import mir.session.Session;\r
+import mir.session.SessionHandler;\r
 import mircoders.entity.EntityComment;\r
 import mircoders.entity.EntityContent;\r
 import mircoders.global.MirGlobal;\r
 import mircoders.global.ProducerEngine;\r
-import mircoders.localizer.*;\r
+import mircoders.localizer.MirLocalizerExc;\r
+import mircoders.localizer.MirLocalizerFailure;\r
+import mircoders.localizer.MirOpenPostingLocalizer;\r
 \r
 public class MirBasicOpenPostingLocalizer implements MirOpenPostingLocalizer {\r
   private List afterContentProducerTasks;\r

diff --git a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
index 625eae2..0f9144e 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
@@ -31,22 +31,23 @@
 
 package mircoders.localizer.basic;
 
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import mir.config.MirPropertiesConfiguration;
-import mir.entity.adapter.EntityAdapter;
-import mir.entity.adapter.EntityIteratorAdapter;
-import mir.log.LoggerWrapper;
-import mir.misc.StringUtil;
-import mir.util.DateToMapAdapter;
-import mir.util.GeneratorHTMLFunctions;
-import mir.util.GeneratorIntegerFunctions;
-import mir.util.GeneratorListFunctions;
-import mir.util.GeneratorStringFunctions;
-import mircoders.global.MirGlobal;
+import java.util.GregorianCalendar;\r
+import java.util.HashMap;\r
+import java.util.Iterator;\r
+import java.util.Map;\r
+\r
+import mir.config.MirPropertiesConfiguration;\r
+import mir.entity.adapter.EntityAdapter;\r
+import mir.entity.adapter.EntityIteratorAdapter;\r
+import mir.log.LoggerWrapper;\r
+import mir.misc.StringUtil;\r
+import mir.util.DateToMapAdapter;\r
+import mir.util.GeneratorExpressionFunctions;\r
+import mir.util.GeneratorHTMLFunctions;\r
+import mir.util.GeneratorIntegerFunctions;\r
+import mir.util.GeneratorListFunctions;\r
+import mir.util.GeneratorStringFunctions;\r
+import mircoders.global.MirGlobal;\r
 import mircoders.localizer.MirProducerAssistantLocalizer;
 
 public class MirBasicProducerAssistantLocalizer implements MirProducerAssistantLocalizer {
@@ -87,6 +88,7 @@ public class MirBasicProducerAssistantLocalizer implements MirProducerAssistantL
       utilityMap.put("subList", new GeneratorListFunctions.subListFunction());
       utilityMap.put("isOdd", new GeneratorIntegerFunctions.isOddFunction());
       utilityMap.put("increment", new GeneratorIntegerFunctions.incrementFunction());
+      utilityMap.put("evaluate", new GeneratorExpressionFunctions.evaluateExpressionFunction());
 
       aValueSet.put("config", configMap);
       aValueSet.put("utility", utilityMap);

diff --git a/source/mircoders/media/MediaUploadProcessor.java b/source/mircoders/media/MediaUploadProcessor.java
index a23be01..bfe1782 100755 (executable)
--- a/source/mircoders/media/MediaUploadProcessor.java
+++ b/source/mircoders/media/MediaUploadProcessor.java
@@ -47,7 +47,7 @@ import mir.storage.Database;
 import mircoders.module.ModuleMediaType;\r
 \r
 public class MediaUploadProcessor {\r
-  public static Entity processMediaUpload(UploadedFile aFile) throws MediaExc, MediaFailure {\r
+  public static Entity processMediaUpload(UploadedFile aFile, Map aValues) throws MediaExc, MediaFailure {\r
     String mediaId;\r
     MirMedia mediaHandler;\r
     Entity mediaType;\r
@@ -67,12 +67,12 @@ public class MediaUploadProcessor {
         throw new MediaExc("Invalid content-type: " + contentType);\r
       }\r
 \r
+      values.putAll(aValues);\r
       values.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));\r
       values.put("is_produced", "0");\r
       values.put("is_published", "1");\r
       values.put("to_publisher", "0");\r
       values.put("to_media_folder", "7");\r
-      values.put("title", "");\r
 \r
       mediaTypeModule = new ModuleMediaType();\r
       mediaType = mediaTypeModule.findMediaTypeForMimeType(contentType);\r

diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java
index dbffa3a..dd58860 100755 (executable)
--- a/source/mircoders/servlet/ServletHelper.java
+++ b/source/mircoders/servlet/ServletHelper.java
@@ -44,11 +44,15 @@ import mir.servlet.ServletModuleFailure;
 import mir.util.CachingRewindableIterator;\r
 import mir.util.NullWriter;\r
 import mir.util.ResourceBundleGeneratorFunction;\r
+import mir.log.*;\r
 import mircoders.global.MirGlobal;\r
 \r
 \r
 \r
 public class ServletHelper {\r
+  static LoggerWrapper logger = new LoggerWrapper("ServletModule.Helper");\r
+\r
+\r
   public static Map makeGenerationData(Locale[] aLocales) throws ServletModuleExc {\r
     return makeGenerationData(aLocales, "bundles.adminlocal", "bundles.admin");\r
   }\r
@@ -108,7 +112,7 @@ public class ServletHelper {
     try {\r
       generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGenerator);\r
 \r
-      generator.generate(aWriter, aGenerationData, new PrintWriter(new NullWriter()));\r
+      generator.generate(aWriter, aGenerationData, logger);\r
     }\r
     catch (Throwable t) {\r
       throw new ServletModuleFailure(t);\r
@@ -121,7 +125,7 @@ public class ServletHelper {
     try {\r
       generator = MirGlobal.localizer().generators().makeOpenPostingGeneratorLibrary().makeGenerator(aGenerator);\r
 \r
-      generator.generate(aWriter, aGenerationData, new PrintWriter(new NullWriter()));\r
+      generator.generate(aWriter, aGenerationData, logger);\r
     }\r
     catch (Throwable t) {\r
       throw new ServletModuleFailure(t);\r

diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java
index 78b9ff0..272f041 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleContent.java
+++ b/source/mircoders/servlet/ServletModuleContent.java
@@ -31,45 +31,47 @@
 
 package mircoders.servlet;
 
-import java.util.GregorianCalendar;\r
-import java.util.HashMap;\r
-import java.util.Iterator;\r
-import java.util.List;\r
-import java.util.Locale;\r
-import java.util.Map;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-import javax.servlet.http.HttpSession;\r
-\r
-import org.apache.lucene.index.IndexReader;\r
-import freemarker.template.SimpleHash;\r
-import mir.entity.adapter.EntityAdapterModel;\r
-import mir.entity.adapter.EntityIteratorAdapter;\r
-import mir.log.LoggerWrapper;\r
-import mir.misc.StringUtil;\r
-import mir.servlet.ServletModule;\r
-import mir.servlet.ServletModuleExc;\r
-import mir.servlet.ServletModuleFailure;\r
-import mir.util.CachingRewindableIterator;\r
-import mir.util.HTTPRequestParser;\r
-import mir.util.JDBCStringRoutines;\r
-import mir.util.SQLQueryBuilder;\r
-import mir.util.URLBuilder;\r
-import mircoders.entity.EntityContent;\r
-import mircoders.entity.EntityUsers;\r
-import mircoders.global.MirGlobal;\r
-import mircoders.module.ModuleContent;\r
-import mircoders.search.IndexUtil;\r
-import mircoders.storage.DatabaseComment;\r
-import mircoders.storage.DatabaseContent;\r
-import mircoders.storage.DatabaseContentToMedia;\r
+import java.util.Arrays;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.lucene.index.IndexReader;
+import freemarker.template.SimpleHash;
+
+import mir.entity.adapter.EntityAdapterModel;
+import mir.entity.adapter.EntityIteratorAdapter;
+import mir.log.LoggerWrapper;
+import mir.misc.StringUtil;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleFailure;
+import mir.util.CachingRewindableIterator;
+import mir.util.HTTPRequestParser;
+import mir.util.JDBCStringRoutines;
+import mir.util.SQLQueryBuilder;
+import mir.util.URLBuilder;
+import mircoders.entity.EntityContent;
+import mircoders.entity.EntityUsers;
+import mircoders.global.MirGlobal;
+import mircoders.module.ModuleContent;
+import mircoders.search.IndexUtil;
+import mircoders.storage.DatabaseComment;
+import mircoders.storage.DatabaseContent;
+import mircoders.storage.DatabaseContentToMedia;
 import mircoders.storage.DatabaseContentToTopics;
 
 /*
  *  ServletModuleContent -
  *  deliver html for the article admin form.
  *
- * @version $Id: ServletModuleContent.java,v 1.48 2003/04/10 03:31:47 zapata Exp $
+ * @version $Id: ServletModuleContent.java,v 1.49 2003/04/21 00:24:06 zapata Exp $
  * @author rk, mir-coders
  *
  */
@@ -187,7 +189,9 @@ public class ServletModuleContent extends ServletModule
         withValues.put("is_html","0");
 
       String id = mainModule.add(withValues);
-      DatabaseContentToTopics.getInstance().setTopics(id,req.getParameterValues("to_topic"));
+      List topics;
+
+      DatabaseContentToTopics.getInstance().setTopics(id, req.getParameterValues("to_topic"));
 
       _showObject(id, req, res);
     }
@@ -310,7 +314,7 @@ public class ServletModuleContent extends ServletModule
         throw new ServletModuleExc("Wrong call: (id) is missing");
 
       Map withValues = getIntersectingValues(aRequest, DatabaseContent.getInstance());
-      String[] topic_id = aRequest.getParameterValues("to_topic");
+
       String content_id = aRequest.getParameter("id");
 
       withValues.put("is_produced", "0");
@@ -320,7 +324,7 @@ public class ServletModuleContent extends ServletModule
         withValues.put("is_html","0");
 
       String id = mainModule.set(withValues);
-      DatabaseContentToTopics.getInstance().setTopics(aRequest.getParameter("id"),topic_id);
+      DatabaseContentToTopics.getInstance().setTopics(aRequest.getParameter("id"), aRequest.getParameterValues("to_topic"));
 
       String whereParam = aRequest.getParameter("where");
       String orderParam = aRequest.getParameter("order");
@@ -336,12 +340,18 @@ public class ServletModuleContent extends ServletModule
     }
   }
 
-/*
-  * HelperMethod shows the basic article editing form.
-  *
-  * if the "id" parameter is null, it means show an empty form to add a new
-  * article.
-*/
+
+  /**
+   * HelperMethod shows the basic article editing form.
+   *
+   * if the "id" parameter is null, it means show an empty form to add a new
+   * article.
+   *
+   * @param id
+   * @param aRequest
+   * @param aResponse
+   * @throws ServletModuleExc
+   */
   public void _showObject(String id, HttpServletRequest aRequest, HttpServletResponse aResponse)
       throws ServletModuleExc {
     try {

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index e0e70d9..b1747db 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -1,1248 +1,1125 @@
-/*\r
- * Copyright (C) 2001, 2002  The Mir-coders group\r
- *\r
- * This file is part of Mir.\r
- *\r
- * Mir is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * Mir is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with Mir; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- *\r
- * In addition, as a special exception, The Mir-coders gives permission to link\r
- * the code of this program with the com.oreilly.servlet library, any library\r
- * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
- * the above that use the same license as the above), and distribute linked\r
- * combinations including the two.  You must obey the GNU General Public\r
- * License in all respects for all of the code used other than the above\r
- * mentioned libraries.  If you modify this file, you may extend this exception\r
- * to your version of the file, but you are not obligated to do so.  If you do\r
- * not wish to do so, delete this exception statement from your version.\r
- */\r
-\r
-package mircoders.servlet;\r
-\r
-import java.io.ByteArrayOutputStream;\r
-import java.io.File;\r
-import java.io.FileNotFoundException;\r
-import java.io.FileReader;\r
-import java.io.IOException;\r
-import java.io.PrintWriter;\r
-import java.io.StringWriter;\r
-import java.util.ArrayList;\r
-import java.util.Arrays;\r
-import java.util.Collections;\r
-import java.util.Date;\r
-import java.util.Enumeration;\r
-import java.util.GregorianCalendar;\r
-import java.util.HashMap;\r
-import java.util.Iterator;\r
-import java.util.List;\r
-import java.util.ListIterator;\r
-import java.util.Map;\r
-import java.util.Set;\r
-import java.util.Vector;\r
-import java.util.*;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-import javax.servlet.http.HttpSession;\r
-import javax.servlet.http.HttpUtils;\r
-\r
-import gnu.regexp.RE;\r
-import gnu.regexp.REMatch;\r
-import gnu.regexp.REMatchEnumeration;\r
-import gnu.regexp.REException;\r
-\r
-import org.apache.commons.net.smtp.SMTPClient;\r
-import org.apache.commons.net.smtp.SMTPReply;\r
-import org.apache.log.Hierarchy;\r
-import org.apache.log.Priority;\r
-import org.apache.lucene.analysis.standard.StandardAnalyzer;\r
-import org.apache.lucene.document.Document;\r
-import org.apache.lucene.queryParser.QueryParser;\r
-import org.apache.lucene.search.Hits;\r
-import org.apache.lucene.search.IndexSearcher;\r
-import org.apache.lucene.search.Query;\r
-import org.apache.lucene.search.Searcher;\r
-import org.apache.struts.util.MessageResources;\r
-\r
-import mir.entity.Entity;\r
-import mir.entity.EntityList;\r
-import mir.generator.Generator;\r
-import mir.log.LoggerWrapper;\r
-import mir.misc.FileHandler;\r
-import mir.misc.StringUtil;\r
-import mir.misc.WebdbMultipartRequest;\r
-import mir.servlet.ServletModule;\r
-import mir.servlet.ServletModuleExc;\r
-import mir.servlet.ServletModuleFailure;\r
-import mir.servlet.ServletModuleUserExc;\r
-import mir.storage.StorageObjectFailure;\r
-import mir.util.*;\r
-import mircoders.pdf.PDFGenerator;\r
-import mir.session.*;\r
-import mir.util.HTTPRequestParser;\r
-import mir.util.StringRoutines;\r
-import mircoders.entity.EntityComment;\r
-import mircoders.entity.EntityContent;\r
-import mircoders.global.CacheKey;\r
-import mircoders.global.MirGlobal;\r
-import mircoders.media.*;\r
-import mircoders.media.UnsupportedMediaFormatExc;\r
-import mircoders.module.ModuleComment;\r
-import mircoders.module.ModuleContent;\r
-import mircoders.module.ModuleImages;\r
-import mircoders.module.ModuleTopics;\r
-import mircoders.search.AudioSearchTerm;\r
-import mircoders.search.ContentSearchTerm;\r
-import mircoders.search.ImagesSearchTerm;\r
-import mircoders.search.KeywordSearchTerm;\r
-import mircoders.search.MediaSearchTerm;\r
-import mircoders.search.TextSearchTerm;\r
-import mircoders.search.TopicSearchTerm;\r
-import mircoders.search.UnIndexedSearchTerm;\r
-import mircoders.search.VideoSearchTerm;\r
-import mircoders.storage.DatabaseComment;\r
-import mircoders.storage.DatabaseContent;\r
-import mircoders.storage.DatabaseContentToMedia;\r
-import mircoders.storage.DatabaseCommentToMedia;\r
-import mircoders.storage.DatabaseContentToTopics;\r
-import mircoders.storage.DatabaseImages;\r
-import mircoders.storage.DatabaseLanguage;\r
-import mircoders.storage.DatabaseTopics;\r
-\r
-/*\r
- *  ServletModuleOpenIndy -\r
- *   is the open-access-servlet, which is responsible for\r
- *    adding comments to articles &\r
- *    open-postings to the newswire\r
- *\r
- * @author mir-coders group\r
- * @version $Id: ServletModuleOpenIndy.java,v 1.77 2003/04/18 15:37:29 john Exp $\r
- *\r
- */\r
-\r
-public class ServletModuleOpenIndy extends ServletModule\r
-{\r
-\r
-  private String        commentFormTemplate, commentFormDoneTemplate, commentFormDupeTemplate;\r
-  private String        postingFormTemplate, postingFormDoneTemplate, postingFormDupeTemplate;\r
-  private String        searchResultsTemplate;\r
-  private String        prepareMailTemplate,sentMailTemplate;\r
-  private ModuleContent contentModule;\r
-  private ModuleComment commentModule;\r
-  private ModuleImages  imageModule;\r
-  private ModuleTopics  topicsModule;\r
-  private String        directOp ="yes";\r
-  // Singelton / Kontruktor\r
-  private static ServletModuleOpenIndy instance = new ServletModuleOpenIndy();\r
-  public static ServletModule getInstance() { return instance; }\r
-\r
-  private ServletModuleOpenIndy() {\r
-    super();\r
-    try {\r
-      logger = new LoggerWrapper("ServletModule.OpenIndy");\r
-\r
-      commentFormTemplate = configuration.getString("ServletModule.OpenIndy.CommentTemplate");\r
-      commentFormDoneTemplate = configuration.getString("ServletModule.OpenIndy.CommentDoneTemplate");\r
-      commentFormDupeTemplate = configuration.getString("ServletModule.OpenIndy.CommentDupeTemplate");\r
-\r
-      postingFormTemplate = configuration.getString("ServletModule.OpenIndy.PostingTemplate");\r
-      postingFormDoneTemplate = configuration.getString("ServletModule.OpenIndy.PostingDoneTemplate");\r
-      postingFormDupeTemplate = configuration.getString("ServletModule.OpenIndy.PostingDupeTemplate");\r
-\r
-      searchResultsTemplate = configuration.getString("ServletModule.OpenIndy.SearchResultsTemplate");\r
-      prepareMailTemplate = configuration.getString("ServletModule.OpenIndy.PrepareMailTemplate");\r
-      sentMailTemplate = configuration.getString("ServletModule.OpenIndy.SentMailTemplate");\r
-      directOp = configuration.getString("DirectOpenposting").toLowerCase();\r
-      commentModule = new ModuleComment(DatabaseComment.getInstance());\r
-      mainModule = commentModule;\r
-      contentModule = new ModuleContent(DatabaseContent.getInstance());\r
-      topicsModule = new ModuleTopics(DatabaseTopics.getInstance());\r
-      imageModule = new ModuleImages(DatabaseImages.getInstance());\r
-      defaultAction="addposting";\r
-    }\r
-    catch (StorageObjectFailure e) {\r
-      logger.error("servletmoduleopenindy could not be initialized: " + e.getMessage());\r
-    }\r
-  }\r
-\r
-  /**\r
-   * Method to return an "apology" when open postings are disabled\r
-   *\r
-   * @param aRequest\r
-   * @param aResponse\r
-   * @throws ServletModuleExc\r
-   * @throws ServletModuleUserExc\r
-   * @throws ServletModuleFailure\r
-   */\r
-  public void openPostingDisabled(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-    deliver(aRequest, aResponse, (Map) null, null,\r
-       configuration.getString("ServletModule.OpenIndy.PostingDisabledTemplate"));\r
-  }\r
-\r
-  /**\r
-   *  Method for making a comment\r
-   */\r
-\r
-  public void addcomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-    if (MirGlobal.abuse().getOpenPostingDisabled()) {\r
-      openPostingDisabled(req, res);\r
-\r
-      return;\r
-    }\r
-\r
-    String aid = req.getParameter("aid"); // the article id the comment will belong to\r
-\r
-    if (aid != null && !aid.equals("")) {\r
-      try {\r
-        Map mergeData = new HashMap();\r
-\r
-        // onetimepasswd\r
-        if (MirGlobal.abuse().getOpenPostingPassword()) {\r
-          String passwd = this.createOneTimePasswd();\r
-          HttpSession session = req.getSession(false);\r
-          session.setAttribute("passwd", passwd);\r
-          mergeData.put("passwd", passwd);\r
-        }\r
-        else {\r
-          mergeData.put("passwd", (String)null);\r
-        }\r
-        mergeData.put("aid", aid);\r
-\r
-        Map extraInfo = new HashMap();\r
-        extraInfo.put("languagePopUpData", DatabaseLanguage.getInstance().getPopupData());\r
-\r
-        deliver(req, res, mergeData, extraInfo, commentFormTemplate);\r
-      }\r
-      catch (Throwable t) {\r
-        throw new ServletModuleFailure("ServletModuleOpenIndy.addcomment: " + t.getMessage(), t);\r
-      }\r
-    }\r
-    else\r
-      throw new ServletModuleExc("aid not set!");\r
-  }\r
-\r
-  /**\r
-   *  Method for inserting a comment into the Database and delivering\r
-   *  the commentDone Page\r
-   */\r
-\r
-  public void inscomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-    if (MirGlobal.abuse().getOpenPostingDisabled()) {\r
-      openPostingDisabled(req, res);\r
-\r
-      return;\r
-    }\r
-\r
-    String aid = req.getParameter("to_media"); // the article id the comment will belong to\r
-    if (aid != null && !aid.equals("")) {\r
-      // ok, collecting data from form\r
-      try {\r
-        Map withValues = getIntersectingValues(req, DatabaseComment.getInstance());\r
-\r
-        //no html in comments(for now)\r
-        for (Iterator i = withValues.keySet().iterator(); i.hasNext(); ) {\r
-          String k = (String) i.next();\r
-          String v = (String) withValues.get(k);\r
-\r
-          withValues.put(k, StringUtil.removeHTMLTags(v));\r
-        }\r
-        withValues.put("is_published", "1");\r
-        withValues.put("to_comment_status", "1");\r
-        withValues.put("is_html", "0");\r
-\r
-        //checking the onetimepasswd\r
-        HttpSession session = req.getSession(false);\r
-        String sessionPasswd = (String) session.getAttribute("passwd");\r
-        if (sessionPasswd != null) {\r
-          String passwd = req.getParameter("passwd");\r
-          if (passwd == null || passwd.length() == 0) {\r
-            throw new ServletModuleUserExc("comment.error.missingpassword", new String[] {});\r
-          }\r
-          if (!sessionPasswd.equals(passwd)) {\r
-            throw new ServletModuleUserExc("comment.error.invalidpassword", new String[] {});\r
-          }\r
-          session.invalidate();\r
-        }\r
-\r
-        String id = mainModule.add(withValues);\r
-\r
-        SimpleResponse response = new SimpleResponse();\r
-        response.setResponseGenerator(commentFormDoneTemplate);\r
-\r
-        if (id == null) {\r
-          deliver(req, res, (Map)null, null, commentFormDupeTemplate);\r
-        }\r
-        else {\r
-          DatabaseContent.getInstance().setUnproduced("id=" + aid);\r
-\r
-          try {\r
-            EntityComment comment = (EntityComment) DatabaseComment.getInstance().selectById(id);\r
-            MirGlobal.localizer().openPostings().afterCommentPosting(comment);\r
-            MirGlobal.abuse().checkComment(\r
-                comment, new HTTPAdapters.HTTPRequestAdapter(req), res);\r
-          }\r
-          catch (Throwable t) {\r
-            throw new ServletModuleExc(t.getMessage());\r
-          }\r
-        }\r
-\r
-        // redirecting to url\r
-        // should implement back to article\r
-        deliver(req, res, response.getResponseValues(), null, response.getResponseGenerator());\r
-      }\r
-      catch (Throwable e) {\r
-        throw new ServletModuleFailure(e);\r
-      }\r
-    }\r
-    else\r
-      throw new ServletModuleExc("aid not set!");\r
-\r
-  }\r
-\r
-  /**\r
-   *  Method for delivering the form-Page for open posting\r
-   */\r
-\r
-  public void addposting(HttpServletRequest req, HttpServletResponse res)\r
-      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure\r
-  {\r
-    try {\r
-      if (MirGlobal.abuse().getOpenPostingDisabled()) {\r
-        openPostingDisabled(req, res);\r
-\r
-        return;\r
-      }\r
-\r
-      Map mergeData = new HashMap();\r
-\r
-      // onetimepasswd\r
-      if (MirGlobal.abuse().getOpenPostingPassword()) {\r
-        String passwd = generateOnetimePassword();\r
-        HttpSession session = req.getSession(false);\r
-        session.setAttribute("passwd", passwd);\r
-        mergeData.put("passwd", passwd);\r
-      }\r
-      else {\r
-        mergeData.put("passwd", (String)null);\r
-      }\r
-\r
-      String maxMedia = configuration.getString("ServletModule.OpenIndy.MaxMediaUploadItems");\r
-      String defaultMedia = configuration.getString("ServletModule.OpenIndy.DefaultMediaUploadItems");\r
-      String numOfMedia = req.getParameter("medianum");\r
-\r
-      if (numOfMedia == null || numOfMedia.equals("")) {\r
-        numOfMedia = defaultMedia;\r
-      }\r
-      else if (Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {\r
-        numOfMedia = maxMedia;\r
-      }\r
-\r
-      int mediaNum = Integer.parseInt(numOfMedia);\r
-      List mediaFields = new Vector();\r
-      for (int i = 0; i < mediaNum; i++) {\r
-        Integer mNum = new Integer(i + 1);\r
-        mediaFields.add(mNum.toString());\r
-      }\r
-      mergeData.put("medianum", numOfMedia);\r
-      mergeData.put("mediafields", mediaFields);\r
-      mergeData.put("to_topic", null);\r
-\r
-      Map extraInfo = new HashMap();\r
-      extraInfo.put("languagePopUpData", DatabaseLanguage.getInstance().getPopupData());\r
-      extraInfo.put("themenPopupData", topicsModule.getTopicsAsSimpleList());\r
-\r
-      extraInfo.put("topics", topicsModule.getTopicsList());\r
-      deliver(req, res, mergeData, extraInfo, postingFormTemplate);\r
-    }\r
-    catch (Throwable t) {\r
-      throw new ServletModuleFailure(t);\r
-    }\r
-  }\r
-\r
-  /**\r
-   *  Method for inserting an open posting into the Database and delivering\r
-   *  the postingDone Page\r
-   */\r
-\r
-  public void insposting(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure\r
-  {\r
-    if (MirGlobal.abuse().getOpenPostingDisabled()) {\r
-      openPostingDisabled(req, res);\r
-\r
-      return;\r
-    }\r
-\r
-    Map mergeData = new HashMap();\r
-    boolean setMedia=false;\r
-    boolean setTopic = false;\r
-\r
-    try {\r
-\r
-      WebdbMultipartRequest mp = null;\r
-      EntityList mediaList = null;\r
-      try {\r
-        // new MediaRequest, "1" is the id for the openPosting user\r
-        MediaRequest mediaReq = new MediaRequest("1", true);\r
-        mp = new WebdbMultipartRequest(req, (FileHandler)mediaReq);\r
-        mediaList = mediaReq.getEntityList();\r
-      }\r
-      catch (Throwable e) {\r
-        throw new ServletModuleFailure(e);\r
-      }\r
-\r
-      Map withValues = mp.getParameters();\r
-\r
-      //checking the onetimepasswd\r
-      HttpSession session = req.getSession(false);\r
-      String sessionPasswd = (String) session.getAttribute("passwd");\r
-      if (sessionPasswd != null){\r
-        String passwd = (String) withValues.get("passwd");\r
-\r
-        if ( passwd == null || passwd.length()==0) {\r
-          throw new ServletModuleUserExc("posting.error.missingpassword", new String[] {});\r
-        }\r
-        if (!sessionPasswd.equals(passwd)) {\r
-          throw new ServletModuleUserExc("posting.error.invalidpassword", new String[] {});\r
-        }\r
-        session.invalidate();\r
-      }\r
-\r
-      if ((((String)withValues.get("title")).length() == 0) ||\r
-          (((String)withValues.get("description")).length() == 0) ||\r
-          (((String)withValues.get("content_data")).length() == 0))\r
-        throw new ServletModuleUserExc("posting.error.missingfield", new String[] {});\r
-\r
-      // call the routines that escape html\r
-\r
-      for (Iterator i=withValues.keySet().iterator(); i.hasNext(); ){\r
-        String k=(String)i.next();\r
-        String v=(String)withValues.get(k);\r
-\r
-        if (k.equals("content_data")){\r
-          //this doesn't quite work yet, so for now, all html goes\r
-          //withValues.put(k,StringUtil.approveHTMLTags(v));\r
-          withValues.put(k,StringUtil.deleteForbiddenTags(v));\r
-        }\r
-        else if (k.equals("description")) {\r
-          String tmp = StringUtil.deleteForbiddenTags(v);\r
-          withValues.put(k,StringUtil.deleteHTMLTableTags(tmp));\r
-        }\r
-        else {\r
-          withValues.put(k,StringUtil.removeHTMLTags(v));\r
-        }\r
-\r
-      }\r
-\r
-      withValues.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));\r
-      withValues.put("publish_path", StringUtil.webdbDate2path((String)withValues.get("date")));\r
-      withValues.put("is_produced", "0");\r
-      withValues.put("is_published","1");\r
-      if (directOp.equals("yes"))\r
-        withValues.put("to_article_type","1");\r
-\r
-      withValues.put("to_publisher","1");\r
-\r
-      // inserting  content into database\r
-      String cid = contentModule.add(withValues);\r
-      logger.debug("id: "+cid);\r
-      //insert was not successfull\r
-      if(cid==null){\r
-\r
-        //How do we know that it was not succesful cause of a\r
-        //dupe, what if it failed cause of "No space left on device"?\r
-        //Or is there something I am missing? Wouldn't it be better\r
-        //to have an explicit dupe check and then insert? I have no\r
-        //idea what I am talking about. this comment is in case\r
-        //I forget to explicitely ask. -mh\r
-        deliver(req, res, mergeData, null, postingFormDupeTemplate);\r
-        return;\r
-      }\r
-\r
-      String[] to_topicsArr = mp.getParameterValues("to_topic");\r
-\r
-      if (to_topicsArr != null && to_topicsArr.length > 0) {\r
-        try{\r
-          DatabaseContentToTopics.getInstance().setTopics(cid,to_topicsArr);\r
-          setTopic = true;\r
-        }\r
-        catch (Throwable e) {\r
-          logger.error("setting content_x_topic failed");\r
-          contentModule.deleteById(cid);\r
-          throw new ServletModuleFailure("smod - openindy :: insposting: setting content_x_topic failed: "+e.toString(), e);\r
-        } //end try\r
-      } //end if\r
-\r
-      //if we're here all is ok... associate the media to the article\r
-      for(int i=0;i<mediaList.size();i++) {\r
-        Entity mediaEnt = (Entity)mediaList.elementAt(i);\r
-        DatabaseContentToMedia.getInstance().addMedia(cid,mediaEnt.getId());\r
-      }\r
-\r
-      EntityContent article = (EntityContent) contentModule.getById(cid);\r
-\r
-      try {\r
-        MirGlobal.abuse().checkArticle(article, req, res);\r
-        MirGlobal.localizer().openPostings().afterContentPosting(article);\r
-      }\r
-      catch (Throwable t) {\r
-        logger.error("Error while post-processing article: " + t.getMessage());\r
-      }\r
-    }\r
-    catch (Throwable e) {\r
-      Throwable cause = ExceptionFunctions.traceCauseException(e);\r
-\r
-      if (cause instanceof UnsupportedMediaFormatExc) {\r
-        throw new ServletModuleUserExc("media.unsupportedformat", new String[] {} );\r
-      }\r
-      throw new ServletModuleFailure(e);\r
-    }\r
-\r
-    deliver(req, res, mergeData, null, postingFormDoneTemplate);\r
-  }\r
-\r
-  /**\r
-   * Routine for innitiation tha d\r
-   *\r
-   * @param aRequest\r
-   * @param aResponse\r
-   * @throws ServletModuleExc\r
-   * @throws ServletModuleUserExc\r
-   * @throws ServletModuleFailure\r
-   */\r
-/*\r
-  public void comment(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-    try {\r
-      if (MirGlobal.abuse().getOpenPostingDisabled()) {\r
-        openPostingDisabled(aRequest, aResponse);\r
-\r
-        return;\r
-      }\r
-\r
-      Request request = new HTTPAdapters.HTTPParsedRequestAdapter(new HTTPParsedRequest(aRequest, 1000000, "/tmp"));\r
-      Session session = new HTTPAdapters.HTTPSessionAdapter(aRequest.getSession());\r
-      SimpleResponse response = new SimpleResponse(\r
-          ServletHelper.makeGenerationData(new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)}, "bundles.open"));\r
-\r
-      Iterator i = DatabaseContent.getInstance().getFields().iterator();\r
-      while (i.hasNext()) {\r
-        response.setResponseValue((String) i.next(), null);\r
-      }\r
-\r
-      MirGlobal.localizer().openPostings().initializeCommentPosting(request, session, response);\r
-\r
-      ServletHelper.generateOpenPostingResponse(aResponse.getWriter(), response.getResponseValues(), response.getResponseGenerator());\r
-    }\r
-    catch (Throwable t) {\r
-      t.printStackTrace(System.out);\r
-      System.out.println("comment: " + t.toString());\r
-      throw new ServletModuleFailure("ServletModuleOpenIndy.addcomment: " + t.getMessage(), t);\r
-    }\r
-  }\r
-\r
-  public void processcomment(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-    try {\r
-      if (MirGlobal.abuse().getOpenPostingDisabled()) {\r
-        openPostingDisabled(aRequest, aResponse);\r
-\r
-        return;\r
-      }\r
-\r
-      Request request = new HTTPAdapters.HTTPParsedRequestAdapter(new HTTPParsedRequest(aRequest, 1000000, "/tmp"));\r
-      Session session = new HTTPAdapters.HTTPSessionAdapter(aRequest.getSession());\r
-      SimpleResponse response = new SimpleResponse(\r
-          ServletHelper.makeGenerationData(new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)}, "bundles.open"));\r
-      Map commentFields = new HashMap();\r
-\r
-      Iterator i = DatabaseContent.getInstance().getFields().iterator();\r
-      while (i.hasNext()) {\r
-        String field = (String) i.next();\r
-        response.setResponseValue(field, request.getParameter(field));\r
-        if (request.getParameter(field)!=null) {\r
-          commentFields.put(field, request.getParameter(field));\r
-        }\r
-      }\r
-\r
-      List validationErrors = MirGlobal.localizer().openPostings().validateCommentPosting(request, session);\r
-\r
-      if (validationErrors != null && validationErrors.size()>0) {\r
-        MirGlobal.localizer().openPostings().processCommentPosting(request, session, response);\r
-\r
-        ServletHelper.generateOpenPostingResponse(aResponse.getWriter(), response.getResponseValues(), response.getResponseGenerator());\r
-      }\r
-      else {\r
-        EntityComment comment = (EntityComment) commentModule.createNew ();\r
-        comment.setValues(commentFields);\r
-        MirGlobal.abuse().checkComment(comment, aRequest, aResponse);\r
-        MirGlobal.localizer().openPostings().finishCommentPosting(request, session, comment);\r
-\r
-        String id = comment.insert();\r
-        if(id==null){\r
-          MirGlobal.localizer().openPostings().afterDuplicateCommentPosting(request, session, response, comment);\r
-\r
-          logger.info("Dupe comment rejected");\r
-\r
-          ServletHelper.generateOpenPostingResponse(aResponse.getWriter(), response.getResponseValues(), response.getResponseGenerator());\r
-        }\r
-        else {\r
-          // media\r
-          List mediaItems = new Vector();\r
-          i = request.getUploadedFiles().iterator();\r
-          while (i.hasNext()) {\r
-            UploadedFile file = (UploadedFile) i.next();\r
-            Entity mediaItem = MediaUploadProcessor.processMediaUpload(file);\r
-            DatabaseCommentToMedia.getInstance().addMedia(comment.getId(), mediaItem.getId());\r
-          }\r
-\r
-          MirGlobal.localizer().openPostings().afterCommentPosting(request, session, response, comment);\r
-\r
-          MirGlobal.abuse().logComment(aRequest.getRemoteAddr(), id, new Date(), (String) aRequest.getHeader("User-Agent"));\r
-          DatabaseContent.getInstance().setUnproduced("id=" + comment.getValue("to_media"));\r
-          logger.info("Comment posted");\r
-          ServletHelper.generateOpenPostingResponse(aResponse.getWriter(), response.getResponseValues(), response.getResponseGenerator());\r
-        }\r
-      }\r
-    }\r
-    catch (Throwable t) {\r
-      ExceptionFunctions.traceCauseException(t).printStackTrace();\r
-\r
-      throw new ServletModuleFailure("ServletModuleOpenIndy.addcomment: " + t.getMessage(), t);\r
-    }\r
-  }\r
-*/\r
-\r
-  private static final String SESSION_REQUEST_KEY="sessionid";\r
-\r
-  public void opensession(HttpServletRequest aRequest, HttpServletResponse aResponse)\r
-      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-\r
-    try {\r
-      Request request = new HTTPAdapters.HTTPParsedRequestAdapter(new HTTPParsedRequest(aRequest, 1000000, "/tmp"));\r
-\r
-      if (aRequest.isRequestedSessionIdValid() && !aRequest.isRequestedSessionIdFromURL() &&\r
-          !aRequest.getRequestedSessionId().equals(aRequest.getParameter(SESSION_REQUEST_KEY)))\r
-        aRequest.getSession().invalidate();\r
-\r
-      Session session = new HTTPAdapters.HTTPSessionAdapter(aRequest.getSession());\r
-\r
-      SimpleResponse response = new SimpleResponse(\r
-          ServletHelper.makeGenerationData(new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)},\r
-             "bundles.open"));\r
-\r
-      response.setResponseValue("actionURL", aResponse.encodeURL(HttpUtils.getRequestURL(aRequest).toString())+"?"+SESSION_REQUEST_KEY+"="+aRequest.getSession().getId());\r
-\r
-      SessionHandler handler = MirGlobal.localizer().openPostings().getOpenSessionHandler(request, session);\r
-\r
-      handler.processRequest(request, session, response);\r
-      ServletHelper.generateOpenPostingResponse(aResponse.getWriter(), response.getResponseValues(), response.getResponseGenerator());\r
-    }\r
-    catch (Throwable t) {\r
-      logger.error(t.toString());\r
-      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
-\r
-      throw new ServletModuleFailure(t);\r
-    }\r
-  }\r
-\r
-  /**\r
-   * Method for preparing and sending a content as an email message\r
-   */\r
-\r
-  public void mail(HttpServletRequest req, HttpServletResponse res)\r
-      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure\r
-  {\r
-    String aid = req.getParameter("mail_aid");\r
-    if (aid == null){\r
-      throw new ServletModuleExc("An article id must be specified in requests to email an article.  Something therefore went badly wrong....");\r
-    }\r
-\r
-    String to = req.getParameter("mail_to");\r
-    String from = req.getParameter("mail_from");\r
-    String from_name = req.getParameter("mail_from_name");\r
-    String comment = req.getParameter("mail_comment");\r
-    String mail_language = req.getParameter("mail_language");\r
-\r
-    Map mergeData = new HashMap();\r
-\r
-    if (to == null || from == null || from_name == null|| to.equals("") || from.equals("") || from_name.equals("") || mail_language == null || mail_language.equals("")){\r
-\r
-      for (Enumeration theParams = req.getParameterNames(); theParams.hasMoreElements() ;) {\r
-        String pName=(String)theParams.nextElement();\r
-        if (pName.startsWith("mail_")){\r
-          mergeData.put( pName,req.getParameter(pName) );\r
-        }\r
-      }\r
-\r
-      deliver(req, res, mergeData, null, prepareMailTemplate);\r
-    }\r
-    else {\r
-      //run checks on to and from and mail_language to make sure no monkey business occurring\r
-      if (mail_language.indexOf('.') != -1 || mail_language.indexOf('/') != -1 ) {\r
-        throw new ServletModuleExc("Invalid language");\r
-      }\r
-      if (to.indexOf('\n') != -1\r
-          || to.indexOf('\r') != -1\r
-          || to.indexOf(',') != -1) {\r
-        throw new ServletModuleUserExc("email.error.invalidtoaddress", new String[] {to});\r
-      }\r
-      if (from.indexOf('\n') != -1 || from.indexOf('\r') != -1 || from.indexOf(',') != -1 ) {\r
-        throw new ServletModuleUserExc("email.error.invalidfromaddress", new String[] {from});\r
-      }\r
-\r
-\r
-      EntityContent contentEnt;\r
-      try{\r
-        contentEnt = (EntityContent)contentModule.getById(aid);\r
-      }\r
-      catch (Throwable e){\r
-        throw new ServletModuleFailure("Couldn't get content for article "+aid + ": " + e.getMessage(), e);\r
-      }\r
-      String producerStorageRoot=configuration.getString("Producer.StorageRoot");\r
-      String producerDocRoot=configuration.getString("Producer.DocRoot");\r
-      String publishPath = contentEnt.getValue("publish_path");\r
-      String txtFilePath = producerStorageRoot + producerDocRoot + "/" + mail_language +\r
-                                                                                                         publishPath + "/" + aid + ".txt";\r
-\r
-\r
-      File inputFile = new File(txtFilePath);\r
-      String content;\r
-\r
-      try{\r
-        FileReader in = new FileReader(inputFile);\r
-        StringWriter out = new StringWriter();\r
-        int c;\r
-        while ((c = in.read()) != -1)\r
-          out.write(c);\r
-        in.close();\r
-        content= out.toString();\r
-      }\r
-      catch (FileNotFoundException e){\r
-        throw new ServletModuleFailure("No text file found in " + txtFilePath, e);\r
-      }\r
-      catch (IOException e){\r
-        throw new ServletModuleFailure("Problem reading file in " + txtFilePath, e);\r
-      }\r
-      // add some headers\r
-      content = "To: " + to + "\nReply-To: "+ from + "\n" + content;\r
-      // put in the comment where it should go\r
-      if (comment != null) {\r
-        String commentTextToInsert = "\n\nAttached comment from " + from_name + ":\n" + comment;\r
-        try {\r
-          content=StringRoutines.performRegularExpressionReplacement(content,"!COMMENT!",commentTextToInsert);\r
-        }\r
-        catch (Throwable e){\r
-          throw new ServletModuleFailure("Problem doing regular expression replacement " + e.toString(), e);\r
-        }\r
-      }\r
-      else{\r
-        try {\r
-          content=StringRoutines.performRegularExpressionReplacement(content,"!COMMENT!","");\r
-        }\r
-        catch (Throwable e){\r
-          throw new ServletModuleFailure("Problem doing regular expression replacement " + e.toString(), e);\r
-        }\r
-      }\r
-\r
-      SMTPClient client=new SMTPClient();\r
-      try {\r
-        int reply;\r
-        client.connect(configuration.getString("ServletModule.OpenIndy.SMTPServer"));\r
-\r
-        reply = client.getReplyCode();\r
-\r
-        if (!SMTPReply.isPositiveCompletion(reply)) {\r
-          client.disconnect();\r
-          throw new ServletModuleExc("SMTP server refused connection.");\r
-        }\r
-\r
-        client.sendSimpleMessage(configuration.getString("ServletModule.OpenIndy.EmailIsFrom"), to, content);\r
-\r
-        client.disconnect();\r
-        //mission accomplished\r
-        deliver(req, res, mergeData, null, sentMailTemplate);\r
-      }\r
-      catch(IOException e) {\r
-        if(client.isConnected()) {\r
-          try {\r
-            client.disconnect();\r
-          } catch(IOException f) {\r
-            // do nothing\r
-          }\r
-        }\r
-        throw new ServletModuleFailure(e);\r
-      }\r
-    }\r
-  }\r
-\r
-\r
-\r
-  /**\r
-   * Method for querying a lucene index\r
-   *\r
-   * @param req\r
-   * @param res\r
-   * @throws ServletModuleExc\r
-   * @throws ServletModuleUserExc\r
-   * @throws ServletModuleFailure\r
-   */\r
-\r
-  public void search(HttpServletRequest req, HttpServletResponse res)\r
-      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-    try {\r
-      final String[] search_variables = { "search_content", "search_boolean", "search_creator",\r
-          "search_topic", "search_hasImages", "search_hasAudio", "search_hasVideo", "search_sort",\r
-          "search_submit", "search_back", "search_forward" };\r
-      HTTPRequestParser requestParser = new HTTPRequestParser(req);\r
-\r
-      int increment=10;\r
-\r
-      HttpSession session = req.getSession(false);\r
-\r
-      String queryString="";\r
-\r
-      Map mergeData = new HashMap();\r
-\r
-      KeywordSearchTerm dateTerm = new KeywordSearchTerm("date_formatted","search_date","webdb_create_formatted","webdb_create_formatted","webdb_create_formatted");\r
-      UnIndexedSearchTerm whereTerm = new UnIndexedSearchTerm("","","","where","where");\r
-      TextSearchTerm creatorTerm = new TextSearchTerm("creator","search_creator","creator","creator","creator");\r
-      TextSearchTerm titleTerm = new TextSearchTerm("title","search_content","title","title","title");\r
-      TextSearchTerm descriptionTerm =  new TextSearchTerm("description","search_content","description","description","description");\r
-      ContentSearchTerm contentTerm = new ContentSearchTerm("content_data","search_content","content","","");\r
-      TopicSearchTerm topicTerm = new TopicSearchTerm();\r
-      ImagesSearchTerm imagesTerm = new ImagesSearchTerm();\r
-      AudioSearchTerm audioTerm = new AudioSearchTerm();\r
-      VideoSearchTerm videoTerm = new VideoSearchTerm();\r
-      MediaSearchTerm mediaTerm = new MediaSearchTerm();\r
-      \r
-      //make the query available to subsequent iterations\r
-\r
-      Iterator j = Arrays.asList(search_variables).iterator();\r
-      while (j.hasNext()) {\r
-        String variable = (String) j.next();\r
-\r
-        mergeData.put(variable, requestParser.getParameter(variable));\r
-      }\r
-\r
-      try{\r
-        mergeData.put("topics", topicsModule.getTopicsAsSimpleList());\r
-      }\r
-      catch(Throwable e) {\r
-        logger.debug("Can't get topics: " + e.toString());\r
-      }\r
-\r
-      String searchBackValue = req.getParameter("search_back");\r
-      String searchForwardValue = req.getParameter("search_forward");\r
-\r
-      if (searchBackValue != null){\r
-        int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();\r
-        int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()-increment;\r
-        if (newPosition<0)\r
-          newPosition=0;\r
-        if (newPosition >= totalHits)\r
-          newPosition=totalHits-1;\r
-        session.setAttribute("positionInResults",new Integer(newPosition));\r
-      }\r
-      else {\r
-        if (searchForwardValue != null){\r
-          int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();\r
-          int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()+increment;\r
-          if (newPosition<0)\r
-            newPosition=0;\r
-          if (newPosition >= totalHits)\r
-            newPosition=totalHits-1;\r
-\r
-          session.setAttribute("positionInResults",new Integer(newPosition));\r
-        }\r
-        else {\r
-          String indexPath=configuration.getString("IndexPath");\r
-\r
-\r
-          String creatorFragment = creatorTerm.makeTerm(req);\r
-          if (creatorFragment != null){\r
-            queryString = queryString + " +" + creatorFragment;\r
-          }\r
-\r
-          // search title, description, and content for something\r
-          // the contentTerm uses param "search_boolean" to combine its terms\r
-          String contentFragment = contentTerm.makeTerm(req);\r
-          if (contentFragment != null){\r
-            logger.debug("contentFragment: " + contentFragment);\r
-            queryString = queryString + " +" + contentFragment;\r
-          }\r
-\r
-          String topicFragment = topicTerm.makeTerm(req);\r
-          if (topicFragment != null){\r
-            queryString = queryString + " +" + topicFragment;\r
-          }\r
-\r
-          String imagesFragment = imagesTerm.makeTerm(req);\r
-          if (imagesFragment != null){\r
-            queryString = queryString + " +" + imagesFragment;\r
-          }\r
-\r
-          String audioFragment = audioTerm.makeTerm(req);\r
-          if (audioFragment != null){\r
-            queryString = queryString + " +" + audioFragment;\r
-          }\r
-\r
-          String videoFragment = videoTerm.makeTerm(req);\r
-          if (videoFragment != null){\r
-            queryString = queryString + " +" + videoFragment;\r
-          }\r
-\r
-          String mediaFragment = mediaTerm.makeTerm(req);\r
-          if (mediaFragment != null){\r
-            queryString = queryString + " +" + mediaFragment;\r
-          }\r
-\r
-          if (queryString == null || queryString == ""){\r
-            queryString = "";\r
-          }\r
-          else{\r
-            try{\r
-              Searcher searcher = null;\r
-              try {\r
-                searcher = new IndexSearcher(indexPath);\r
-              }\r
-              catch(IOException e) {\r
-                logger.debug("Can't open indexPath: " + indexPath);\r
-                throw new ServletModuleExc("Problem with Search Index! : "+ e.toString());\r
-              }\r
-\r
-              Query query = null;\r
-              try {\r
-                query = QueryParser.parse(queryString, "content", new StandardAnalyzer());\r
-              }\r
-              catch(Exception e) {\r
-                searcher.close();\r
-                logger.debug("Query don't parse: " + queryString);\r
-                throw new ServletModuleExc("Problem with Query String! (was '"+queryString+"')");\r
-              }\r
-\r
-              Hits hits = null;\r
-              try {\r
-                hits = searcher.search(query);\r
-              }\r
-              catch(IOException e) {\r
-                searcher.close();\r
-                logger.debug("Can't get hits: " + e.toString());\r
-                throw new ServletModuleExc("Problem getting hits!");\r
-              }\r
-\r
-              int start = 0;\r
-              int end = hits.length();\r
-\r
-              String sortBy=req.getParameter("search_sort");\r
-              if (sortBy == null || sortBy.equals("")){\r
-                throw new ServletModuleExc("Please let me sort by something!(missing search_sort)");\r
-              }\r
-\r
-              // here is where the documents will go for storage across sessions\r
-              ArrayList theDocumentsSorted = new ArrayList();\r
-\r
-              if (sortBy.equals("score")){\r
-                for(int i = start; i < end; i++) {\r
-                  theDocumentsSorted.add(hits.doc(i));\r
-                }\r
-              }\r
-              else{\r
-                // then we'll sort by date!\r
-                Map dateToPosition = new HashMap(end,1.0F); //we know how big it will be\r
-                for(int i = start; i < end; i++) {\r
-                  String creationDate=(hits.doc(i)).get("creationDate");\r
-                  // do a little dance in case two contents created at the same second!\r
-                  if (dateToPosition.containsKey(creationDate)){\r
-                    ((ArrayList) (dateToPosition.get(creationDate))).add(new Integer(i));\r
-                  }\r
-                  else{\r
-                    ArrayList thePositions = new ArrayList();\r
-                    thePositions.add(new Integer(i));\r
-                    dateToPosition.put(creationDate,thePositions);\r
-                  }\r
-                }\r
-                Set keys = dateToPosition.keySet();\r
-                ArrayList keyList= new ArrayList(keys);\r
-                Collections.sort(keyList);\r
-                if (sortBy.equals("date_desc")){\r
-                  Collections.reverse(keyList);\r
-                }\r
-                else{\r
-                  if (!sortBy.equals("date_asc")){\r
-                    throw new ServletModuleExc("don't know how to sort by: "+ sortBy);\r
-                  }\r
-                }\r
-                ListIterator keyTraverser = keyList.listIterator();\r
-                while (keyTraverser.hasNext()){\r
-                  ArrayList positions = (ArrayList)dateToPosition.get((keyTraverser.next()));\r
-                  ListIterator positionsTraverser=positions.listIterator();\r
-                  while (positionsTraverser.hasNext()){\r
-                    theDocumentsSorted.add(hits.doc(((Integer)(positionsTraverser.next())).intValue()));\r
-                  }\r
-                }\r
-              }\r
-\r
-              try{\r
-                searcher.close();\r
-              }\r
-              catch (IOException e){\r
-                logger.debug("Can't close searcher: " + e.toString());\r
-                throw new ServletModuleFailure("Problem closing searcher(normal):" + e.getMessage(), e);\r
-              }\r
-\r
-\r
-              session.removeAttribute("numberOfHits");\r
-              session.removeAttribute("theDocumentsSorted");\r
-              session.removeAttribute("positionInResults");\r
-\r
-              session.setAttribute("numberOfHits",new Integer(end));\r
-              session.setAttribute("theDocumentsSorted",theDocumentsSorted);\r
-              session.setAttribute("positionInResults",new Integer(0));\r
-\r
-            }\r
-            catch (IOException e){\r
-              logger.debug("Can't close searcher: " + e.toString());\r
-              throw new ServletModuleFailure("Problem closing searcher: " + e.getMessage(), e);\r
-            }\r
-          }\r
-        }\r
-      }\r
-\r
-      try {\r
-        ArrayList theDocs = (ArrayList)session.getAttribute("theDocumentsSorted");\r
-        if (theDocs != null){\r
-\r
-          mergeData.put("numberOfHits", ((Integer)session.getAttribute("numberOfHits")).toString());\r
-          List theHits = new Vector();\r
-          int pIR=((Integer)session.getAttribute("positionInResults")).intValue();\r
-          int terminus;\r
-          int numHits=((Integer)session.getAttribute("numberOfHits")).intValue();\r
-\r
-          if (!(pIR+increment>=numHits)){\r
-            mergeData.put("hasNext","y");\r
-          }\r
-          else {\r
-            mergeData.put("hasNext", null);\r
-          }\r
-          if (pIR>0){\r
-            mergeData.put("hasPrevious","y");\r
-          }\r
-          else {\r
-            mergeData.put("hasPrevious", null);\r
-          }\r
-\r
-          if ((pIR+increment)>numHits){\r
-            terminus=numHits;\r
-          }\r
-          else {\r
-            terminus=pIR+increment;\r
-          }\r
-          for(int i = pIR; i < terminus; i++) {\r
-            Map h = new HashMap();\r
-            Document theHit = (Document)theDocs.get(i);\r
-            whereTerm.returnMeta(h,theHit);\r
-            creatorTerm.returnMeta(h,theHit);\r
-            titleTerm.returnMeta(h,theHit);\r
-            descriptionTerm.returnMeta(h,theHit);\r
-            dateTerm.returnMeta(h,theHit);\r
-            imagesTerm.returnMeta(h,theHit);\r
-            audioTerm.returnMeta(h,theHit);\r
-            videoTerm.returnMeta(h,theHit);\r
-            theHits.add(h);\r
-          }\r
-          mergeData.put("hits",theHits);\r
-        }\r
-      }\r
-      catch (Throwable e) {\r
-        logger.error("Can't iterate over hits: " + e.toString());\r
-\r
-        throw new ServletModuleFailure("Problem getting hits: " + e.getMessage(), e);\r
-      }\r
-\r
-      mergeData.put("queryString",queryString);\r
-\r
-      deliver(req, res, mergeData, null, searchResultsTemplate);\r
-    }\r
-    catch (NullPointerException n){\r
-      throw new ServletModuleFailure("Null Pointer: "+n.toString(), n);\r
-    }\r
-  }\r
-\r
-  /*\r
-   * Method for dynamically generating a pdf using iText\r
-   */\r
-\r
-\r
-  public void getpdf(HttpServletRequest req, HttpServletResponse res)\r
-      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-    long starttime=System.currentTimeMillis();\r
-    String ID_REQUEST_PARAM = "id";\r
-    int maxArticlesInNewsleter = 15; // it is nice not to be dos'ed\r
-    try {\r
-        String idParam = req.getParameter(ID_REQUEST_PARAM);\r
-        if (idParam != null) {\r
-          \r
-\r
-          RE re = new RE("[0-9]+");\r
-         \r
-         \r
-          REMatch[] idMatches=re.getAllMatches(idParam);\r
-         \r
-         String cacheSelector="";\r
-         \r
-         for (int i = 0; i < idMatches.length; i++){\r
-           cacheSelector=   cacheSelector + "," + idMatches[i].toString();\r
-         }\r
-         \r
-         String cacheType="pdf";\r
-         \r
-         CacheKey theCacheKey = new CacheKey(cacheType,cacheSelector);\r
-         \r
-         byte[] thePDF;\r
-         \r
-         if (MirGlobal.mruCache().hasObject(theCacheKey)){\r
-           logger.info("fetching pdf from cache");\r
-           thePDF = (byte[]) MirGlobal.mruCache().getObject(theCacheKey);\r
-         }\r
-         else {\r
-           logger.info("generating pdf and caching it");\r
-           ByteArrayOutputStream out = new ByteArrayOutputStream();\r
-           PDFGenerator pdfMaker = new PDFGenerator(out);\r
-           \r
-           if (idMatches.length > 1){\r
-             pdfMaker.addLine();\r
-             for (int i = 0; i < idMatches.length  && i < maxArticlesInNewsleter; i++){\r
-               REMatch aMatch = idMatches[i];\r
-               String id=aMatch.toString();\r
-               EntityContent contentEnt = (EntityContent)contentModule.getById(id);\r
-               pdfMaker.addIndexItem(contentEnt);\r
-             }\r
-           }\r
-           \r
-           for (int i = 0; i < idMatches.length; i++){\r
-             REMatch aMatch = idMatches[i];\r
-             String id=aMatch.toString();\r
-             EntityContent contentEnt = (EntityContent)contentModule.getById(id);\r
-             \r
-             pdfMaker.add(contentEnt);\r
-           }\r
-           \r
-           pdfMaker.stop();\r
-           thePDF  = out.toByteArray();\r
-           \r
-           //and save all our hard work!\r
-           MirGlobal.mruCache().storeObject(theCacheKey,thePDF);\r
-         }\r
-         \r
-         res.setContentType("application/pdf");\r
-         res.setContentLength(thePDF.length);\r
-         res.getOutputStream().write(thePDF);\r
-         res.getOutputStream().flush();\r
-         String elapsedtime=(new Long(System.currentTimeMillis()-starttime)).toString();\r
-         logger.info("pdf retireval took "+elapsedtime + " milliseconds"  );\r
-\r
-        }\r
-        else {\r
-          throw new ServletModuleExc("Missing id.");\r
-        }\r
-    }\r
-    catch (Throwable t) {\r
-      logger.error(t.toString());\r
-      throw new ServletModuleFailure(t);\r
-    }\r
-\r
-  }\r
-\r
-\r
-  public String generateOnetimePassword() {\r
-    Random r = new Random();\r
-    int random = r.nextInt();\r
-\r
-    long l = System.currentTimeMillis();\r
-\r
-    l = (l * l * l * l) / random;\r
-    if (l < 0)\r
-      l = l * -1;\r
-\r
-    String returnString = "" + l;\r
-\r
-    return returnString.substring(5);\r
-  }\r
-\r
-  public void deliver(HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator)\r
-      throws ServletModuleFailure {\r
-    try {\r
-      deliver(aResponse.getWriter(), aRequest, aResponse, aData, anExtra, aGenerator);\r
-    }\r
-    catch (Throwable t) {\r
-      throw new ServletModuleFailure(t);\r
-    }\r
-  }\r
-\r
-  public void deliver(PrintWriter anOutputWriter, HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator)\r
-      throws ServletModuleFailure {\r
-    try {\r
-      Map responseData = ServletHelper.makeGenerationData(new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}, "bundles.open");\r
-      responseData.put("data", aData);\r
-      responseData.put("extra", anExtra);\r
-\r
-\r
-      Generator generator = MirGlobal.localizer().generators().makeOpenPostingGeneratorLibrary().makeGenerator(aGenerator);\r
-      generator.generate(anOutputWriter, responseData, logger.asPrintWriter(logger.INFO_MESSAGE));\r
-\r
-      anOutputWriter.close();\r
-    }\r
-    catch (Throwable e) {\r
-      logger.error("Error while generating " + aGenerator + ": " + e.getMessage());\r
-\r
-      throw new ServletModuleFailure(e);\r
-    }\r
-  }\r
-\r
-  public void handleError(HttpServletRequest aRequest, HttpServletResponse aResponse,PrintWriter out, Throwable anException) {\r
-    try {\r
-      logger.error("error: " + anException);\r
-      Map data = new HashMap();\r
-\r
-      data.put("errorstring", anException.getMessage());\r
-      data.put("date", StringUtil.date2readableDateTime(new GregorianCalendar()));\r
-\r
-      deliver(out, aRequest, aResponse, data, null, configuration.getString("ServletModule.OpenIndy.ErrorTemplate"));\r
-    }\r
-    catch (Throwable e) {\r
-      throw new ServletModuleFailure(e);\r
-    }\r
-  }\r
-\r
-  public void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse,\r
-                               PrintWriter out, ServletModuleUserExc anException) {\r
-    try {\r
-      logger.warn("user error: " + anException.getMessage());\r
-      Map data = new HashMap();\r
-\r
-      MessageResources messages = MessageResources.getMessageResources("bundles.open");\r
-      data.put("errorstring",\r
-              messages.getMessage(getLocale(aRequest), anException.getMessage(), anException.getParameters())\r
-          );\r
-      data.put("date", StringUtil.date2readableDateTime(new GregorianCalendar()));\r
-\r
-      deliver(out, aRequest, aResponse, data, null, configuration.getString("ServletModule.OpenIndy.UserErrorTemplate"));\r
-    }\r
-    catch (Throwable e) {\r
-      throw new ServletModuleFailure(e);\r
-    }\r
-  }\r
-\r
-  private String createOneTimePasswd() {\r
-    return "";\r
-  }\r
-}\r
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
+package mircoders.servlet;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.Vector;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUtils;
+
+import org.apache.commons.net.smtp.SMTPClient;
+import org.apache.commons.net.smtp.SMTPReply;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Searcher;
+import org.apache.struts.util.MessageResources;
+import org.apache.commons.fileupload.FileItem;
+import gnu.regexp.RE;
+import gnu.regexp.REMatch;
+import mir.entity.Entity;
+import mir.entity.EntityList;
+import mir.generator.Generator;
+import mir.log.LoggerWrapper;
+import mir.misc.FileHandler;
+import mir.misc.StringUtil;
+import mir.misc.WebdbMultipartRequest;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleFailure;
+import mir.servlet.ServletModuleUserExc;
+import mir.session.*;
+import mir.session.Request;
+import mir.session.Session;
+import mir.session.SessionHandler;
+import mir.session.SimpleResponse;
+import mir.storage.StorageObjectFailure;
+import mir.util.ExceptionFunctions;
+import mir.util.HTTPParsedRequest;
+import mir.util.HTTPRequestParser;
+import mir.util.*;
+import mircoders.entity.EntityComment;
+import mircoders.entity.EntityContent;
+import mircoders.global.MirGlobal;
+import mircoders.media.*;
+import mircoders.media.UnsupportedMediaFormatExc;
+import mircoders.module.ModuleComment;
+import mircoders.module.ModuleContent;
+import mircoders.module.ModuleImages;
+import mircoders.module.ModuleTopics;
+import mircoders.pdf.PDFGenerator;
+import mircoders.search.AudioSearchTerm;
+import mircoders.search.ContentSearchTerm;
+import mircoders.search.ImagesSearchTerm;
+import mircoders.search.KeywordSearchTerm;
+import mircoders.search.TextSearchTerm;
+import mircoders.search.TopicSearchTerm;
+import mircoders.search.UnIndexedSearchTerm;
+import mircoders.search.VideoSearchTerm;
+import mircoders.storage.DatabaseComment;
+import mircoders.storage.DatabaseContent;
+import mircoders.storage.DatabaseContentToMedia;
+import mircoders.storage.DatabaseContentToTopics;
+import mircoders.storage.DatabaseImages;
+import mircoders.storage.DatabaseLanguage;
+import mircoders.storage.DatabaseTopics;
+
+/*
+ *  ServletModuleOpenIndy -
+ *   is the open-access-servlet, which is responsible for
+ *    adding comments to articles &
+ *    open-postings to the newswire
+ *
+ * @author mir-coders group
+ * @version $Id: ServletModuleOpenIndy.java,v 1.78 2003/04/21 00:24:06 zapata Exp $
+ *
+ */
+
+public class ServletModuleOpenIndy extends ServletModule
+{
+
+  private String        commentFormTemplate, commentFormDoneTemplate, commentFormDupeTemplate;
+  private String        postingFormTemplate, postingFormDoneTemplate, postingFormDupeTemplate;
+  private String        searchResultsTemplate;
+  private String        prepareMailTemplate,sentMailTemplate;
+  private ModuleContent contentModule;
+  private ModuleComment commentModule;
+  private ModuleImages  imageModule;
+  private ModuleTopics  topicsModule;
+  private String        directOp ="yes";
+  // Singelton / Kontruktor
+  private static ServletModuleOpenIndy instance = new ServletModuleOpenIndy();
+  public static ServletModule getInstance() { return instance; }
+
+  private ServletModuleOpenIndy() {
+    super();
+    try {
+      logger = new LoggerWrapper("ServletModule.OpenIndy");
+
+      commentFormTemplate = configuration.getString("ServletModule.OpenIndy.CommentTemplate");
+      commentFormDoneTemplate = configuration.getString("ServletModule.OpenIndy.CommentDoneTemplate");
+      commentFormDupeTemplate = configuration.getString("ServletModule.OpenIndy.CommentDupeTemplate");
+
+      postingFormTemplate = configuration.getString("ServletModule.OpenIndy.PostingTemplate");
+      postingFormDoneTemplate = configuration.getString("ServletModule.OpenIndy.PostingDoneTemplate");
+      postingFormDupeTemplate = configuration.getString("ServletModule.OpenIndy.PostingDupeTemplate");
+
+      searchResultsTemplate = configuration.getString("ServletModule.OpenIndy.SearchResultsTemplate");
+      prepareMailTemplate = configuration.getString("ServletModule.OpenIndy.PrepareMailTemplate");
+      sentMailTemplate = configuration.getString("ServletModule.OpenIndy.SentMailTemplate");
+      directOp = configuration.getString("DirectOpenposting").toLowerCase();
+      commentModule = new ModuleComment(DatabaseComment.getInstance());
+      mainModule = commentModule;
+      contentModule = new ModuleContent(DatabaseContent.getInstance());
+      topicsModule = new ModuleTopics(DatabaseTopics.getInstance());
+      imageModule = new ModuleImages(DatabaseImages.getInstance());
+      defaultAction="addposting";
+    }
+    catch (StorageObjectFailure e) {
+      logger.error("servletmoduleopenindy could not be initialized: " + e.getMessage());
+    }
+  }
+
+  /**
+   * Method to return an "apology" when open postings are disabled
+   *
+   * @param aRequest
+   * @param aResponse
+   * @throws ServletModuleExc
+   * @throws ServletModuleUserExc
+   * @throws ServletModuleFailure
+   */
+  public void openPostingDisabled(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+    deliver(aRequest, aResponse, (Map) null, null,
+       configuration.getString("ServletModule.OpenIndy.PostingDisabledTemplate"));
+  }
+
+  /**
+   *  Method for making a comment
+   */
+
+  public void addcomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+    if (MirGlobal.abuse().getOpenPostingDisabled()) {
+      openPostingDisabled(req, res);
+
+      return;
+    }
+
+    String aid = req.getParameter("aid"); // the article id the comment will belong to
+
+    if (aid != null && !aid.equals("")) {
+      try {
+        Map mergeData = new HashMap();
+
+        // onetimepasswd
+        if (MirGlobal.abuse().getOpenPostingPassword()) {
+          String passwd = this.createOneTimePasswd();
+          HttpSession session = req.getSession(false);
+          session.setAttribute("passwd", passwd);
+          mergeData.put("passwd", passwd);
+        }
+        else {
+          mergeData.put("passwd", (String)null);
+        }
+        mergeData.put("aid", aid);
+
+        Map extraInfo = new HashMap();
+        extraInfo.put("languagePopUpData", DatabaseLanguage.getInstance().getPopupData());
+
+        deliver(req, res, mergeData, extraInfo, commentFormTemplate);
+      }
+      catch (Throwable t) {
+        throw new ServletModuleFailure("ServletModuleOpenIndy.addcomment: " + t.getMessage(), t);
+      }
+    }
+    else
+      throw new ServletModuleExc("aid not set!");
+  }
+
+  /**
+   *  Method for inserting a comment into the Database and delivering
+   *  the commentDone Page
+   */
+
+  public void inscomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+    if (MirGlobal.abuse().getOpenPostingDisabled()) {
+      openPostingDisabled(req, res);
+
+      return;
+    }
+
+    String aid = req.getParameter("to_media"); // the article id the comment will belong to
+    if (aid != null && !aid.equals("")) {
+      // ok, collecting data from form
+      try {
+        Map withValues = getIntersectingValues(req, DatabaseComment.getInstance());
+
+        //no html in comments(for now)
+        for (Iterator i = withValues.keySet().iterator(); i.hasNext(); ) {
+          String k = (String) i.next();
+          String v = (String) withValues.get(k);
+
+          withValues.put(k, StringUtil.removeHTMLTags(v));
+        }
+        withValues.put("is_published", "1");
+        withValues.put("to_comment_status", "1");
+        withValues.put("is_html", "0");
+
+        //checking the onetimepasswd
+        HttpSession session = req.getSession(false);
+        String sessionPasswd = (String) session.getAttribute("passwd");
+        if (sessionPasswd != null) {
+          String passwd = req.getParameter("passwd");
+          if (passwd == null || passwd.length() == 0) {
+            throw new ServletModuleUserExc("comment.error.missingpassword", new String[] {});
+          }
+          if (!sessionPasswd.equals(passwd)) {
+            throw new ServletModuleUserExc("comment.error.invalidpassword", new String[] {});
+          }
+          session.invalidate();
+        }
+
+        String id = mainModule.add(withValues);
+
+        SimpleResponse response = new SimpleResponse();
+        response.setResponseGenerator(commentFormDoneTemplate);
+
+        if (id == null) {
+          deliver(req, res, (Map)null, null, commentFormDupeTemplate);
+        }
+        else {
+          DatabaseContent.getInstance().setUnproduced("id=" + aid);
+
+          try {
+            EntityComment comment = (EntityComment) DatabaseComment.getInstance().selectById(id);
+            MirGlobal.localizer().openPostings().afterCommentPosting(comment);
+            MirGlobal.abuse().checkComment(
+                comment, new HTTPAdapters.HTTPRequestAdapter(req), res);
+          }
+          catch (Throwable t) {
+            throw new ServletModuleExc(t.getMessage());
+          }
+        }
+
+        // redirecting to url
+        // should implement back to article
+        deliver(req, res, response.getResponseValues(), null, response.getResponseGenerator());
+      }
+      catch (Throwable e) {
+        throw new ServletModuleFailure(e);
+      }
+    }
+    else
+      throw new ServletModuleExc("aid not set!");
+
+  }
+
+  /**
+   *  Method for delivering the form-Page for open posting
+   */
+
+  public void addposting(HttpServletRequest req, HttpServletResponse res)
+      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure
+  {
+    try {
+      if (MirGlobal.abuse().getOpenPostingDisabled()) {
+        openPostingDisabled(req, res);
+
+        return;
+      }
+
+      Map mergeData = new HashMap();
+
+      // onetimepasswd
+      if (MirGlobal.abuse().getOpenPostingPassword()) {
+        String passwd = generateOnetimePassword();
+        HttpSession session = req.getSession(false);
+        session.setAttribute("passwd", passwd);
+        mergeData.put("passwd", passwd);
+      }
+      else {
+        mergeData.put("passwd", (String)null);
+      }
+
+      String maxMedia = configuration.getString("ServletModule.OpenIndy.MaxMediaUploadItems");
+      String defaultMedia = configuration.getString("ServletModule.OpenIndy.DefaultMediaUploadItems");
+      String numOfMedia = req.getParameter("medianum");
+
+      if (numOfMedia == null || numOfMedia.equals("")) {
+        numOfMedia = defaultMedia;
+      }
+      else if (Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
+        numOfMedia = maxMedia;
+      }
+
+      int mediaNum = Integer.parseInt(numOfMedia);
+      List mediaFields = new Vector();
+      for (int i = 0; i < mediaNum; i++) {
+        Integer mNum = new Integer(i + 1);
+        mediaFields.add(mNum.toString());
+      }
+      mergeData.put("medianum", numOfMedia);
+      mergeData.put("mediafields", mediaFields);
+      mergeData.put("to_topic", null);
+
+      Map extraInfo = new HashMap();
+      extraInfo.put("languagePopUpData", DatabaseLanguage.getInstance().getPopupData());
+      extraInfo.put("themenPopupData", topicsModule.getTopicsAsSimpleList());
+
+      extraInfo.put("topics", topicsModule.getTopicsList());
+      deliver(req, res, mergeData, extraInfo, postingFormTemplate);
+    }
+    catch (Throwable t) {
+      throw new ServletModuleFailure(t);
+    }
+  }
+
+  /**
+   *  Method for inserting an open posting into the Database and delivering
+   *  the postingDone Page
+   */
+
+  public void insposting(HttpServletRequest aRequest, HttpServletResponse aResponse) throws
+      ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+    if (MirGlobal.abuse().getOpenPostingDisabled()) {
+      openPostingDisabled(aRequest, aResponse);
+
+      return;
+    }
+
+    try {
+      HTTPParsedRequest parsedRequest = new HTTPParsedRequest(
+          aRequest,
+          configuration.getString("Mir.DefaultEncoding"),
+          configuration.getInt("MaxMediaUploadSize"),
+          configuration.getString("TempDir"));
+
+      Map mergeData = new HashMap();
+
+      HttpSession session = aRequest.getSession(false);
+      String sessionPasswd = (String) session.getAttribute("passwd");
+      if (sessionPasswd != null) {
+        String passwd = (String) parsedRequest.getParameter("passwd");
+
+        if (passwd == null || passwd.length() == 0) {
+          throw new ServletModuleUserExc("posting.error.missingpassword", new String[] {});
+        }
+        if (!sessionPasswd.equals(passwd)) {
+          throw new ServletModuleUserExc("posting.error.invalidpassword", new String[] {});
+        }
+        session.invalidate();
+      }
+
+      if ((((String) parsedRequest.getParameter("title")).length() == 0) ||
+          (((String) parsedRequest.getParameter("description")).length() == 0) ||
+          (((String) parsedRequest.getParameter("content_data")).length() == 0))
+        throw new ServletModuleUserExc("posting.error.missingfield", new String[] {});
+
+      List mediaList = new Vector();
+      Iterator i = parsedRequest.getFiles().iterator();
+
+      while (i.hasNext()) {
+        UploadedFile file = new mir.session.CommonsUploadedFileAdapter((FileItem) i.next());
+        Map mediaValues = new HashMap();
+
+        String suffix = file.getFieldName().substring(5); // media${m}
+        logger.debug("media_title" + suffix);
+        String title = parsedRequest.getParameter("media_title" + suffix);
+
+        mediaValues.put("title", StringUtil.removeHTMLTags(title));
+        mediaValues.put("creator", StringUtil.removeHTMLTags(parsedRequest.getParameter("creator")));
+
+        mediaList.add(MediaUploadProcessor.processMediaUpload(file, mediaValues));
+      }
+
+      Map withValues = new HashMap();
+      i = DatabaseContent.getInstance().getFields().iterator();
+      while (i.hasNext()) {
+        String field = (String) i.next();
+        String value = parsedRequest.getParameter(field);
+        if (value!=null)
+          withValues.put(field, value);
+      }
+
+
+      for (i = withValues.keySet().iterator(); i.hasNext(); ) {
+        String k = (String) i.next();
+        String v = (String) withValues.get(k);
+
+        if (k.equals("content_data")) {
+          //this doesn't quite work yet, so for now, all html goes
+          //withValues.put(k,StringUtil.approveHTMLTags(v));
+          withValues.put(k, StringUtil.deleteForbiddenTags(v));
+        }
+        else if (k.equals("description")) {
+          String tmp = StringUtil.deleteForbiddenTags(v);
+          withValues.put(k, StringUtil.deleteHTMLTableTags(tmp));
+        }
+        else {
+          withValues.put(k, StringUtil.removeHTMLTags(v));
+        }
+      }
+
+      withValues.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
+      withValues.put("publish_path",
+                     StringUtil.webdbDate2path( (String) withValues.get("date")));
+      withValues.put("is_produced", "0");
+      withValues.put("is_published", "1");
+      if (directOp.equals("yes"))
+        withValues.put("to_article_type", "1");
+
+      withValues.put("to_publisher", "1");
+
+      // inserting  content into database
+      String cid = contentModule.add(withValues);
+      logger.debug("id: " + cid);
+      //insert was not successfull
+      if (cid == null) {
+        deliver(aRequest, aResponse, mergeData, null, postingFormDupeTemplate);
+        return;
+      }
+
+      List topics = parsedRequest.getParameterList("to_topic");
+      if (topics.size() > 0) {
+        try {
+          DatabaseContentToTopics.getInstance().setTopics(cid, topics);
+        }
+        catch (Throwable e) {
+          logger.error("setting content_x_topic failed");
+          contentModule.deleteById(cid);
+          throw new ServletModuleFailure(
+              "smod - openindy :: insposting: setting content_x_topic failed: " +
+              e.toString(), e);
+        }
+      }
+
+      i = mediaList.iterator();
+      while (i.hasNext()) {
+        Entity mediaEnt = (Entity) i.next();
+        DatabaseContentToMedia.getInstance().addMedia(cid, mediaEnt.getId());
+      }
+
+      EntityContent article = (EntityContent) contentModule.getById(cid);
+      try {
+        MirGlobal.abuse().checkArticle(article, aRequest, aResponse);
+        MirGlobal.localizer().openPostings().afterContentPosting(article);
+      }
+      catch (Throwable t) {
+        logger.error("Error while post-processing article: " + t.getMessage());
+      }
+      deliver(aRequest, aResponse, mergeData, null, postingFormDoneTemplate);
+    }
+    catch (Throwable e) {
+      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
+      Throwable cause = ExceptionFunctions.traceCauseException(e);
+
+      if (cause instanceof UnsupportedMediaFormatExc) {
+        throw new ServletModuleUserExc("media.unsupportedformat", new String[] {});
+      }
+      throw new ServletModuleFailure(e);
+    }
+  }
+
+  /**
+   * Due to a serious shortcoming of Tomcat 3.3, an extra sessionid parameter is
+   *   generated into open session urls. Tomcat 3.3 makes it impossible to
+   *   distinguish between sessions that are identified using a url and those
+   *   that are identified using cookies: if both a sessionid cookie and a sessionid
+   *   url are available, tomcat 3.3 pretends the url wasn't there...
+   */
+  private static final String SESSION_REQUEST_KEY="sessionid";
+
+  /**
+   * Dispatch method for open sessions: a flexible extensible and customizable way
+   *   for open access. Can be used for postings, but also for lots of other stuff.
+   *
+   * @param aRequest
+   * @param aResponse
+   * @throws ServletModuleExc
+   * @throws ServletModuleUserExc
+   * @throws ServletModuleFailure
+   */
+
+  public void opensession(HttpServletRequest aRequest, HttpServletResponse aResponse)
+      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+
+    try {
+      Request request = new HTTPAdapters.HTTPParsedRequestAdapter(new HTTPParsedRequest(aRequest, 1000000, "/tmp"));
+
+      if (aRequest.isRequestedSessionIdValid() && !aRequest.isRequestedSessionIdFromURL() &&
+          !aRequest.getRequestedSessionId().equals(aRequest.getParameter(SESSION_REQUEST_KEY)))
+        aRequest.getSession().invalidate();
+
+      Session session = new HTTPAdapters.HTTPSessionAdapter(aRequest.getSession());
+
+      SimpleResponse response = new SimpleResponse(
+          ServletHelper.makeGenerationData(new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)},
+             "bundles.open"));
+
+      response.setResponseValue("actionURL", aResponse.encodeURL(HttpUtils.getRequestURL(aRequest).toString())+"?"+SESSION_REQUEST_KEY+"="+aRequest.getSession().getId());
+
+      SessionHandler handler = MirGlobal.localizer().openPostings().getOpenSessionHandler(request, session);
+
+      handler.processRequest(request, session, response);
+      ServletHelper.generateOpenPostingResponse(aResponse.getWriter(), response.getResponseValues(), response.getResponseGenerator());
+    }
+    catch (Throwable t) {
+      logger.error(t.toString());
+      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
+
+      throw new ServletModuleFailure(t);
+    }
+  }
+
+  /**
+   * Method for preparing and sending a content as an email message
+   */
+
+  public void mail(HttpServletRequest req, HttpServletResponse res)
+      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure
+  {
+    String aid = req.getParameter("mail_aid");
+    if (aid == null){
+      throw new ServletModuleExc("An article id must be specified in requests to email an article.  Something therefore went badly wrong....");
+    }
+
+    String to = req.getParameter("mail_to");
+    String from = req.getParameter("mail_from");
+    String from_name = req.getParameter("mail_from_name");
+    String comment = req.getParameter("mail_comment");
+    String mail_language = req.getParameter("mail_language");
+
+    Map mergeData = new HashMap();
+
+    if (to == null || from == null || from_name == null|| to.equals("") || from.equals("") || from_name.equals("") || mail_language == null || mail_language.equals("")){
+
+      for (Enumeration theParams = req.getParameterNames(); theParams.hasMoreElements() ;) {
+        String pName=(String)theParams.nextElement();
+        if (pName.startsWith("mail_")){
+          mergeData.put( pName,req.getParameter(pName) );
+        }
+      }
+
+      deliver(req, res, mergeData, null, prepareMailTemplate);
+    }
+    else {
+      //run checks on to and from and mail_language to make sure no monkey business occurring
+      if (mail_language.indexOf('.') != -1 || mail_language.indexOf('/') != -1 ) {
+        throw new ServletModuleExc("Invalid language");
+      }
+      if (to.indexOf('\n') != -1
+          || to.indexOf('\r') != -1
+          || to.indexOf(',') != -1) {
+        throw new ServletModuleUserExc("email.error.invalidtoaddress", new String[] {to});
+      }
+      if (from.indexOf('\n') != -1 || from.indexOf('\r') != -1 || from.indexOf(',') != -1 ) {
+        throw new ServletModuleUserExc("email.error.invalidfromaddress", new String[] {from});
+      }
+
+
+      EntityContent contentEnt;
+      try{
+        contentEnt = (EntityContent)contentModule.getById(aid);
+      }
+      catch (Throwable e){
+        throw new ServletModuleFailure("Couldn't get content for article "+aid + ": " + e.getMessage(), e);
+      }
+      String producerStorageRoot=configuration.getString("Producer.StorageRoot");
+      String producerDocRoot=configuration.getString("Producer.DocRoot");
+      String publishPath = contentEnt.getValue("publish_path");
+      String txtFilePath = producerStorageRoot + producerDocRoot + "/" + mail_language +
+                                                                                                         publishPath + "/" + aid + ".txt";
+
+
+      File inputFile = new File(txtFilePath);
+      String content;
+
+      try{
+        FileReader in = new FileReader(inputFile);
+        StringWriter out = new StringWriter();
+        int c;
+        while ((c = in.read()) != -1)
+          out.write(c);
+        in.close();
+        content= out.toString();
+      }
+      catch (FileNotFoundException e){
+        throw new ServletModuleFailure("No text file found in " + txtFilePath, e);
+      }
+      catch (IOException e){
+        throw new ServletModuleFailure("Problem reading file in " + txtFilePath, e);
+      }
+      // add some headers
+      content = "To: " + to + "\nReply-To: "+ from + "\n" + content;
+      // put in the comment where it should go
+      if (comment != null) {
+        String commentTextToInsert = "\n\nAttached comment from " + from_name + ":\n" + comment;
+        try {
+          content=StringRoutines.performRegularExpressionReplacement(content,"!COMMENT!",commentTextToInsert);
+        }
+        catch (Throwable e){
+          throw new ServletModuleFailure("Problem doing regular expression replacement " + e.toString(), e);
+        }
+      }
+      else{
+        try {
+          content=StringRoutines.performRegularExpressionReplacement(content,"!COMMENT!","");
+        }
+        catch (Throwable e){
+          throw new ServletModuleFailure("Problem doing regular expression replacement " + e.toString(), e);
+        }
+      }
+
+      SMTPClient client=new SMTPClient();
+      try {
+        int reply;
+        client.connect(configuration.getString("ServletModule.OpenIndy.SMTPServer"));
+
+        reply = client.getReplyCode();
+
+        if (!SMTPReply.isPositiveCompletion(reply)) {
+          client.disconnect();
+          throw new ServletModuleExc("SMTP server refused connection.");
+        }
+
+        client.sendSimpleMessage(configuration.getString("ServletModule.OpenIndy.EmailIsFrom"), to, content);
+
+        client.disconnect();
+        //mission accomplished
+        deliver(req, res, mergeData, null, sentMailTemplate);
+      }
+      catch(IOException e) {
+        if(client.isConnected()) {
+          try {
+            client.disconnect();
+          } catch(IOException f) {
+            // do nothing
+          }
+        }
+        throw new ServletModuleFailure(e);
+      }
+    }
+  }
+
+
+
+
+    /**
+     * Method for querying a lucene index
+     *
+     * @param req
+     * @param res
+     * @throws ServletModuleExc
+     * @throws ServletModuleUserExc
+     * @throws ServletModuleFailure
+     */
+
+    public void search(HttpServletRequest req, HttpServletResponse res)
+        throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+      try {
+        final String[] search_variables = { "search_content", "search_boolean", "search_creator",
+            "search_topic", "search_hasImages", "search_hasAudio", "search_hasVideo", "search_sort",
+            "search_submit", "search_back", "search_forward" };
+        HTTPRequestParser requestParser = new HTTPRequestParser(req);
+
+        int increment=10;
+
+        HttpSession session = req.getSession(false);
+
+        String queryString="";
+
+        Map mergeData = new HashMap();
+
+        KeywordSearchTerm dateTerm = new KeywordSearchTerm("date_formatted","search_date","webdb_create_formatted","webdb_create_formatted","webdb_create_formatted");
+        UnIndexedSearchTerm whereTerm = new UnIndexedSearchTerm("","","","where","where");
+        TextSearchTerm creatorTerm = new TextSearchTerm("creator","search_creator","creator","creator","creator");
+        TextSearchTerm titleTerm = new TextSearchTerm("title","search_content","title","title","title");
+        TextSearchTerm descriptionTerm =  new TextSearchTerm("description","search_content","description","description","description");
+        ContentSearchTerm contentTerm = new ContentSearchTerm("content_data","search_content","content","","");
+        TopicSearchTerm topicTerm = new TopicSearchTerm();
+        ImagesSearchTerm imagesTerm = new ImagesSearchTerm();
+        AudioSearchTerm audioTerm = new AudioSearchTerm();
+        VideoSearchTerm videoTerm = new VideoSearchTerm();
+
+        //make the query available to subsequent iterations
+
+        Iterator j = Arrays.asList(search_variables).iterator();
+        while (j.hasNext()) {
+          String variable = (String) j.next();
+
+          mergeData.put(variable, requestParser.getParameter(variable));
+        }
+
+        try{
+          mergeData.put("topics", topicsModule.getTopicsAsSimpleList());
+        }
+        catch(Throwable e) {
+          logger.debug("Can't get topics: " + e.toString());
+        }
+
+        String searchBackValue = req.getParameter("search_back");
+        String searchForwardValue = req.getParameter("search_forward");
+
+        if (searchBackValue != null){
+          int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
+          int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()-increment;
+          if (newPosition<0)
+            newPosition=0;
+          if (newPosition >= totalHits)
+            newPosition=totalHits-1;
+          session.setAttribute("positionInResults",new Integer(newPosition));
+        }
+        else {
+          if (searchForwardValue != null){
+            int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
+            int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()+increment;
+            if (newPosition<0)
+              newPosition=0;
+            if (newPosition >= totalHits)
+              newPosition=totalHits-1;
+
+            session.setAttribute("positionInResults",new Integer(newPosition));
+          }
+          else {
+            String indexPath=configuration.getString("IndexPath");
+
+
+            String creatorFragment = creatorTerm.makeTerm(req);
+            if (creatorFragment != null){
+              queryString = queryString + " +" + creatorFragment;
+            }
+
+            // search title, description, and content for something
+            // the contentTerm uses param "search_boolean" to combine its terms
+            String contentFragment = contentTerm.makeTerm(req);
+            if (contentFragment != null){
+              logger.debug("contentFragment: " + contentFragment);
+              queryString = queryString + " +" + contentFragment;
+            }
+
+            String topicFragment = topicTerm.makeTerm(req);
+            if (topicFragment != null){
+              queryString = queryString + " +" + topicFragment;
+            }
+
+            String imagesFragment = imagesTerm.makeTerm(req);
+            if (imagesFragment != null){
+              queryString = queryString + " +" + imagesFragment;
+            }
+
+            String audioFragment = audioTerm.makeTerm(req);
+            if (audioFragment != null){
+              queryString = queryString + " +" + audioFragment;
+            }
+
+            String videoFragment = videoTerm.makeTerm(req);
+            if (videoFragment != null){
+              queryString = queryString + " +" + videoFragment;
+            }
+
+            if (queryString == null || queryString == ""){
+              queryString = "";
+            }
+            else{
+              try{
+                Searcher searcher = null;
+                try {
+                  searcher = new IndexSearcher(indexPath);
+                }
+                catch(IOException e) {
+                  logger.debug("Can't open indexPath: " + indexPath);
+                  throw new ServletModuleExc("Problem with Search Index! : "+ e.toString());
+                }
+
+                Query query = null;
+                try {
+                  query = QueryParser.parse(queryString, "content", new StandardAnalyzer());
+                }
+                catch(Exception e) {
+                  searcher.close();
+                  logger.debug("Query don't parse: " + queryString);
+                  throw new ServletModuleExc("Problem with Query String! (was '"+queryString+"')");
+                }
+
+                Hits hits = null;
+                try {
+                  hits = searcher.search(query);
+                }
+                catch(IOException e) {
+                  searcher.close();
+                  logger.debug("Can't get hits: " + e.toString());
+                  throw new ServletModuleExc("Problem getting hits!");
+                }
+
+                int start = 0;
+                int end = hits.length();
+
+                String sortBy=req.getParameter("search_sort");
+                if (sortBy == null || sortBy.equals("")){
+                  throw new ServletModuleExc("Please let me sort by something!(missing search_sort)");
+                }
+
+                // here is where the documents will go for storage across sessions
+                ArrayList theDocumentsSorted = new ArrayList();
+
+                if (sortBy.equals("score")){
+                  for(int i = start; i < end; i++) {
+                    theDocumentsSorted.add(hits.doc(i));
+                  }
+                }
+                else{
+                  // then we'll sort by date!
+                  Map dateToPosition = new HashMap(end,1.0F); //we know how big it will be
+                  for(int i = start; i < end; i++) {
+                    String creationDate=(hits.doc(i)).get("creationDate");
+                    // do a little dance in case two contents created at the same second!
+                    if (dateToPosition.containsKey(creationDate)){
+                      ((ArrayList) (dateToPosition.get(creationDate))).add(new Integer(i));
+                    }
+                    else{
+                      ArrayList thePositions = new ArrayList();
+                      thePositions.add(new Integer(i));
+                      dateToPosition.put(creationDate,thePositions);
+                    }
+                  }
+                  Set keys = dateToPosition.keySet();
+                  ArrayList keyList= new ArrayList(keys);
+                  Collections.sort(keyList);
+                  if (sortBy.equals("date_desc")){
+                    Collections.reverse(keyList);
+                  }
+                  else{
+                    if (!sortBy.equals("date_asc")){
+                      throw new ServletModuleExc("don't know how to sort by: "+ sortBy);
+                    }
+                  }
+                  ListIterator keyTraverser = keyList.listIterator();
+                  while (keyTraverser.hasNext()){
+                    ArrayList positions = (ArrayList)dateToPosition.get((keyTraverser.next()));
+                    ListIterator positionsTraverser=positions.listIterator();
+                    while (positionsTraverser.hasNext()){
+                      theDocumentsSorted.add(hits.doc(((Integer)(positionsTraverser.next())).intValue()));
+                    }
+                  }
+                }
+
+                try{
+                  searcher.close();
+                }
+                catch (IOException e){
+                  logger.debug("Can't close searcher: " + e.toString());
+                  throw new ServletModuleFailure("Problem closing searcher(normal):" + e.getMessage(), e);
+                }
+
+
+                session.removeAttribute("numberOfHits");
+                session.removeAttribute("theDocumentsSorted");
+                session.removeAttribute("positionInResults");
+
+                session.setAttribute("numberOfHits",new Integer(end));
+                session.setAttribute("theDocumentsSorted",theDocumentsSorted);
+                session.setAttribute("positionInResults",new Integer(0));
+
+              }
+              catch (IOException e){
+                logger.debug("Can't close searcher: " + e.toString());
+                throw new ServletModuleFailure("Problem closing searcher: " + e.getMessage(), e);
+              }
+            }
+          }
+        }
+
+        try {
+          ArrayList theDocs = (ArrayList)session.getAttribute("theDocumentsSorted");
+          if (theDocs != null){
+
+            mergeData.put("numberOfHits", ((Integer)session.getAttribute("numberOfHits")).toString());
+            List theHits = new Vector();
+            int pIR=((Integer)session.getAttribute("positionInResults")).intValue();
+            int terminus;
+            int numHits=((Integer)session.getAttribute("numberOfHits")).intValue();
+
+            if (!(pIR+increment>=numHits)){
+              mergeData.put("hasNext","y");
+            }
+            else {
+              mergeData.put("hasNext", null);
+            }
+            if (pIR>0){
+              mergeData.put("hasPrevious","y");
+            }
+            else {
+              mergeData.put("hasPrevious", null);
+            }
+
+            if ((pIR+increment)>numHits){
+              terminus=numHits;
+            }
+            else {
+              terminus=pIR+increment;
+            }
+            for(int i = pIR; i < terminus; i++) {
+              Map h = new HashMap();
+              Document theHit = (Document)theDocs.get(i);
+              whereTerm.returnMeta(h,theHit);
+              creatorTerm.returnMeta(h,theHit);
+              titleTerm.returnMeta(h,theHit);
+              descriptionTerm.returnMeta(h,theHit);
+              dateTerm.returnMeta(h,theHit);
+              imagesTerm.returnMeta(h,theHit);
+              audioTerm.returnMeta(h,theHit);
+              videoTerm.returnMeta(h,theHit);
+              theHits.add(h);
+            }
+            mergeData.put("hits",theHits);
+          }
+        }
+        catch (Throwable e) {
+          logger.error("Can't iterate over hits: " + e.toString());
+
+          throw new ServletModuleFailure("Problem getting hits: " + e.getMessage(), e);
+        }
+
+        mergeData.put("queryString",queryString);
+
+        deliver(req, res, mergeData, null, searchResultsTemplate);
+      }
+      catch (NullPointerException n){
+        throw new ServletModuleFailure("Null Pointer: "+n.toString(), n);
+      }
+    }
+
+    /*
+     * Method for dynamically generating a pdf using iText
+     */
+
+
+    public void getpdf(HttpServletRequest req, HttpServletResponse res)
+        throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+      String ID_REQUEST_PARAM = "id";
+      try {
+          String idParam = req.getParameter(ID_REQUEST_PARAM);
+          if (idParam != null) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            PDFGenerator pdfMaker = new PDFGenerator(out);
+
+            RE re = new RE("[0-9]+");
+
+
+            REMatch[] idMatches=re.getAllMatches(idParam);
+
+            if (idMatches.length > 1){
+              pdfMaker.addLine();
+              for (int i = 0; i < idMatches.length; i++){
+                REMatch aMatch = idMatches[i];
+                String id=aMatch.toString();
+                EntityContent contentEnt = (EntityContent)contentModule.getById(id);
+                pdfMaker.addIndexItem(contentEnt);
+
+              }
+            }
+
+            for (int i = 0; i < idMatches.length; i++){
+              REMatch aMatch = idMatches[i];
+
+              String id=aMatch.toString();
+
+              EntityContent contentEnt = (EntityContent)contentModule.getById(id);
+              pdfMaker.add(contentEnt);
+
+            }
+
+            pdfMaker.stop();
+            res.setContentType("application/pdf");
+            byte[] content = out.toByteArray();
+            res.setContentLength(content.length);
+            res.getOutputStream().write(content);
+            res.getOutputStream().flush();
+
+          }
+          else {
+            throw new ServletModuleExc("Missing id.");
+          }
+      }
+      catch (Throwable t) {
+        logger.error(t.toString());
+        throw new ServletModuleFailure(t);
+      }
+
+    }
+  public String generateOnetimePassword() {
+    Random r = new Random();
+    int random = r.nextInt();
+
+    long l = System.currentTimeMillis();
+
+    l = (l * l * l * l) / random;
+    if (l < 0)
+      l = l * -1;
+
+    String returnString = "" + l;
+
+    return returnString.substring(5);
+  }
+
+  public void deliver(HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator)
+      throws ServletModuleFailure {
+    try {
+      deliver(aResponse.getWriter(), aRequest, aResponse, aData, anExtra, aGenerator);
+    }
+    catch (Throwable t) {
+      throw new ServletModuleFailure(t);
+    }
+  }
+
+  public void deliver(PrintWriter anOutputWriter, HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator)
+      throws ServletModuleFailure {
+    try {
+      Map responseData = ServletHelper.makeGenerationData(new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}, "bundles.open");
+      responseData.put("data", aData);
+      responseData.put("extra", anExtra);
+
+
+      Generator generator = MirGlobal.localizer().generators().makeOpenPostingGeneratorLibrary().makeGenerator(aGenerator);
+      generator.generate(anOutputWriter, responseData, logger);
+
+      anOutputWriter.close();
+    }
+    catch (Throwable e) {
+      logger.error("Error while generating " + aGenerator + ": " + e.getMessage());
+
+      throw new ServletModuleFailure(e);
+    }
+  }
+
+  public void handleError(HttpServletRequest aRequest, HttpServletResponse aResponse,PrintWriter out, Throwable anException) {
+    try {
+      logger.error("error: " + anException);
+      Map data = new HashMap();
+
+      data.put("errorstring", anException.getMessage());
+      data.put("date", StringUtil.date2readableDateTime(new GregorianCalendar()));
+
+      deliver(out, aRequest, aResponse, data, null, configuration.getString("ServletModule.OpenIndy.ErrorTemplate"));
+    }
+    catch (Throwable e) {
+      throw new ServletModuleFailure(e);
+    }
+  }
+
+  public void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse,
+                               PrintWriter out, ServletModuleUserExc anException) {
+    try {
+      logger.warn("user error: " + anException.getMessage());
+      Map data = new HashMap();
+
+      MessageResources messages = MessageResources.getMessageResources("bundles.open");
+      data.put("errorstring",
+              messages.getMessage(getLocale(aRequest), anException.getMessage(), anException.getParameters())
+          );
+      data.put("date", StringUtil.date2readableDateTime(new GregorianCalendar()));
+
+      deliver(out, aRequest, aResponse, data, null, configuration.getString("ServletModule.OpenIndy.UserErrorTemplate"));
+    }
+    catch (Throwable e) {
+      throw new ServletModuleFailure(e);
+    }
+  }
+
+  private String createOneTimePasswd() {
+    return "";
+  }
+}

diff --git a/source/mircoders/servlet/ServletModuleProducer.java b/source/mircoders/servlet/ServletModuleProducer.java
index c3d41eb..7956245 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleProducer.java
+++ b/source/mircoders/servlet/ServletModuleProducer.java
@@ -69,7 +69,7 @@ public class ServletModuleProducer extends ServletModule
       generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGeneratorIdentifier);
       MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(aResponseData);
       aResponseData.put( "lang", new ResourceBundleGeneratorFunction( aLocale, MessageResources.getMessageResources("bundles.admin")));
-      generator.generate(aWriter, aResponseData, new PrintWriter(new NullWriter()));
+      generator.generate(aWriter, aResponseData, logger);
     }
     catch (Throwable t) {
       throw new ServletModuleFailure(t);
@@ -135,7 +135,7 @@ public class ServletModuleProducer extends ServletModule
       generationData.put("producers", producersData);
 
       generationData.put("queue", MirGlobal.producerEngine().getQueueStatus());
-      generator.generate(aResponse.getWriter(), generationData, new PrintWriter(new NullWriter()));
+      generator.generate(aResponse.getWriter(), generationData, logger);
     }
     catch (Throwable t) {
       throw new ServletModuleFailure(t);

diff --git a/source/mircoders/storage/DatabaseContentToTopics.java b/source/mircoders/storage/DatabaseContentToTopics.java
index 9bf6560..fbf46e2 100755 (executable)
--- a/source/mircoders/storage/DatabaseContentToTopics.java
+++ b/source/mircoders/storage/DatabaseContentToTopics.java
@@ -35,8 +35,10 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
 
 import mir.entity.EntityList;
 import mir.log.LoggerWrapper;
@@ -104,7 +106,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{
    * Returns a ArrayList of Integer-Objects from a content-id.
    * @returns ArrayList
    */
-  public ArrayList getTopicsOfContent(String contentId)
+  public List getTopicsOfContent(String contentId)
     throws StorageObjectFailure {
     ArrayList returnList = new ArrayList();
 
@@ -132,104 +134,95 @@ public class DatabaseContentToTopics extends Database implements StorageObject{
     return returnList;
   }
 
-  /**
-   * Set new topics
-   */
-  public void setTopics(String contentId, String[] topicId)
-    throws StorageObjectFailure {
-    if (contentId == null){
-      return;
+  private String getIdListExpression(List aList) {
+    String result = "";
+
+    Iterator i = aList.iterator();
+
+    while (i.hasNext()) {
+      result = result + i.next().toString();
+      if (i.hasNext())
+        result = result + ", ";
     }
-    if (topicId==null || topicId[0]==null) {
-      return;
+    return result;
+  }
+
+  public void setTopics(String anArticleId, String [] aTopics) throws StorageObjectFailure {
+    if (aTopics==null)
+      setTopics(anArticleId, (List) null);
+    else
+      setTopics(anArticleId, Arrays.asList(aTopics));
+  }
+
+  public void setTopics(String anArticleId, List aTopics) throws StorageObjectFailure {
+    List newTopics = new Vector();
+    if (aTopics!=null) {
+      Iterator i = aTopics.iterator();
+
+      while (i.hasNext()) {
+        newTopics.add(new Integer(Integer.parseInt((String) i.next())));
+      }
     }
-    //first check which topics this article has
-    Collection hasTopics = getTopicsOfContent(contentId);
-    Collection toSet = new ArrayList();
-    Collection toDelete = new ArrayList();
-
-    if(hasTopics!=null && hasTopics.size()>0){
-      //now we check if there are new topics and copy them to an array.
-      for(int i = 0; i< topicId.length;i++){
-        boolean set=false;
-        int whichTopic = 0;
-        for(Iterator it=hasTopics.iterator();it.hasNext();){
-          Integer topic = (Integer)it.next();
-          if(topicId[i].equals(topic.toString())){
-            set=true;
-          } else {
-            whichTopic = i;
-          }
-        }
-        if(set==false){
-          toSet.add(topicId[i]);
-          logger.debug("to set: "+ topicId[i]);
-        }
+
+    List currentTopics = getTopicsOfContent(anArticleId);
+    logger.debug("New topics = " + newTopics.toString());
+    logger.debug("Current topics = " + currentTopics.toString());
+    List topicsToDelete = new Vector(currentTopics);
+    topicsToDelete.removeAll(newTopics);
+    List topicsToAdd = new Vector(newTopics);
+    topicsToAdd.removeAll(currentTopics);
+    logger.debug("to delete = " + topicsToDelete.toString());
+    logger.debug("to add = " + topicsToAdd.toString());
+
+
+    if (!topicsToDelete.isEmpty()) {
+      String sql =
+          "delete from " + theTable + " " +
+          "where content_id=" + anArticleId +
+          "        and topic_id in (" + getIdListExpression(topicsToDelete) + ")";
+
+      Connection connection=null;
+      Statement statement=null;
+      try {
+        connection = getPooledCon();
+        statement = connection.createStatement();
+        int rs = executeUpdate(statement, sql);
       }
-      //now we check if we have to delete topics
-      for(Iterator it=hasTopics.iterator();it.hasNext();){
-        boolean delete=true;
-        int whichTopic = 0;
-        Integer topic = (Integer)it.next();
-        for(int i = 0; i< topicId.length;i++){
-          if(topicId[i].equals(topic.toString())){
-            delete=false;
-          } else {
-            whichTopic = i;
-          }
+      catch (Exception e) {
+        logger.error("-- deleting topics failed");
+      }
+      finally {
+        try {
+          freeConnection(connection, statement);
         }
-        if(delete==true){
-          toDelete.add(topic.toString());
-          logger.debug("to delete: "+ topic.toString());
+        catch (Throwable t) {
         }
       }
-    } else {
-      //all the topics has to be set, so we copy all to the array
-                        for (int i = 0; i < topicId.length; i++){
-                                toSet.add(topicId[i]);
-                        }
-    }
-
-    //first delete all row with content_id=contentId
-    String sql = "delete from "+ theTable +" where content_id=" + contentId
-                + " and topic_id in (";
-    boolean first=false;
-    for(Iterator it = toDelete.iterator(); it.hasNext();){
-      if(first==false){
-        first=true;
-      } else {
-        sql+=",";
-      }
-      sql+= (String)it.next();
-    }
-    sql+=")";
-    Connection con=null;Statement stmt=null;
-    try {
-      con = getPooledCon();
-      // should be a preparedStatement because is faster
-      stmt = con.createStatement();
-      int rs = executeUpdate(stmt,sql);
-    } catch (Exception e) {
-      logger.error("-- deleting topics failed");
-    } finally {
-      freeConnection(con,stmt);
     }
 
-    //now insert
-    //first delete all row with content_id=contentId
-    for (Iterator it = toSet.iterator(); it.hasNext();) {
-      sql = "insert into "+ theTable +" (content_id,topic_id) values ("
-            + contentId + "," + (String)it.next() + ")";
+    Iterator i = topicsToAdd.iterator();
+    while (i.hasNext()) {
+      Integer topicId = (Integer) i.next();
+      String sql =
+          "insert into " + theTable + " (content_id, topic_id) "+
+          "values (" + anArticleId + "," + topicId + ")";
+      Connection connection=null;
+      Statement statement=null;
       try {
-        con = getPooledCon();
+        connection = getPooledCon();
         // should be a preparedStatement because is faster
-        stmt = con.createStatement();
-        int rs = executeUpdate(stmt,sql);
+        statement = connection.createStatement();
+        int rs = executeUpdate(statement, sql);
       }
       catch (Exception e) {
-        logger.error("-- set topics failed -- insert laenge topicId" + topicId.length);
-      } finally {
-        freeConnection(con,stmt);
+        logger.error("-- adding topics failed");
+      }
+      finally {
+        try {
+          freeConnection(connection, statement);
+        }
+        catch (Throwable t) {
+        }
       }
     }
   }