Mir goes GPL

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

diff --git a/source/mircoders/servlet/ServletModuleBreaking.java b/source/mircoders/servlet/ServletModuleBreaking.java
index 3ddb284..3c782c5 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleBreaking.java
+++ b/source/mircoders/servlet/ServletModuleBreaking.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * 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.
+ */
+
 package mircoders.servlet;
 
 import java.io.*;
@@ -30,7 +61,7 @@ public class ServletModuleBreaking extends ServletModule
 
        private ServletModuleBreaking() {
 
-               theLog = Logfile.getInstance(this.getClass().getName());
+               theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Breaking.Logfile"));
                templateListString = MirConfig.getProp("ServletModule.Breaking.ListTemplate");
                templateObjektString = MirConfig.getProp("ServletModule.Breaking.ObjektTemplate");
                templateConfirmString = MirConfig.getProp("ServletModule.Breaking.ConfirmTemplate");
@@ -54,7 +85,7 @@ public class ServletModuleBreaking extends ServletModule
                        if (offset==null || offset.equals("")) offset="0";
                        mergeData.put("offset",offset);
                        EntityList theList = mainModule.getByWhereClause(null, "webdb_create desc", (new Integer(offset)).intValue());
-                       mergeData.put("contentlist",HTMLTemplateProcessor.makeSimpleList(theList));
+                       mergeData.put("contentlist",theList);
                        if(theList.getOrder()!=null) {
                                mergeData.put("order", theList.getOrder());
                                mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
@@ -68,26 +99,10 @@ public class ServletModuleBreaking extends ServletModule
                                mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
 
                        // raus damit
-                       HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString, mergeData, res.getWriter());
+                       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());}
        }
-
-
-
-  // test: deriving entity from freemarker.template.TemplateHashModel
-  //////////////////////////////////////////////////////////////////////////////
-
-  public void edit(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException {
-    try {
-      theLog.printDebugInfo("getting a breaking news");
-      String idParam = req.getParameter("id");
-      deliver(req, res, (TemplateModelRoot)mainModule.getById(idParam), templateObjektString);
-    } catch(ModuleException e) {
-      throw new ServletModuleException(e.toString());
-    }
-  }
 }