X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleBreaking.java;h=545c55fe53db7af48dbfbb301fef7d07cfd20fea;hb=4d55a2881c862bff5ad73c5272273904ab0d11f3;hp=aee475ee5a1a55eb5f0c393618712a107339e374;hpb=0df29361e484a602c907336ae33a3aded35f41db;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleBreaking.java b/source/mircoders/servlet/ServletModuleBreaking.java
index aee475ee..545c55fe 100755
--- 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());}