get rid of deprecated makeSimpleList and makeSimpleHash usage. this should be it...

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

diff --git a/source/mircoders/servlet/ServletModuleBreaking.java b/source/mircoders/servlet/ServletModuleBreaking.java
index aee475e..545c55f 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleBreaking.java
+++ b/source/mircoders/servlet/ServletModuleBreaking.java
@@ -30,16 +30,13 @@ public class ServletModuleBreaking extends ServletModule
 
        private ServletModuleBreaking() {
 
-               theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("ServletModule.Breaking.Logfile"));
-               templateListString = Configuration.getProperty("ServletModule.Breaking.ListTemplate");
-               templateObjektString = Configuration.getProperty("ServletModule.Breaking.ObjektTemplate");
-               templateConfirmString = Configuration.getProperty("ServletModule.Breaking.ConfirmTemplate");
+               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");
                try {
-      theLog.printDebugInfo("---- trying to get dbb");
       DatabaseBreaking dbb = DatabaseBreaking.getInstance();
-      theLog.printDebugInfo("---- got dbb");
                        mainModule = new ModuleBreaking(dbb);
-      theLog.printDebugInfo("---- got mod");
                }
                catch (StorageObjectException e) {
                        theLog.printDebugInfo("ServletModuleBreaking konnte nicht initialisiert werden");
@@ -57,7 +54,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()));
@@ -71,7 +68,7 @@ public class ServletModuleBreaking extends ServletModule
                                mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
 
                        // raus damit
-                       HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateListString, mergeData, res.getWriter());
+                       HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString, mergeData, res.getWriter());
                }
                catch (ModuleException e) {throw new ServletModuleException(e.toString());}
                catch (IOException e) {throw new ServletModuleException(e.toString());}