merged 1.1 branch into head

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

diff --git a/source/mircoders/servlet/ServletModuleHidden.java b/source/mircoders/servlet/ServletModuleHidden.java
index 0360630..bd93638 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleHidden.java
+++ b/source/mircoders/servlet/ServletModuleHidden.java
@@ -29,21 +29,17 @@
  */
 package mircoders.servlet;
 
-import mir.entity.adapter.EntityIteratorAdapter;
-import mir.log.LoggerWrapper;
-import mir.servlet.ServletModule;
+import mir.entity.adapter.EntityAdapterEngine;
+import mir.servlet.AdminServletModule;
 import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
-import mir.storage.StorageObjectFailure;
-import mir.util.CachingRewindableIterator;
 import mir.util.HTTPRequestParser;
 import mir.util.JDBCStringRoutines;
-import mircoders.global.MirGlobal;
 import mircoders.module.ModuleContent;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -51,54 +47,38 @@ import java.util.Map;
  *  ServletModuleHidden - output of so called "censored" articles
  *  @author mh
  *  @version $Id
- *
  */
 
-public class ServletModuleHidden extends ServletModule
-{
-  private static ServletModuleHidden instance = new ServletModuleHidden();
-  public static ServletModule getInstance() { return instance; }
-
-  private ServletModuleHidden() {
-    super();
-
-    logger = new LoggerWrapper("ServletModule.Hidden");
-
-    try {
-      mainModule = new ModuleContent();
-    }
-    catch (StorageObjectFailure e) {
-      logger.error("initialization of servletmoduleHidden failed: " + e.getMessage());
-    }
+public class ServletModuleHidden extends AdminServletModule {
+  public ServletModuleHidden() {
+    definition = "content";
+    mainModule = new ModuleContent();
   }
 
 
-  public void list(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc
-  {
-// determine parameter
-    HTTPRequestParser requestParser = new HTTPRequestParser(req);
-    Map responseData = ServletHelper.makeGenerationData(req, res, new Locale[] { getLocale(req), getFallbackLocale(req)});
+  public void list(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+    Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)});
 
-    String query_year = requestParser.getParameter("year");
-    String query_month = requestParser.getParameter("month");
+    String queryYear = requestParser.getParameter("year");
+    String queryMonth = requestParser.getParameter("month");
 
     try {
-      if ((query_year!=null && !query_year.equals("")) && (query_month!=null && !query_month.equals(""))) {
+      if ((queryYear !=null && !queryYear.equals("")) &&
+          (queryMonth !=null && !queryMonth.equals(""))) {
         String whereClause = "is_published=false AND webdb_create LIKE "+
-            "'"+JDBCStringRoutines.escapeStringLiteral(query_year)+"-"+JDBCStringRoutines.escapeStringLiteral(query_month)+"%'";
+            "'"+JDBCStringRoutines.escapeStringLiteral(queryYear)+"-"+
+               JDBCStringRoutines.escapeStringLiteral(queryMonth)+"%'";
+
 
-        Iterator articleList =
-            new CachingRewindableIterator(
-              new EntityIteratorAdapter( whereClause, "webdb_create", 100,
-                 MirGlobal.localizer().dataModel().adapterModel(), "content", -1, 0)
-        );
+        List articleList = EntityAdapterEngine.retrieveAdapterList(getModel(), definition, whereClause, "webdb_create", -1, 0);
 
-        responseData.put("year", query_year);
-        responseData.put("month", query_month);
+        responseData.put("year", queryYear);
+        responseData.put("month", queryMonth);
         responseData.put("articles", articleList);
       }
 
-      ServletHelper.generateResponse(res.getWriter(), responseData, listGenerator);
+      ServletHelper.generateResponse(aResponse.getWriter(), responseData, listGenerator);
     }
     catch (Throwable e) {
       throw new ServletModuleFailure(e);