X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleOpenIndy.java;h=d6e9e5854623715edbb63639ddf804b4bdf3aebc;hb=9af9180576ade4481f9a2f61379fb3ba1191f202;hp=2ef627cd7d1c19fd727f4781bf40b99943c8e0f5;hpb=e8b69a8db51d6e12d789252b36258b27ea5ff7a3;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index 2ef627cd..d6e9e585 100755
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.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 mircoders.servlet;
 
 import java.io.*;
@@ -20,6 +51,13 @@ import org.apache.fop.apps.Driver;
 import org.apache.fop.apps.Version;
 import org.apache.fop.apps.XSLTInputHandler;
 
+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.*;
@@ -28,11 +66,16 @@ 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.*;
 
 /*
  *  ServletModuleOpenIndy -
@@ -40,13 +83,8 @@ import mircoders.producer.*;
  *    adding comments to articles &
  *    open-postings to the newswire
  *
- * @author $Author: mh $
- * @version $Revision: 1.36 $ $Date: 2002/06/29 15:45:20 $
- *
- * $Log: ServletModuleOpenIndy.java,v $
- * Revision 1.36  2002/06/29 15:45:20  mh
- * cvs macros
- *
+ * @author mir-coders group
+ * @version $Id: ServletModuleOpenIndy.java,v 1.48 2002/11/30 19:45:57 zapata Exp $
  *
  */
 
@@ -54,10 +92,12 @@ public class ServletModuleOpenIndy extends ServletModule
 {
 
   private String        commentFormTemplate, commentFormDoneTemplate,
-                        commentFormDupeTemplate;
+    commentFormDupeTemplate;
   private String        postingFormTemplate, postingFormDoneTemplate,
-                        postingFormDupeTemplate;
+    postingFormDupeTemplate;
+  private String        searchResultsTemplate;
   private ModuleContent contentModule;
+  private ModuleComment commentModule;
   private ModuleImages  imageModule;
   private ModuleTopics  themenModule;
   private String        directOp ="yes";
@@ -68,24 +108,26 @@ public class ServletModuleOpenIndy extends ServletModule
 
   private ServletModuleOpenIndy() {
     try {
-      theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.OpenIndy.Logfile"));
+      logger = new LoggerWrapper("ServletModule.OpenIndy");
+
       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();
+      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) {
-        theLog.printError("servletmoduleopenindy could not be initialized");
+      logger.error("servletmoduleopenindy could not be initialized: " + e.getMessage());
     }
   }
 
@@ -97,22 +139,30 @@ public class ServletModuleOpenIndy extends ServletModule
   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);
-			}
-			
-      mergeData.put("aid", aid);
-      deliver(req, res, mergeData, commentFormTemplate);
-    }
+      {
+	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!");
   }
 
@@ -122,62 +172,68 @@ public class ServletModuleOpenIndy extends ServletModule
    */
 
   public void inscomment(HttpServletRequest req, HttpServletResponse res)
-	throws ServletModuleException,ServletModuleUserException
+    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(); ){
+      {
+	// 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);
-        theLog.printDebugInfo("id: "+id);
-        //insert was not successfull
-        if(id==null){
-          deliver(req, res, new SimpleHash(), commentFormDupeTemplate);
-        }
-        
-        // producing new page
-        new ProducerContent().handle(null, null, true, false, aid);
-
-        // sync the server
-        int exitValue = Helper.rsync();
-        theLog.printDebugInfo("rsync:"+exitValue);
-
-        // 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());}
+	  }
+	  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());}
+
+      }
     else throw new ServletModuleException("aid not set!");
 
   }
@@ -189,16 +245,16 @@ public class ServletModuleOpenIndy extends ServletModule
   public void addposting(HttpServletRequest req, HttpServletResponse res)
     throws ServletModuleException {
     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);
-		}
-			
+
+    // 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);
+    }
+
     String maxMedia = MirConfig.getProp("ServletModule.OpenIndy.MaxMediaUploadItems");
     String numOfMedia = req.getParameter("medianum");
     if(numOfMedia==null||numOfMedia.equals("")){
@@ -206,7 +262,7 @@ public class ServletModuleOpenIndy extends ServletModule
     } else if(Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
       numOfMedia = maxMedia;
     }
-    
+
     int mediaNum = Integer.parseInt(numOfMedia);
     SimpleList mediaFields = new SimpleList();
     for(int i =0; i<mediaNum;i++){
@@ -215,19 +271,24 @@ public class ServletModuleOpenIndy extends ServletModule
     }
     mergeData.put("medianum",numOfMedia);
     mergeData.put("mediafields",mediaFields);
