added better support for article urls in PDF files
[mir.git] / source / mircoders / servlet / ServletModuleOpenIndy.java
index f99eefc..6769e42 100755 (executable)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
  * 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.
+ * GNU General Public License for more details.f
  *
  * 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.
+ * the code of this program with  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.*;
-import java.lang.*;
-import java.sql.*;
-import java.util.*;
-import java.net.*;
-import java.lang.reflect.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import freemarker.template.*;
-import com.oreilly.servlet.multipart.*;
-import com.oreilly.servlet.*;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-import org.apache.fop.apps.Driver;
-import org.apache.fop.apps.Version;
-import org.apache.fop.apps.XSLTInputHandler;
-
+import gnu.regexp.RE;
+import gnu.regexp.REMatch;
+import mir.bundle.Bundle;
+import mir.generator.Generator;
+import mir.misc.StringUtil;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleFailure;
+import mir.servlet.ServletModuleUserExc;
+import mir.session.HTTPAdapters;
+import mir.session.Request;
+import mir.session.Session;
+import mir.session.SessionHandler;
+import mir.session.SimpleResponse;
+import mir.util.FileRoutines;
+import mir.util.HTTPParsedRequest;
+import mir.util.HTTPRequestParser;
+import mir.util.StringRoutines;
+import mir.module.ModuleExc;
+import mircoders.entity.EntityContent;
+import mircoders.global.CacheKey;
+import mircoders.global.MirGlobal;
+import mircoders.module.ModuleContent;
+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.TopicMatrixSearchTerm;
+import mircoders.search.TopicSearchTerm;
+import mircoders.search.UnIndexedSearchTerm;
+import mircoders.search.VideoSearchTerm;
+import mircoders.storage.DatabaseTopics;
+import mircoders.localizer.MirLocalizerExc;
+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.search.*;
 import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.analysis.standard.*;
-import org.apache.lucene.queryParser.*;
-
-import org.apache.log.*;
-
-import mir.servlet.*;
-import mir.module.*;
-import mir.misc.*;
-import mir.entity.*;
-import mir.storage.*;
-import mir.media.*;
-import mir.log.*;
-
-import mircoders.entity.*;
-import mircoders.storage.*;
-import mircoders.module.*;
-import mircoders.producer.*;
-import mircoders.media.MediaRequest;
-import mircoders.global.*;
-import mircoders.localizer.*;
-import mircoders.search.*;
+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.lucene.store.FSDirectory;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+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.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;
 
 /*
- *  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.47 2002/11/29 14:22:30 john Exp $
- *
  */
 
