X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleHidden.java;h=f1d80021b56a44767a9e1c22349deedaffa1f74c;hb=a0e0629d9b38c2eb4eba6d9420ccbc6d1b44ab00;hp=e277ba1a06e3c7ca862ec2c9fd5520243717a6ff;hpb=8563841098b6ab3e6233f61519e58b41dcc30266;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleHidden.java b/source/mircoders/servlet/ServletModuleHidden.java
index e277ba1a..f1d80021 100755
--- a/source/mircoders/servlet/ServletModuleHidden.java
+++ b/source/mircoders/servlet/ServletModuleHidden.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,37 +18,30 @@
  * 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.
+ * the code of this program with  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.*;
-import java.sql.*;
-import java.util.*;
-import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import freemarker.template.*;
-
-import mir.servlet.*;
-import mir.module.*;
-import mir.misc.*;
-import mir.entity.*;
-import mir.storage.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import mir.entity.*;
-import mircoders.storage.*;
-import mircoders.module.*;
+import mir.entity.EntityList;
+import mir.log.LoggerWrapper;
+import mir.misc.HTMLTemplateProcessor;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleFailure;
+import mir.storage.StorageObjectFailure;
+import mircoders.module.ModuleContent;
+import mircoders.storage.DatabaseContent;
+import freemarker.template.SimpleHash;
 
 /*
  *  ServletModuleHidden - output of so called "censored" articles
@@ -60,70 +53,70 @@ import mircoders.module.*;
 public class ServletModuleHidden extends ServletModule
 {
 
-	// Singelton / Kontruktor
-	private static ServletModuleHidden instance = new ServletModuleHidden();
-	public static ServletModule getInstance() { return instance; }
-
-	private ServletModuleHidden() {
-		theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Hidden.Logfile"));
-		templateListString = MirConfig.getProp("ServletModule.Hidden.ListTemplate");
-		try {
-			mainModule = new ModuleContent(DatabaseContent.getInstance());
-		}
-		catch (StorageObjectException e) {
-			theLog.printError("servletmoduleHidden could not be initialized");
-		}
-	}
-
-
-	public void list(HttpServletRequest req, HttpServletResponse res)
-		throws ServletModuleException
-	{
-			// Parameter auswerten
-			SimpleHash mergeData = new SimpleHash();
-      String query_year = req.getParameter("year"); 
-      String query_month = req.getParameter("month"); 
-      String order = "webdb_create";
-
-			// sql basteln
-      String whereClause = "is_published=false AND webdb_create LIKE '"+
-                            query_year+"-"+query_month+"%'";
-
-			theLog.printDebugInfo("sql-whereclause: " + whereClause);
-
-			// fetch und ausliefern
-			try {
-
-				if ((query_year!=null && !query_year.equals("")) 
-            && (query_month!=null && !query_month.equals(""))) {
-          EntityList theList = mainModule.getByWhereClause(whereClause, order, -1);
-					if (theList!=null && theList.size()>0) {
-
-						//make articleHash for comment
-						StringBuffer buf= new StringBuffer("id in (");boolean first=true;
-						for(int i=0;i<theList.size();i++) {
-							if (first==false) buf.append(",");
-							first=false;
-							buf.append(theList.elementAt(i).getValue("to_media"));
-						}
-						buf.append(")");
-						SimpleHash articleHash =
-                HTMLTemplateProcessor.makeSimpleHash(
-                 mainModule.getByWhereClause(buf.toString(),-1));
-						mergeData.put("articleHash", articleHash);
-
-            // send the year and month for use in the list template
-            mergeData.put("year", query_year);
-            mergeData.put("month", query_month);
-						// get comment
-						mergeData.put("contentlist",theList);
-					}
-				}
-				// raus damit
-				HTMLTemplateProcessor.process(res, templateListString, mergeData, res.getWriter(), getLocale(req));
-			}
-			catch (ModuleException e) {throw new ServletModuleException(e.toString());}
-			catch (IOException e) {throw new ServletModuleException(e.toString());}
-			catch (Exception e) {throw new ServletModuleException(e.toString());}
-	}
+// Singelton / Kontruktor
+  private static ServletModuleHidden instance = new ServletModuleHidden();
+  public static ServletModule getInstance() { return instance; }
+
+  private ServletModuleHidden() {
+    super();
+    logger = new LoggerWrapper("ServletModule.Hidden");
+    templateListString = configuration.getString("ServletModule.Hidden.ListTemplate");
+    try {
+      mainModule = new ModuleContent(DatabaseContent.getInstance());
+    }
+    catch (StorageObjectFailure e) {
+      logger.error("initialization of servletmoduleHidden failed: " + e.getMessage());
+    }
+  }
+
+
+  public void list(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc
+  {
+// determine parameter
+    SimpleHash mergeData = new SimpleHash();
+    String query_year = req.getParameter("year");
+    String query_month = req.getParameter("month");
+    String order = "webdb_create";
+
+// form sql statement
+    String whereClause = "is_published=false AND webdb_create LIKE '"+
+                         query_year+"-"+query_month+"%'";
+
+    logger.debug("ServletModuleHidden.list: whereclause: " + whereClause);
+
+// fetch and deliver
+    try {
+
+      if ((query_year!=null && !query_year.equals(""))
+          && (query_month!=null && !query_month.equals(""))) {
+        EntityList theList = mainModule.getByWhereClause(whereClause, order, -1);
+        if (theList!=null && theList.size()>0) {
+
+//make articleHash for comment
+          StringBuffer buf= new StringBuffer("id in (");boolean first=true;
+          for(int i=0;i<theList.size();i++) {
+            if (first==false) buf.append(",");
+            first=false;
+            buf.append(theList.elementAt(i).getValue("to_media"));
+          }
+          buf.append(")");
+          SimpleHash articleHash =
+              HTMLTemplateProcessor.makeSimpleHash(
+              mainModule.getByWhereClause(buf.toString(),-1));
+          mergeData.put("articleHash", articleHash);
+
+// send the year and month for use in the list template
+          mergeData.put("year", query_year);
+          mergeData.put("month", query_month);
+// get comment
+          mergeData.put("contentlist",theList);
+        }
+      }
+// raus damit
+      HTMLTemplateProcessor.process(res, templateListString, mergeData, res.getWriter(), getLocale(req), getFallbackLocale(req));
+    }
+    catch (Throwable e) {
+      throw new ServletModuleFailure(e);
+    }
+  }
 }