-    
-    
+
+
     SimpleHash extraInfo = new SimpleHash();
     try{
       SimpleList popUpData = DatabaseLanguage.getInstance().getPopupData();
       extraInfo.put("languagePopUpData", popUpData );
       extraInfo.put("themenPopupData", themenModule.getTopicsAsSimpleList());
-    } catch (Exception e) {
-      theLog.printError("languagePopUpData or getTopicslist failed "
-                        +e.toString());
+
+      extraInfo.put("topics", themenModule.getTopicsList());
+
+    } 
+    catch (Exception e) {
+      logger.error("languagePopUpData or getTopicslist failed "+e.toString());
       throw new ServletModuleException("OpenIndy -- failed getting language or topics: "+e.toString());
     }
-      
+
+
+
     deliver(req, res, mergeData, extraInfo, postingFormTemplate);
   }
 
@@ -241,38 +302,48 @@ public class ServletModuleOpenIndy extends ServletModule
   {
     SimpleHash mergeData = new SimpleHash();
     boolean setMedia=false;
-		boolean setTopic = false;
+    boolean setTopic = false;
 
     try {
-      WebdbMultipartRequest mp = new WebdbMultipartRequest(req);
+
+      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());
+      }
           
       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();
-			}
+
+      //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 ((((String)withValues.get("title")).length() == 0) ||
           (((String)withValues.get("description")).length() == 0) ||
           (((String)withValues.get("content_data")).length() == 0))
-            throw new ServletModuleUserException("Missing field");
-      
+	throw new ServletModuleUserException("Missing field");
+
       // call the routines that escape html
 
       for (Iterator 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));
@@ -280,26 +351,28 @@ public class ServletModuleOpenIndy extends ServletModule
         } 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");
-      // op-articles are not immediatly published
-      // we don't know that all is good yet (media, title is present, etc..)
-      withValues.put("is_published","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");
-      
-      // owner is openposting user
+
       withValues.put("to_publisher","1");
-      if (withValues.get("creator").toString().equals(""))
-        withValues.put("creator","Anonym");
+
+      // 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);
-      theLog.printDebugInfo("id: "+cid);
+      logger.debug("id: "+cid);
       //insert was not successfull
       if(cid==null){
         //How do we know that it was not succesful cause of a
@@ -312,211 +385,34 @@ public class ServletModuleOpenIndy extends ServletModule
       }
 
       String[] to_topicsArr = mp.getParameterValues("to_topic");