-public class ServletModuleOpenIndy extends ServletModule
-{
-
-  private String        commentFormTemplate, commentFormDoneTemplate,
-    commentFormDupeTemplate;
-  private String        postingFormTemplate, postingFormDoneTemplate,
-    postingFormDupeTemplate;
+public class ServletModuleOpenIndy extends ServletModule {
   private String        searchResultsTemplate;
+  private String        prepareMailTemplate,sentMailTemplate,emailAnArticleTemplate;
   private ModuleContent contentModule;
-  private ModuleComment commentModule;
-  private ModuleImages  imageModule;
-  private ModuleTopics  themenModule;
-  private String        directOp ="yes";
-  private String        passwdProtection ="yes";
-  // Singelton / Kontruktor
-  private static ServletModuleOpenIndy instance = new ServletModuleOpenIndy();
-  public static ServletModule getInstance() { return instance; }
-
-  private ServletModuleOpenIndy() {
-    try {
-      logger = new LoggerWrapper("ServletModule.OpenIndy.Logfile");
-      commentFormTemplate = MirConfig.getProp("ServletModule.OpenIndy.CommentTemplate");
-      commentFormDoneTemplate = MirConfig.getProp("ServletModule.OpenIndy.CommentDoneTemplate");
-      commentFormDupeTemplate = MirConfig.getProp("ServletModule.OpenIndy.CommentDupeTemplate");
-      postingFormTemplate = MirConfig.getProp("ServletModule.OpenIndy.PostingTemplate");
-      postingFormDoneTemplate = MirConfig.getProp("ServletModule.OpenIndy.PostingDoneTemplate");
-      postingFormDupeTemplate = MirConfig.getProp("ServletModule.OpenIndy.PostingDupeTemplate");
-      searchResultsTemplate = MirConfig.getProp("ServletModule.OpenIndy.SearchResultsTemplate");
-      directOp = MirConfig.getProp("DirectOpenposting").toLowerCase();
-      passwdProtection = MirConfig.getProp("PasswdProtection").toLowerCase();
-      mainModule = new ModuleComment(DatabaseComment.getInstance());
-      contentModule = new ModuleContent(DatabaseContent.getInstance());
-      themenModule = new ModuleTopics(DatabaseTopics.getInstance());
-      imageModule = new ModuleImages(DatabaseImages.getInstance());
-      defaultAction="addposting";
 
-    }
-    catch (StorageObjectException e) {
-      logger.error("servletmoduleopenindy could not be initialized");
-    }
-  }
+  public ServletModuleOpenIndy() {
+    searchResultsTemplate = getConfiguration().getString("ServletModule.OpenIndy.SearchResultsTemplate");
+    prepareMailTemplate = getConfiguration().getString("ServletModule.OpenIndy.PrepareMailTemplate");
+    emailAnArticleTemplate = getConfiguration().getString("ServletModule.OpenIndy.MailableArticleTemplate");
+    sentMailTemplate = getConfiguration().getString("ServletModule.OpenIndy.SentMailTemplate");
 
+    contentModule = new ModuleContent();
+  }
 
   /**
-   *  Method for making a comment
+   * Perform the default open posting action
    */
+  public void defaultAction(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+    opensession(aRequest, aResponse);
+  }
 
-  public void addcomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException
-  {
-    String aid = req.getParameter("aid"); // the article id the comment will belong to
-    String language = req.getParameter("language");
-
-    if (aid!=null && !aid.equals(""))
-      {
-       SimpleHash mergeData = new SimpleHash();
-
-       // onetimepasswd
-       if(passwdProtection.equals("yes")){
-         String passwd = this.createOneTimePasswd();
-         System.out.println(passwd);
-         HttpSession session = req.getSession(false);
-         session.setAttribute("passwd",passwd);
-         mergeData.put("passwd", passwd);
-       }
-
-       if (language!=null) {
-         HttpSession session = req.getSession(false);
-         session.setAttribute("Locale", new Locale(language, ""));
-         session.setAttribute("passwd",language);
-       }
-
-       mergeData.put("aid", aid);
-       deliver(req, res, mergeData, commentFormTemplate);
-      }
-    else throw new ServletModuleException("aid not set!");
+  /**
+   * Method to return an out of service notice 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, null, null, getConfiguration().getString("ServletModule.OpenIndy.PostingDisabledTemplate"));
   }
 
   /**
-   *  Method for inserting a comment into the Database and delivering
-   *  the commentDone Page
+   * 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";
 
-  public void inscomment(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException,ServletModuleUserException
-  {
-    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 {
-         HashMap 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");
-
-         //checking the onetimepasswd
-         if(passwdProtection.equals("yes")){
-           HttpSession session = req.getSession(false);
-           String sessionPasswd = (String)session.getAttribute("passwd");
-           if ( sessionPasswd == null){
-             throw new ServletModuleUserException("Lost password");
-           }
-           String passwd = req.getParameter("passwd");
-           if ( passwd == null || (!sessionPasswd.equals(passwd))) {
-             throw new ServletModuleUserException("Missing password");
-           }
-           session.invalidate();
-         }
-
-         // inserting into database
-         String id = mainModule.add(withValues);
-         logger.debug("id: "+id);
-         //insert was not successfull
-         if(id==null){
-           deliver(req, res, new SimpleHash(), commentFormDupeTemplate);
-         } else {
-           DatabaseContent.getInstance().setUnproduced("id="+aid);
-
-           try {
-             EntityComment comment = (EntityComment) DatabaseComment.getInstance().selectById(id);
-             MirGlobal.localizer().openPostings().afterCommentPosting(comment);
-           }
-           catch (Throwable t) {
-             throw new ServletModuleException(t.getMessage());
-           }
-          
-          
-          
-         }
-
-         // redirecting to url
-         // should implement back to article
-         SimpleHash mergeData = new SimpleHash();
-         deliver(req, res, mergeData, commentFormDoneTemplate);
-       }
-       catch (StorageObjectException e) { throw new ServletModuleException(e.toString());}
-       catch (ModuleException e) { throw new ServletModuleException(e.toString());}
+  /**
+   * Determines the Locale to be used for the current session
+   */
+  protected Locale getResponseLocale(HttpSession aSession, HttpServletRequest aRequest) {
+    String requestLanguage = aRequest.getParameter("language");
+    String sessionLanguage = (String) aSession.getAttribute("language");
+    String acceptLanguage = aRequest.getLocale().getLanguage();
+    String defaultLanguage = getConfiguration().getString("Mir.Login.DefaultLanguage", "en");
 
-      }
-    else throw new ServletModuleException("aid not set!");
+    String language = requestLanguage;
 
-  }
+    if (language==null)
+      language = sessionLanguage;
 
-  /**
-   *  Method for delivering the form-Page for open posting
-   */
+    if (language==null)
+      language = acceptLanguage;
 
-  public void addposting(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException {
-    SimpleHash mergeData = new SimpleHash();
+    if (language==null)
+      language = defaultLanguage;
 
-    // onetimepasswd
-    if(passwdProtection.equals("yes")){
-      String passwd = this.createOneTimePasswd();
-      System.out.println(passwd);
-      HttpSession session = req.getSession(false);
-      session.setAttribute("passwd",passwd);
-      mergeData.put("passwd", passwd);
-    }
+    aSession.setAttribute("language", language);
 
-    String maxMedia = MirConfig.getProp("ServletModule.OpenIndy.MaxMediaUploadItems");
-    String numOfMedia = req.getParameter("medianum");
-    if(numOfMedia==null||numOfMedia.equals("")){
-      numOfMedia="1";
-    } else if(Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
-      numOfMedia = maxMedia;
-    }
+    return new Locale(language, "");
+  }
 
-    int mediaNum = Integer.parseInt(numOfMedia);
-    SimpleList mediaFields = new SimpleList();
-    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);
+  /**
+   * 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,
+              getConfiguration().getString("Mir.DefaultEncoding"),
+              getConfiguration().getInt("MaxMediaUploadSize")*1024,
+              getConfiguration().getString("TempDir")));
+
+      if (aRequest.isRequestedSessionIdValid() && !aRequest.isRequestedSessionIdFromURL() &&
+          !aRequest.getRequestedSessionId().equals(aRequest.getParameter(SESSION_REQUEST_KEY))) {
+        aRequest.getSession().invalidate();
+      }
 
-    SimpleHash extraInfo = new SimpleHash();
-    try{
-      SimpleList popUpData = DatabaseLanguage.getInstance().getPopupData();
-      extraInfo.put("languagePopUpData", popUpData );
-      extraInfo.put("themenPopupData", themenModule.getTopicsAsSimpleList());
+      Session session = new HTTPAdapters.HTTPSessionAdapter(aRequest.getSession());
 
-      extraInfo.put("topics", themenModule.getTopicsList());
+      SimpleResponse response = new SimpleResponse(
+          ServletHelper.makeGenerationData(aRequest, aResponse,
+              new Locale[] {
+                  getResponseLocale(aRequest.getSession(), aRequest),
+                  getFallbackLocale(aRequest)
+              },
+             "etc/bundles/open"));
 
-    } 
-    catch (Exception e) {
-      logger.error("languagePopUpData or getTopicslist failed "+e.toString());
-      throw new ServletModuleException("OpenIndy -- failed getting language or topics: "+e.toString());
-    }
+      response.setResponseValue("actionURL", aResponse.encodeURL(MirGlobal.config().getString("RootUri") + "/servlet/OpenMir")+"?"+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) {
+      getLogger().error(t.toString(), t);
 
-    deliver(req, res, mergeData, extraInfo, postingFormTemplate);
+      throw new ServletModuleFailure(t);
+    }
   }
 
   /**
-   *  Method for inserting an open posting into the Database and delivering
-   *  the postingDone Page
+   * Method for preparing and sending a content as an email message
    */
+  public void mail(HttpServletRequest aRequest, HttpServletResponse aResponse)
+      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+    String aid = aRequest.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....");
+    }
 
-  public void insposting(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException, ServletModuleUserException
-  {
-    SimpleHash mergeData = new SimpleHash();
-    boolean setMedia=false;
-    boolean setTopic = false;
+    String to = aRequest.getParameter("mail_to");
+    String from = aRequest.getParameter("mail_from");
+    String from_name = aRequest.getParameter("mail_from_name");
+    String from_ip = aRequest.getRemoteAddr();
+    String comment = aRequest.getParameter("mail_comment");
+    String mail_language = aRequest.getParameter("mail_language");
 
-    try {
+    Map mergeData = new HashMap();
+    mergeData.put("mail_to",to);
+    mergeData.put("mail_from",from);
+    mergeData.put("mail_from_name",from_name);
+    mergeData.put("mail_comment",comment);
+    mergeData.put("mail_aid",aid);
+    mergeData.put("mail_language",mail_language);
 
-      WebdbMultipartRequest mp = null;
-      EntityList mediaList = null;
-      try {
-        // new MediaRequest, "1" is the id for the openPosting user
-        MediaRequest mediaReq = new MediaRequest("1", true, true);
-        mp = new WebdbMultipartRequest(req, (FileHandler)mediaReq);
-        mediaList = mediaReq.getEntityList();
-      } catch (FileHandlerUserException e) {
-        throw new ServletModuleUserException(e.getMsg());
+
+    if (to == null || from == null || from_name == null|| to.equals("") || from.equals("") || from_name.equals("") || mail_language == null || mail_language.equals("")){
+      deliver(aRequest, aResponse, 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");
       }
-          
-      HashMap withValues = mp.getParameters();
-
-      //checking the onetimepasswd
-      if(passwdProtection.equals("yes")){
-        HttpSession session = req.getSession(false);
-        String sessionPasswd = (String)session.getAttribute("passwd");
-        if ( sessionPasswd == null){
-          throw new ServletModuleUserException("Lost password");
-        }
-        String passwd = (String)withValues.get("passwd");
-        if ( passwd == null || (!sessionPasswd.equals(passwd))) {
-          throw new ServletModuleUserException("Missing password");
-        }
-        session.invalidate();
+      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});
       }
 
-      if ((((String)withValues.get("title")).length() == 0) ||
-          (((String)withValues.get("description")).length() == 0) ||
-          (((String)withValues.get("content_data")).length() == 0))
-       throw new ServletModuleUserException("Missing field");
+      CacheKey theCacheKey=new CacheKey("email",aid+mail_language);
+      String theEmailText;
 
-      // call the routines that escape html
+      EntityContent article;
+      try {
+        article = (EntityContent) contentModule.getById(aid);
+      }
+      catch (ModuleExc e) {
+        throw new ServletModuleExc("Couldn't retrieve article " + aid);
+      }
 
-      for (Iterator i=withValues.keySet().iterator(); i.hasNext(); ){
-        String k=(String)i.next();
-        String v=(String)withValues.get(k);
+      if (!MirGlobal.localizer().openPostings().allowArticlePublication(article)) {
+        throw new ServletModuleExc("Illegal article");
+      }
 
-        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.removeHTMLTags(v));
-        } else {
-          withValues.put(k,StringUtil.removeHTMLTags(v));
+      if (MirGlobal.mruCache().hasObject(theCacheKey)){
+        getLogger().info("fetching email text for article "+aid+" from cache");
+        theEmailText = (String) MirGlobal.mruCache().getObject(theCacheKey);
+      }
+      else {
+        StringWriter theEMailTextWriter = new StringWriter();
+        PrintWriter dest = new PrintWriter(theEMailTextWriter);
+        try {
+          Map articleData = new HashMap();
+          try {
+            articleData.put("article",
+                MirGlobal.localizer().dataModel().adapterModel().makeEntityAdapter("content", article));
+          }
+          catch (MirLocalizerExc e) {
+            throw new ServletModuleExc("Can't retrieve article " + aid, e);
+          }
+          articleData.put("languagecode", mail_language);
+          deliver(dest, aRequest, aResponse, articleData, null, emailAnArticleTemplate, mail_language);
         }
-
+        finally {
+          dest.close();
+        }
+        theEmailText = theEMailTextWriter.toString();
+        MirGlobal.mruCache().storeObject(theCacheKey, theEmailText);
       }
 
-      withValues.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
-      withValues.put("publish_path", StringUtil.webdbDate2path((String)withValues.get("date")));
-      withValues.put("is_produced", "0");
-      // by default stuff is published, they can be un-published through the
-      // admin interface.
-      withValues.put("is_published","1");
-      // if op direct article-type == newswire
-      if (directOp.equals("yes")) withValues.put("to_article_type","1");
-
-      withValues.put("to_publisher","1");
-
-      // owner is openposting user
-      //      ML: this is not multi-language friendly and this can be done in a template
-      //      if (withValues.get("creator").toString().equals(""))
-      //        withValues.put("creator","Anonym");
-
-      // inserting  content into database
-      String cid = contentModule.add(withValues);
-      logger.debug("id: "+cid);
-      //insert was not successfull
-      if(cid==null){
-        //How do we know that it was not succesful cause of a
-        //dupe, what if it failed cause of "No space left on device"?
-        //Or is there something I am missing? Wouldn't it be better
-        //to have an explicit dupe check and then insert? I have no
-        //idea what I am talking about. this comment is in case
-        //I forget to explicitely ask. -mh
-        deliver(req, res, mergeData, postingFormDupeTemplate);
-      }
+      String content = theEmailText;
 
-      String[] to_topicsArr = mp.getParameterValues("to_topic");
-
-      if (to_topicsArr != null && to_topicsArr.length > 0) {
-        try{
-          DatabaseContentToTopics.getInstance().setTopics(cid,to_topicsArr);
-          setTopic = true;
-        } 
-       catch (Exception e) {
-          logger.error("setting content_x_topic failed");
-          contentModule.deleteById(cid);
-          throw new ServletModuleException("smod - openindy :: insposting: setting content_x_topic failed: "+e.toString());
-        } //end try
-      } //end if
-       
-      //if we're here all is ok... associate the media to the article
-      for(int i=0;i<mediaList.size();i++) {
-        Entity mediaEnt = (Entity)mediaList.elementAt(i);
-        DatabaseContentToMedia.getInstance().addMedia(cid,mediaEnt.getId());
+      // add some headers
+      content = "To: " + to + "\nReply-To: "+ from + "\nX-Originating-IP: "+ from_ip + "\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 {
-        MirGlobal.localizer().openPostings().afterContentPosting(
-                                                                (EntityContent)contentModule.getById(cid));
+        int reply;
+        client.connect(getConfiguration().getString("ServletModule.OpenIndy.SMTPServer"));
+
+        reply = client.getReplyCode();
+
+        if (!SMTPReply.isPositiveCompletion(reply)) {
+          client.disconnect();
+          throw new ServletModuleExc("SMTP server refused connection.");
+        }
+
+        client.sendSimpleMessage(getConfiguration().getString("ServletModule.OpenIndy.EmailIsFrom"), to, content);
+
+        client.disconnect();
+        //mission accomplished
+        deliver(aRequest, aResponse, mergeData, null, sentMailTemplate);
       }
-      catch (Throwable t) {
-        throw new ServletModuleException(t.getMessage());
+      catch(IOException e) {
+        if(client.isConnected()) {
+          try {
+            client.disconnect();
+          } catch(IOException f) {
+            // do nothing
+          }
+        }
+        throw new ServletModuleFailure(e);
       }
     }
-    catch (FileHandlerException e) { throw new ServletModuleException("MediaException: "+ e.toString());}
-    catch (IOException e) { throw new ServletModuleException("IOException: "+ e.toString());}
-    catch (StorageObjectException e) { throw new ServletModuleException("StorageObjectException" + e.toString());}
-    catch (ModuleException e) { throw new ServletModuleException("ModuleException"+e.toString());}
-
-    deliver(req, res, mergeData, postingFormDoneTemplate);
   }
 
-  /*
+
+
+  /**
    * Method for querying a lucene index
+   *
+   * @param req
+   * @param res
+   * @throws ServletModuleExc
+   * @throws ServletModuleUserExc
+   * @throws ServletModuleFailure
    */
-  public void search(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException, ServletModuleUserException {
+
+  public void search(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
     try {
-      int increment=10;
+      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="";
-    
-      SimpleHash mergeData = new SimpleHash();
-    
-      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","","");
+      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();
+      TopicMatrixSearchTerm topicMatrixTerm = new TopicMatrixSearchTerm();
       ImagesSearchTerm imagesTerm = new ImagesSearchTerm();
       AudioSearchTerm audioTerm = new AudioSearchTerm();
       VideoSearchTerm videoTerm = new VideoSearchTerm();
-    
+
       //make the query available to subsequent iterations
 
-      for (Enumeration theParams = req.getParameterNames(); theParams.hasMoreElements() ;) {
-       String pName=(String)theParams.nextElement();
-       if (pName.startsWith("search_")){
-         mergeData.put(pName,new SimpleScalar(req.getParameter(pName)));
-       }
+      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", themenModule.getTopicsAsSimpleList());
+
+      try {
+        mergeData.put("topics", DatabaseTopics.getInstance().getPopupData());
       }
-      catch(ModuleException e) {
-       logger.debug("Can't get topics: " + e.toString());
+      catch (Throwable e) {
+        getLogger().debug("Can't get topics: " + e.toString());
       }
-    
-      String searchSubmitValue = req.getParameter("search_submit");
-    
-      if (searchSubmitValue != null && searchSubmitValue.equals("Back")){
-       int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
-       int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()-increment;
-       if (newPosition < 0 || newPosition >= totalHits){
-         throw new ServletModuleUserException("newPosition: index out bounds, value was:"+(new Integer(newPosition)).toString());
-       }
-       session.setAttribute("positionInResults",new Integer(newPosition));
-      
+
+      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 (searchSubmitValue != null && searchSubmitValue.equals("Forward")){
-         int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
-         int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()+increment;
-         if (newPosition < 0 || newPosition >= totalHits){
-           throw new ServletModuleUserException("newPosition: index out bounds, value was:"+(new Integer(newPosition)).toString());
-         }
-         session.setAttribute("positionInResults",new Integer(newPosition));
-       
-       }
-       else {
-         String indexPath=MirConfig.getProp("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 ServletModuleUserException("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 ServletModuleUserException("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 ServletModuleUserException("Problem getting hits!");
-             }
-         
-             int start = 0;
-             int end = hits.length();
-         
-             String sortBy=req.getParameter("search_sort");
-             if (sortBy == null || sortBy.equals("")){
-               throw new ServletModuleUserException("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!
-               HashMap 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 ServletModuleUserException("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 ServletModuleUserException("Problem closing searcher(normal)!");
-             }
-                     
-             
-             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 ServletModuleUserException("Problem closing searcher!");
-           }
-         }
-       }
+        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 {
+          File indexFile = FileRoutines.getAbsoluteOrRelativeFile(getConfiguration().getHome(), getConfiguration().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) {
+            getLogger().debug("contentFragment: " + contentFragment);
+            queryString = queryString + " +" + contentFragment;
+          }
+
+          String topicFragment = topicTerm.makeTerm(req);
+          if (topicFragment != null) {
+            queryString = queryString + " +" + topicFragment;
+          }
+
+          String topicMatrixFragment = topicMatrixTerm.makeTerm(req);
+          if (topicMatrixFragment != null) {
+            queryString = queryString + " +" + topicMatrixFragment;
+          }
+
+          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.length()==0) {
+            queryString = "";
+          }
+          else {
+            try {
+              Searcher searcher = null;
+
+              try {
+                searcher = new IndexSearcher(FSDirectory.getDirectory(indexFile,false));
+              }
+              catch (IOException e) {
+                getLogger().debug("Can't open indexPath: " + indexFile.getAbsolutePath());
+                throw new ServletModuleExc("Problem with Search Index! : " + e.toString());
+              }
+
+              Query query;
+              try {
+                query = QueryParser.parse(queryString, "content", new StandardAnalyzer());
+              }
+              catch (Exception e) {
+                searcher.close();
+                getLogger().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();
+                getLogger().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 database 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) {
+                getLogger().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) {
+              getLogger().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());
-         SimpleList theHits = new SimpleList();
-         int pIR=((Integer)session.getAttribute("positionInResults")).intValue();
-         int terminus;
-         int numHits=((Integer)session.getAttribute("numberOfHits")).intValue();
-       
-         if (!(pIR+increment>=numHits)){
-           mergeData.put("hasNext","y");
-         }
-         if (pIR-increment>=0){
-           mergeData.put("hasPrevious","y");
-         }
-       
-         if ((pIR+increment)>numHits){
-           terminus=numHits;
-         }
-         else {
-           terminus=pIR+increment;
-         }
-         for(int i = pIR; i < terminus; i++) {
-           SimpleHash h = new SimpleHash();
-           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);
-       }
+        ArrayList theDocs = (ArrayList) session.getAttribute("theDocumentsSorted");
+        if (theDocs != null) {
+
+          mergeData.put("numberOfHits", (session.getAttribute("numberOfHits")).toString());
+          List theHits = new ArrayList();
+          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 (Exception e) {
-       logger.debug("Can't iterate over hits: " + e.toString());
-       throw new ServletModuleUserException("Problem getting hits!");
+      catch (Throwable e) {
+        getLogger().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,searchResultsTemplate);
+
+      mergeData.put("queryString", queryString);
+
+      deliver(req, res, mergeData, null, searchResultsTemplate);
     }
-    catch (NullPointerException n){
-      n.printStackTrace();
-      throw new ServletModuleUserException("Null Pointer"+n.toString());
+    catch (NullPointerException n) {
+      throw new ServletModuleFailure("Null Pointer: " + n.toString(), n);
     }
   }
 
   /*
-   * Method for dynamically generating a pdf from a fo file
+   * Method for dynamically generating a pdf using iText
    */
-  public void getpdf(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException, ServletModuleUserException {
+
+  public void getpdf(HttpServletRequest aRequest, HttpServletResponse aResponse)
+      throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+
+    long starttime = System.currentTimeMillis();
+
     String ID_REQUEST_PARAM = "id";
-    
-    String generateFO=MirConfig.getProp("GenerateFO");
-    String generatePDF=MirConfig.getProp("GeneratePDF");
-
-    //don't do anything if we are not making FO files, or if we are
-    //pregenerating PDF's
-    if (generateFO.equals("yes") && generatePDF.equals("no")){
-      //fop complains unless you do the logging this way
-      org.apache.log.Logger log = null;
-      Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
-      log = hierarchy.getLoggerFor("fop");
-      log.setPriority(Priority.WARN);
-    
-      String producerStorageRoot=MirConfig.getProp("Producer.StorageRoot");
-      String producerDocRoot=MirConfig.getProp("Producer.DocRoot");
-      String templateDir=MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir");
-      String xslSheet=templateDir + "/" 
-        + MirConfig.getProp("Producer.PrintableContent.html2foStyleSheetName");
-      try {
-        String idParam = req.getParameter(ID_REQUEST_PARAM);
-        if (idParam != null) {
-          EntityContent contentEnt =
-            (EntityContent)contentModule.getById(idParam);
-          String publishPath = contentEnt.getValue("publish_path");
-          String foFile = producerStorageRoot + producerDocRoot + "/" 
-           + publishPath + "/" + idParam + ".fo";
-          XSLTInputHandler input = new XSLTInputHandler(new File(foFile), 
-                                                       new File(xslSheet));
-          
+    int maxArticlesInNewsleter = 15; // it is nice not to be dos'ed
+    try {
+      String idParam = aRequest.getParameter(ID_REQUEST_PARAM);
+      if (idParam != null) {
+        RE re = new RE("[0-9]+");
+
+        REMatch[] idMatches = re.getAllMatches(idParam);
+        String cacheSelector = "";
+
+        for (int i = 0; i < idMatches.length; i++) {
+          cacheSelector = cacheSelector + "," + idMatches[i].toString();
+        }
+
+        String cacheType = "pdf";
+
+        CacheKey theCacheKey = new CacheKey(cacheType, cacheSelector);
+
+        byte[] thePDF;
+
+        if (MirGlobal.mruCache().hasObject(theCacheKey)) {
+          getLogger().debug("fetching pdf from cache");
+          thePDF = (byte[]) MirGlobal.mruCache().getObject(theCacheKey);
+        }
+        else {
+          getLogger().debug("generating pdf and caching it");
           ByteArrayOutputStream out = new ByteArrayOutputStream();
-          res.setContentType("application/pdf");
-
-          Driver driver = new Driver();
-          driver.setLogger(log);
-          driver.setRenderer(Driver.RENDER_PDF);
-          driver.setOutputStream(out);
-          driver.render(input.getParser(), input.getInputSource());
-
-          byte[] content = out.toByteArray();
-          res.setContentLength(content.length);
-          res.getOutputStream().write(content);
-          res.getOutputStream().flush();
-        } else {
-          throw new ServletModuleUserException("Missing id parameter.");
+          PDFGenerator pdfMaker = new PDFGenerator(out);
+
+          if (idMatches.length > 1) {
+            pdfMaker.addLine();
+            for (int i = 0; i < idMatches.length && i < maxArticlesInNewsleter; 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 article = (EntityContent) contentModule.getById(id);
+
+            if (!MirGlobal.localizer().openPostings().allowArticlePublication(article)) {
+              throw new ServletModuleExc("Illegal article");
+            }
+
+            pdfMaker.add(article, getLocale(aRequest));
+          }
+
+          pdfMaker.stop();
+          thePDF = out.toByteArray();
+
+          //and save all our hard work!
+          MirGlobal.mruCache().storeObject(theCacheKey, thePDF);
         }
-      } catch (Exception ex) {
-       throw new ServletModuleException(ex.toString());
+
+        aResponse.setContentType("application/pdf");
+        aResponse.setContentLength(thePDF.length);
+        aResponse.getOutputStream().write(thePDF);
+        aResponse.getOutputStream().flush();
+        String elapsedtime = (new Long(System.currentTimeMillis() - starttime)).toString();
+        getLogger().info("pdf retireval took " + elapsedtime + " milliseconds");
+
+      }
+      else {
+        throw new ServletModuleExc("Missing id.");
       }
-    } else {
-      throw new ServletModuleUserException("Can't generate a PDF because the config tells me not to.");
     }
-  }
-  
-  private void _throwBadContentType (String fileName, String contentType)
-    throws ServletModuleUserException {
-
-    logger.error("Wrong file type uploaded!: " + fileName+" "
-                          +contentType);
-    throw new ServletModuleUserException("The file you uploaded is of the "
-                                        +"following mime-type: "+contentType
-                                        +", we do not support this mime-type. "
-                                        +"Error One or more files of unrecognized type. Sorry");
+    catch (Throwable t) {
+      getLogger().error(t.toString());
+
+      throw new ServletModuleFailure(t);
+    }
   }
 
-  protected String createOneTimePasswd(){
+
+  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;
+
+    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);
+    }
+  }
 
-  /* this is an overwritten method of ServletModule in order
-     to use different bundles for open and admin */
-  public void deliver(HttpServletRequest req, HttpServletResponse res,
-                     TemplateModelRoot rtm, TemplateModelRoot popups,
-                     String templateFilename)
-    throws ServletModuleException {
-    if (rtm == null) rtm = new SimpleHash();
+  public void deliver(PrintWriter anOutputWriter, HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator)
+      throws ServletModuleFailure {
     try {
-      PrintWriter out = res.getWriter();
-      HTMLTemplateProcessor.process(res, templateFilename, rtm, popups, out,
-                                   getLocale(req), "bundles.open");
-      out.close();
-    }  catch (HTMLParseException e) {
-      throw new ServletModuleException(e.toString());
-    } catch (IOException e) {
-      throw new ServletModuleException(e.toString());
+      Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}, "etc/bundles/open");
+      responseData.put("data", aData);
+      responseData.put("extra", anExtra);
+
+
+      Generator generator =
+          MirGlobal.localizer().generators().makeOpenPostingGeneratorLibrary().makeGenerator(aGenerator, null);
+      generator.generate(anOutputWriter, responseData, getLogger());
+
+      anOutputWriter.close();
+    }
+    catch (Throwable e) {
+      getLogger().error("Error while generating " + aGenerator + ": " + e.getMessage());
+
+      throw new ServletModuleFailure(e);
     }
   }
-}
+
+  public void deliver(PrintWriter anOutputWriter, HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator,String aLocaleString)
+      throws ServletModuleFailure {
+    try {
+      Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { new Locale(aLocaleString,""), getFallbackLocale(aRequest)}, "etc/bundles/open");
+      responseData.put("data", aData);
+      responseData.put("extra", anExtra);
 
 
+      Generator generator =
+          MirGlobal.localizer().generators().
+              makeOpenPostingGeneratorLibrary().makeGenerator(aGenerator, null);
+      generator.generate(anOutputWriter, responseData, getLogger());
+
+      anOutputWriter.close();
+    }
+    catch (Throwable e) {
+      getLogger().error("Error while generating " + aGenerator + ": " + e.getMessage());
 
+      throw new ServletModuleFailure(e);
+    }
+  }
+
+
+  public void handleError(HttpServletRequest aRequest, HttpServletResponse aResponse,PrintWriter out, Throwable anException) {
+    try {
+      getLogger().error("Error during open action", anException);
+      Map data = new HashMap();
+
+      data.put("errorstring", anException.getMessage());
+      data.put("date", StringUtil.date2readableDateTime(new GregorianCalendar()));
+
+      deliver(out, aRequest, aResponse, data, null, getConfiguration().getString("ServletModule.OpenIndy.ErrorTemplate"));
+    }
+    catch (Throwable e) {
+      throw new ServletModuleFailure(e);
+    }
+  }
+
+  public void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse,
+                               PrintWriter out, ServletModuleUserExc anException) {
+    try {
+      getLogger().warn("user error: " + anException.getMessage());
+      Map data = new HashMap();
+
+      Bundle bundle =
+          MirGlobal.getBundleFactory().getBundle("etc/bundles/open", new
+              String[] { getLocale(aRequest).getLanguage() });
+      data.put("errorstring", bundle.getValue(anException.getMessage(), Arrays.asList(anException.getParameters())));
+      data.put("date", StringUtil.date2readableDateTime(new GregorianCalendar()));
+
+      deliver(out, aRequest, aResponse, data, null, getConfiguration().getString("ServletModule.OpenIndy.UserErrorTemplate"));
+    }
+    catch (Throwable e) {
+      throw new ServletModuleFailure(e);
+    }
+  }
+}