fixes the problem Alster spotted ...

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

diff --git a/source/mircoders/servlet/ServletModuleHidden.java b/source/mircoders/servlet/ServletModuleHidden.java
index 2aa81ef..47c16bf 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleHidden.java
+++ b/source/mircoders/servlet/ServletModuleHidden.java
@@ -29,34 +29,29 @@
  */
 package mircoders.servlet;
 
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import mir.entity.adapter.EntityIteratorAdapter;
+import mir.entity.adapter.EntityAdapterEngine;
 import mir.log.LoggerWrapper;
 import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
-import mir.storage.StorageObjectFailure;
-import mir.util.CachingRewindableIterator;
+import mir.storage.DatabaseFailure;
 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.List;
+import java.util.Locale;
+import java.util.Map;
+
 /*
  *  ServletModuleHidden - output of so called "censored" articles
  *  @author mh
  *  @version $Id
- *
  */
 
-public class ServletModuleHidden extends ServletModule
-{
+public class ServletModuleHidden extends ServletModule {
   private static ServletModuleHidden instance = new ServletModuleHidden();
   public static ServletModule getInstance() { return instance; }
 
@@ -68,15 +63,13 @@ public class ServletModuleHidden extends ServletModule
     try {
       mainModule = new ModuleContent();
     }
-    catch (StorageObjectFailure e) {
+    catch (DatabaseFailure e) {
       logger.error("initialization of servletmoduleHidden failed: " + e.getMessage());
     }
   }
 
 
-  public void list(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc
-  {
-// determine parameter
+  public void list(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc {
     HTTPRequestParser requestParser = new HTTPRequestParser(req);
     Map responseData = ServletHelper.makeGenerationData(req, res, new Locale[] { getLocale(req), getFallbackLocale(req)});
 
@@ -88,11 +81,8 @@ public class ServletModuleHidden extends ServletModule
         String whereClause = "is_published=false AND webdb_create LIKE "+
             "'"+JDBCStringRoutines.escapeStringLiteral(query_year)+"-"+JDBCStringRoutines.escapeStringLiteral(query_month)+"%'";
 
-        Iterator articleList =
-            new CachingRewindableIterator(
-              new EntityIteratorAdapter( whereClause, "webdb_create", 100,
-                 MirGlobal.localizer().dataModel().adapterModel(), "content", -1, 0)
-        );
+
+        List articleList = EntityAdapterEngine.retrieveAdapterList(model, definition, whereClause, "webdb_create", -1, 0);
 
         responseData.put("year", query_year);
         responseData.put("month", query_month);