-      
-			if (to_topicsArr != null && to_topicsArr.length > 0) {
+
+      if (to_topicsArr != null && to_topicsArr.length > 0) {
         try{
           DatabaseContentToTopics.getInstance().setTopics(cid,to_topicsArr);
           setTopic = true;
-        } catch (Exception e) {
-          theLog.printError("setting content_x_topic failed");
+        } 
+	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 op contains uploaddata
-      String mediaId=null;
-      int i=1;
-      for(Iterator it = mp.requestList.iterator(); it.hasNext();){
-        MpRequest mpReq = (MpRequest)it.next();
-        String fileName = mpReq.getFilename();
-
-        //get the content-type from what the client browser
-        //sends us. (the "Oreilly method")
-        String contentType = mpReq.getContentType();
-
-        theLog.printInfo("FROM BROWSER: "+contentType);
-
-        //if the client browser sent us unknown (text/plain is default)
-        //or if we got application/octet-stream, it's possible that
-        //the browser is in error, better check against the file extension
-        if (contentType.equals("text/plain") ||
-            contentType.equals("application/octet-stream")) {
-          /**
-           * Fallback to finding the mime-type through the standard ServletApi
-           * ServletContext getMimeType() method.
-           *
-           * This is a way to get the content-type via the .extension,
-           * we could maybe use a magic method as an additional method of
-           * figuring out the content-type, by looking at the header (first
-           * few bytes) of the file. (like the file(1) command). We could
-           * also call the "file" command through Runtime. This is an
-           * option that I almost prefer as it is already implemented and
-           * exists with an up-to-date map on most modern Unix like systems.
-           * I haven't found a really nice implementation of the magic method
-           * in pure java yet.
-           *
-           * The first method we try thought is the "Oreilly method". It
-           * relies on the content-type that the client browser sends and
-           * that sometimes is application-octet stream with
-           * broken/mis-configured browsers.
-           *
-           * The map file we use for the extensions is the standard web-app
-           * deployment descriptor file (web.xml). See Mir's web.xml or see
-           * your Servlet containers (most likely Tomcat) documentation.
-           * So if you support a new media type you have to make sure that
-           * it is in this file -mh
-           */
-          ServletContext ctx =
-            (ServletContext)MirConfig.getPropAsObject("ServletContext");
-          contentType = ctx.getMimeType(fileName);
-          if (contentType==null)
-            contentType = "text/plain"; // rfc1867 says this is the default
-        }
-        HashMap mediaValues = new HashMap();
-
-        theLog.printInfo("CONTENT TYPE IS: "+contentType);
-        
-        if (contentType.equals("text/plain") ||
-            contentType.equals("application/octet-stream")) {
-          contentModule.deleteById(cid);
-          _throwBadContentType(fileName, contentType);
-        }
-
-        String mediaTitle=(String)withValues.get("media_title"+i);
-        i++;
-
-        if ((mediaTitle == null) || (mediaTitle.length() == 0))
-            throw new ServletModuleUserException("Missing field");
-            //mediaTitle = (String)withValues.get("title");
-
-        mediaValues.put("title", mediaTitle);
-        mediaValues.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
-        mediaValues.put("to_publisher", "1"); // op user
-        mediaValues.put("to_media_folder", "7"); // op media_folder
-        mediaValues.put("is_produced", "0");
-        mediaValues.put("is_published","0");
-
-        // @todo this should probably be moved to DatabaseMediaType -mh
-        String[] cTypeSplit = StringUtil.split(contentType, "/");
-        String wc = " mime_type LIKE '"+cTypeSplit[0]+"%'";
-
-        DatabaseMediaType mediaTypeStor = DatabaseMediaType.getInstance();
-        EntityList mediaTypesList = mediaTypeStor.selectByWhereClause(wc);
-
-        String mediaTypeId = null;
-        MirMedia mediaHandler;
-        Database mediaStorage;
-        ProducerMedia mediaProducer;
- 
-        //if we didn't find an entry matching the
-        //content-type int the table.
-        if (mediaTypesList.size() == 0) {
-          contentModule.deleteById(cid);
-          _throwBadContentType(fileName, contentType);
-        }
-
-        Entity mediaType = null;
-        Entity mediaType2 = null;
-        
-        // find out if we an exact content-type match if so take it.
-        // otherwise try to match majortype/*
-        // @todo this should probably be moved to DatabaseMediaType -mh
-        for(int j=0;j<mediaTypesList.size();j++) {
-          if(contentType.equals(
-                mediaTypesList.elementAt(j).getValue("mime_type")))
-            mediaType = mediaTypesList.elementAt(j);
-          else if ((mediaTypesList.elementAt(j).getValue("mime_type")).equals(
-                    cTypeSplit[0]+"/*") )
-            mediaType2= mediaTypesList.elementAt(j);
-        }
-
-        if ( (mediaType == null) && (mediaType2 == null) ) {
-          contentModule.deleteById(cid);
-          _throwBadContentType(fileName, contentType);
-        }
-        else if( (mediaType == null) && (mediaType2 != null) )
-          mediaType = mediaType2;
-
-        //get the class names from the media_type table.
-        mediaTypeId = mediaType.getId();
-        try {
-          // ############### @todo: merge these and the getURL call into one
-          // getURL helper call that just takes the Entity as a parameter
-          // along with media_type
-          mediaHandler = MediaHelper.getHandler(mediaType);
-          mediaStorage = MediaHelper.getStorage(mediaType,
-                                              "mircoders.storage.Database");
-          Class prodCls = Class.forName("mircoders.producer.Producer"
-                                            +mediaType.getValue("tablename"));
-          mediaProducer = (ProducerMedia)prodCls.newInstance();
-        } catch (Exception e) {
-          theLog.printError("getting media handler failed: "+e.toString());
-          contentModule.deleteById(cid);
-          throw new ServletModuleException("getting media handler failed: "
-                                          +e.toString());
-        }
-
-        mediaValues.put("to_media_type",mediaTypeId);
-
-        //load the classes via reflection
-        String MediaId;
-        Entity mediaEnt = null;
-        try {
-          mediaEnt = (Entity)mediaStorage.getEntityClass().newInstance();
-          mediaEnt.setStorage(mediaStorage);
-          mediaEnt.setValues(mediaValues);
-          mediaId = mediaEnt.insert();
-
-          //save and store the media data/metadata
-          mediaHandler.set(mpReq.getMedia(), mediaEnt,
-                          mediaType);
-
-          //were done with mpReq at this point, dereference it.
-          //as it contains mucho mem. -mh 01.10.2001
-          mpReq=null;
-          
-          //we got this far, associate the media to the article
-          mediaEnt.setValueForProperty("is_published","1");
-          mediaEnt.update();
-          //produce it
-          mediaProducer.handle(null, null, false, false, mediaId);
-          DatabaseContentToMedia.getInstance().addMedia(cid,mediaId);
-        } catch (Exception e) {
-          theLog.printError("setting media failed: "+e.toString());
-          contentModule.deleteById(cid);
-          throw new ServletModuleException("setting media failed: "
-                                            +e.toString());
-        }
-
-      } //end for Iterator...
-
-      //if we're here all is ok...
-      EntityContent contentEnt = (EntityContent)contentModule.getById(cid);
-      contentEnt.setValueForProperty("is_published","1");
-      contentEnt.update();
-
-
-      //dereference mp. -mh
-      mp=null;
-
-      // producing openpostinglist
-      new ProducerOpenPosting().handle(null,null,false,false);
-      // producing new page
-      new ProducerContent().handle(null, null, false, false,cid);
-      //if direct op producing startpage
-      if (directOp.equals("yes")) new ProducerStartPage().handle(null,null);
-      
-			//produce the topicPages if set
-			//should be more intelligent
-			//if(setTopic==true) new ProducerTopics().handle(null,null);
-			
-      // sync the server
-      //should be configureable
-      int exitValue = Helper.rsync();
-      theLog.printDebugInfo("rsync: "+exitValue);
+       
+      //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());
+      }
 
+      try {
+        MirGlobal.localizer().openPostings().afterContentPosting(
+								 (EntityContent)contentModule.getById(cid));
+      }
+      catch (Throwable t) {
+        throw new ServletModuleException(t.getMessage());
+      }
     }
