introduced some customization for the content list in admin
[mir.git] / source / mircoders / servlet / ServletModuleOpenIndy.java
index b244ac9..d6e9e58 100755 (executable)
@@ -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,6 +66,7 @@ import mir.misc.*;
 import mir.entity.*;
 import mir.storage.*;
 import mir.media.*;
+import mir.log.*;
 
 import mircoders.entity.*;
 import mircoders.storage.*;
@@ -36,6 +75,7 @@ import mircoders.producer.*;
 import mircoders.media.MediaRequest;
 import mircoders.global.*;
 import mircoders.localizer.*;
+import mircoders.search.*;
 
 /*
  *  ServletModuleOpenIndy -
@@ -43,22 +83,8 @@ import mircoders.localizer.*;
  *    adding comments to articles &
  *    open-postings to the newswire
  *
- * @author $Author: mh $
- * @version $Revision: 1.39 $ $Date: 2002/08/25 19:00:11 $
- *
- * $Log: ServletModuleOpenIndy.java,v $
- * Revision 1.39  2002/08/25 19:00:11  mh
- * merge of localization branch into HEAD. mh and zap
- *
- * Revision 1.38  2002/07/21 22:50:14  mh
- * cleanup coding style of getpdf() method
- *
- * Revision 1.37  2002/07/21 22:41:45  mh
- * make use of new MediaRequest class. A big cleanup and optimization.
- *
- * 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 $
  *
  */
 
@@ -66,9 +92,10 @@ 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;
@@ -81,13 +108,15 @@ 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();
       mainModule = new ModuleComment(DatabaseComment.getInstance());
@@ -98,7 +127,7 @@ public class ServletModuleOpenIndy extends ServletModule
 
     }
     catch (StorageObjectException e) {
-        theLog.printError("servletmoduleopenindy could not be initialized");
+      logger.error("servletmoduleopenindy could not be initialized: " + e.getMessage());
     }
   }
 
@@ -113,27 +142,27 @@ public class ServletModuleOpenIndy extends ServletModule
     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);
+      {
+       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);
       }
-
-      mergeData.put("aid", aid);
-      deliver(req, res, mergeData, commentFormTemplate);
-    }
     else throw new ServletModuleException("aid not set!");
   }
 
@@ -143,68 +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());
+      {
+       // 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(); ){
+         //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);
-        } 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());
-          }
+         }
+         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());}
+         // 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!");
 
   }
@@ -252,9 +281,9 @@ public class ServletModuleOpenIndy extends ServletModule
 
       extraInfo.put("topics", themenModule.getTopicsList());
 
-    } catch (Exception e) {
-      theLog.printError("languagePopUpData or getTopicslist failed "
-                        +e.toString());
+    } 
+    catch (Exception e) {
+      logger.error("languagePopUpData or getTopicslist failed "+e.toString());
       throw new ServletModuleException("OpenIndy -- failed getting language or topics: "+e.toString());
     }
 
@@ -276,12 +305,15 @@ public class ServletModuleOpenIndy extends ServletModule
     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
-        mediaList = new MediaRequest(mp, "1").getMedia(true, true);
-      } catch (MirMediaUserException e) {
+        MediaRequest mediaReq = new MediaRequest("1", true, true);
+        mp = new WebdbMultipartRequest(req, (FileHandler)mediaReq);
+        mediaList = mediaReq.getEntityList();
+      } catch (FileHandlerUserException e) {
         throw new ServletModuleUserException(e.getMsg());
       }
           
@@ -304,7 +336,7 @@ public class ServletModuleOpenIndy extends ServletModule
       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
 
@@ -334,13 +366,13 @@ public class ServletModuleOpenIndy extends ServletModule
       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");
+      //      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
@@ -358,8 +390,9 @@ public class ServletModuleOpenIndy extends ServletModule
         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
@@ -373,13 +406,13 @@ public class ServletModuleOpenIndy extends ServletModule
 
       try {
         MirGlobal.localizer().openPostings().afterContentPosting(
-            (EntityContent)contentModule.getById(cid));
+                                                                (EntityContent)contentModule.getById(cid));
       }
       catch (Throwable t) {
         throw new ServletModuleException(t.getMessage());
       }
     }
-    catch (MirMediaException e) { throw new ServletModuleException("MediaException: "+ e.toString());}
+    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());}
@@ -388,6 +421,270 @@ public class ServletModuleOpenIndy extends ServletModule
   }
 
   /*
+   * 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)
@@ -401,7 +698,7 @@ public class ServletModuleOpenIndy extends ServletModule
     //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);
@@ -418,9 +715,9 @@ public class ServletModuleOpenIndy extends ServletModule
             (EntityContent)contentModule.getById(idParam);
           String publishPath = contentEnt.getValue("publish_path");
           String foFile = producerStorageRoot + producerDocRoot + "/" 
-                          + publishPath + "/" + idParam + ".fo";
+           + publishPath + "/" + idParam + ".fo";
           XSLTInputHandler input = new XSLTInputHandler(new File(foFile), 
-                                                       new File(xslSheet));
+                                                       new File(xslSheet));
           
           ByteArrayOutputStream out = new ByteArrayOutputStream();
           res.setContentType("application/pdf");
@@ -449,12 +746,12 @@ 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(){
@@ -467,6 +764,25 @@ public class ServletModuleOpenIndy extends ServletModule
     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());
+    }
+  }
 }