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

[mir.git] / source / mircoders / servlet / ServletModuleContent.java

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