1.1 restoration

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

diff --git a/source/mircoders/servlet/ServletModuleComment.java b/source/mircoders/servlet/ServletModuleComment.java
index de606b0..40cdd78 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleComment.java
+++ b/source/mircoders/servlet/ServletModuleComment.java
@@ -30,15 +30,6 @@
 
 package mircoders.servlet;
 
-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 mir.entity.adapter.EntityAdapterModel;
 import mir.entity.adapter.EntityIteratorAdapter;
 import mir.log.LoggerWrapper;
@@ -46,17 +37,15 @@ import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
 import mir.servlet.ServletModuleUserExc;
-import mir.util.CachingRewindableIterator;
-import mir.util.HTTPRequestParser;
-import mir.util.JDBCStringRoutines;
-import mir.util.SQLQueryBuilder;
-import mir.util.URLBuilder;
+import mir.util.*;
 import mircoders.entity.EntityComment;
 import mircoders.global.MirGlobal;
 import mircoders.module.ModuleComment;
-import mircoders.module.ModuleContent;
 import mircoders.storage.DatabaseComment;
-import mircoders.storage.DatabaseContent;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
 
 /*
  *  ServletModuleComment - controls navigation for Comments
@@ -67,16 +56,13 @@ import mircoders.storage.DatabaseContent;
 
 public class ServletModuleComment extends ServletModule
 {
-  private ModuleContent  moduleContent;
-
   private static ServletModuleComment instance = new ServletModuleComment();
   public static ServletModule getInstance() { return instance; }
 
   private ServletModuleComment() {
     logger = new LoggerWrapper("ServletModule.Comment");
     try {
-      mainModule = new ModuleComment(DatabaseComment.getInstance());
-      moduleContent = new ModuleContent(DatabaseContent.getInstance());
+      mainModule = new ModuleComment();
     }
     catch (Exception e) {
       logger.error("servletmodule comment could not be initialized:" + e.getMessage());
@@ -122,7 +108,7 @@ public class ServletModuleComment extends ServletModule
         comment = model.makeEntityAdapter("comment", mainModule.getById(anId));
       }
       else {
-        List fields = DatabaseComment.getInstance().getFields();
+        List fields = DatabaseComment.getInstance().getFieldNames();
         responseData.put("new", Boolean.TRUE);
         comment = new HashMap();
         Iterator i = fields.iterator();
@@ -201,7 +187,6 @@ public class ServletModuleComment extends ServletModule
     HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
     SQLQueryBuilder queryBuilder = new SQLQueryBuilder();
 
-    String queryField = "";
     String searchField = requestParser.getParameter("searchfield");
     String searchText = requestParser.getParameter("searchtext");
     String searchIsPublished = requestParser.getParameter("searchispublished");
@@ -259,12 +244,10 @@ public class ServletModuleComment extends ServletModule
 
     HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
     URLBuilder urlBuilder = new URLBuilder();
-    EntityAdapterModel model;
     int count;
 
     try {
       Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)});
-      model = MirGlobal.localizer().dataModel().adapterModel();
 
       Object commentList =
           new CachingRewindableIterator(
@@ -333,8 +316,6 @@ public class ServletModuleComment extends ServletModule
 
       Map withValues = getIntersectingValues(aRequest, DatabaseComment.getInstance());
 
-      String content_id = aRequest.getParameter("id");
-
       if (!withValues.containsKey("is_published"))
         withValues.put("is_published","0");
       if (!withValues.containsKey("is_html"))
@@ -349,7 +330,7 @@ public class ServletModuleComment extends ServletModule
       logAdminUsage(aRequest, id, "object modified");
 
       if (returnUrl!=null){
-        redirect(aResponse, returnUrl);
+        ServletHelper.redirect(aResponse, returnUrl);
       }
       else
         editObject(aRequest, aResponse, idParam);