+    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());}
@@ -524,11 +420,273 @@ public class ServletModuleOpenIndy extends ServletModule
     deliver(req, res, mergeData, postingFormDoneTemplate);
   }
 
-/**
-  *  Method for dynamically generating a pdf from a fo file
-  */
+  /*
+   * Method for querying a lucene index
+   */
+  public void search(HttpServletRequest req, HttpServletResponse res)
+    throws ServletModuleException, ServletModuleUserException {
+    try {
+      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","","");
+      TopicSearchTerm topicTerm = new TopicSearchTerm();
+      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)));
+	}
+      }
+    
+      try{
+	mergeData.put("topics", themenModule.getTopicsAsSimpleList());
+      }
+      catch(ModuleException e) {
+	logger.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));
+      
+      }
+      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!");
+	    }
+	  }
+	}
+      }
+    
+      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);
+	}
+      }
+      catch (Exception e) {
+	logger.debug("Can't iterate over hits: " + e.toString());
+	throw new ServletModuleUserException("Problem getting hits!");
+      }
+    
+      mergeData.put("queryString",queryString);
+      deliver(req,res,mergeData,searchResultsTemplate);
+    }
+    catch (NullPointerException n){
+      n.printStackTrace();
+      throw new ServletModuleUserException("Null Pointer"+n.toString());
+    }
+  }
 
+  /*
+   * Method for dynamically generating a pdf from a fo file
+   */
   public void getpdf(HttpServletRequest req, HttpServletResponse res)
     throws ServletModuleException, ServletModuleUserException {
     String ID_REQUEST_PARAM = "id";
@@ -536,31 +694,32 @@ public class ServletModuleOpenIndy extends ServletModule
     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
+    //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
-      Logger log = null;
+      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 templateDir=MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir");
       String xslSheet=templateDir + "/" 
-                    + MirConfig.getProp("Producer.PrintableContent.html2foStyleSheetName");
+        + 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";
+        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));
+							new File(xslSheet));
           
-	  ByteArrayOutputStream out = new ByteArrayOutputStream();
+          ByteArrayOutputStream out = new ByteArrayOutputStream();
           res.setContentType("application/pdf");
 
           Driver driver = new Driver();
@@ -573,16 +732,13 @@ public class ServletModuleOpenIndy extends ServletModule
           res.setContentLength(content.length);
           res.getOutputStream().write(content);
           res.getOutputStream().flush();
-	} 
-        else {
-	  throw new ServletModuleUserException("Can't generate a PDF without an id parameter.");
-	}
-      } 
-      catch (Exception ex) {
+        } else {
+          throw new ServletModuleUserException("Missing id parameter.");
+        }
+      } catch (Exception ex) {
       	throw new ServletModuleException(ex.toString());
       }
-    }
-    else {
+    } else {
       throw new ServletModuleUserException("Can't generate a PDF because the config tells me not to.");
     }
   }
@@ -590,24 +746,43 @@ public class ServletModuleOpenIndy extends ServletModule
   private void _throwBadContentType (String fileName, String contentType)
     throws ServletModuleUserException {
 
-    theLog.printDebugInfo("Wrong file type uploaded!: " + fileName+" "
+    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");
+					 +"following mime-type: "+contentType
+					 +", we do not support this mime-type. "
+					 +"Error One or more files of unrecognized type. Sorry");
+  }
+
+  protected String createOneTimePasswd(){
+    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);
+  }
+
+
+  /* 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();
+    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());
+    }
   }
-	
-	protected String createOneTimePasswd(){
-		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);
-	}
-      
 }