X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleContent.java;h=ce22cc1629845a795225b975987f62adfc0d55c9;hb=831225b6a524c40cb4f1db71a0c53297eefd8234;hp=9d543499132f203a1ff7cf7a1f984e34437cefdc;hpb=c785369f4ca9b7a6b295464041c14206c6db84bf;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java
index 9d543499..ce22cc16 100755
--- a/source/mircoders/servlet/ServletModuleContent.java
+++ b/source/mircoders/servlet/ServletModuleContent.java
@@ -34,7 +34,6 @@ public class ServletModuleContent extends ServletModule
 
   static ModuleTopics         themenModule;
   static ModuleSchwerpunkt    schwerpunktModule;
-  static ModuleGruppen        gruppenModule;
   static ModuleImages         imageModule;
 
   static String templateOpString;
@@ -46,15 +45,14 @@ public class ServletModuleContent extends ServletModule
 
   private ServletModuleContent() {
     try {
-      theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("ServletModule.Content.Logfile"));
-      templateListString = Configuration.getProperty("ServletModule.Content.ListTemplate");
-      templateOpString = Configuration.getProperty("ServletModule.Content.OpTemplate");
-      templateObjektString = Configuration.getProperty("ServletModule.Content.ObjektTemplate");
-      templateConfirmString = Configuration.getProperty("ServletModule.Content.ConfirmTemplate");
+      theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Content.Logfile"));
+      templateListString = MirConfig.getProp("ServletModule.Content.ListTemplate");
+      templateOpString = MirConfig.getProp("ServletModule.Content.OpTemplate");
+      templateObjektString = MirConfig.getProp("ServletModule.Content.ObjektTemplate");
+      templateConfirmString = MirConfig.getProp("ServletModule.Content.ConfirmTemplate");
       mainModule = new ModuleContent(DatabaseContent.getInstance());
       themenModule = new ModuleTopics(DatabaseTopics.getInstance());
       schwerpunktModule = new ModuleSchwerpunkt(DatabaseFeature.getInstance());
-      gruppenModule = new ModuleGruppen(DatabaseGroups.getInstance());
       imageModule = new ModuleImages(DatabaseImages.getInstance());
     } catch (StorageObjectException e) {
       theLog.printDebugInfo("servletmodulecontent konnte nicht initialisiert werden");
@@ -148,20 +146,28 @@ public class ServletModuleContent extends ServletModule
     mergeData.put("is_published", "1");
     String now = StringUtil.date2webdbDate(new GregorianCalendar());
     mergeData.put("date", new SimpleScalar(now));
-    mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList());
-    mergeData.put("gruppenPopupData", gruppenModule.getGruppenAsSimpleList());
+    try {
+      mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList());
+    } catch (ModuleException e) {
+      theLog.printError("cannot get topics as simple list.");
+      throw new ServletModuleException(e.toString());
+    }
     try {
       mergeData.put("articletypePopupData", DatabaseArticleType.getInstance().getPopupData());
     } catch (Exception e) {
       theLog.printError("articletype could not be fetched.");
+      throw new ServletModuleException("articletype could not be fetched: "
+      +e.toString());
     }
     try {
       mergeData.put("languagePopupData", DatabaseLanguage.getInstance().getPopupData());
+      mergeData.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList());
     } catch (Exception e) {
-      theLog.printError("language-popup could not be fetched.");
+      theLog.printError("language-popup or scwerpunk list could not be fetched.");
+      throw new ServletModuleException("language/schwerpunkt list could not be fetched.: "
+        +e.toString());
     }
-    mergeData.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList());
-    mergeData.put("login_user", HTMLTemplateProcessor.makeSimpleHash(user));
+    mergeData.put("login_user", user);
     deliver(req, res, mergeData, templateObjektString);
   }
 
@@ -254,12 +260,12 @@ public class ServletModuleContent extends ServletModule
     String  mediaIdParam = req.getParameter("mid");
     String  idParam = req.getParameter("cid");
     if (idParam == null||mediaIdParam==null) throw new ServletModuleException("smod content :: attach :: cid/mid missing");
-    
+
     try {
       EntityContent entContent = (EntityContent)mainModule.getById(idParam);
       entContent.attach(mediaIdParam);
     }
-    catch(ModuleException e) {
+    catch(Exception e) {
       theLog.printError("smod content :: attach :: could not get entityContent");
     }
     _showObject(idParam, req, res);
@@ -271,12 +277,12 @@ public class ServletModuleContent extends ServletModule
 		String  midParam = req.getParameter("mid");
     if (cidParam == null) throw new ServletModuleException("smod content :: dettach :: cid missing");
     if (midParam == null) throw new ServletModuleException("smod content :: dettach :: mid missing");
-    
+
     try {
       EntityContent entContent = (EntityContent)mainModule.getById(cidParam);
       entContent.dettach(cidParam,midParam);
     }
-    catch(ModuleException e) {
+    catch(Exception e) {
       theLog.printError("smod content :: dettach :: could not get entityContent");
     }
     _showObject(cidParam, req, res);
@@ -290,8 +296,9 @@ public class ServletModuleContent extends ServletModule
       EntityContent entContent = (EntityContent)mainModule.getById(idParam);
       entContent.newswire();
     }
-    catch(ModuleException e) {
+    catch(Exception e) {
       theLog.printError("smod content :: newswire :: could not get entityContent");
+      throw new ServletModuleException("smod content :: newswire :: could not get entityContent"+e.toString());
     }
     list(req, res);
   }
@@ -352,7 +359,7 @@ public class ServletModuleContent extends ServletModule
       SimpleHash mergeData =  HTMLTemplateProcessor.makeSimpleHash(entContent);
       EntityList topicToContent = DatabaseContentToTopics.getInstance().getTopics(entContent);
       if (topicToContent!=null && topicToContent.size()>0){
-        theLog.printDebugInfo("topicanzahl: "+topicToContent.size());
+        //theLog.printDebugInfo("topicanzahl: "+topicToContent.size());
         Entity topics = null;
         SimpleList topicList = new SimpleList();
         for(int i=0;i<topicToContent.size();i++){
@@ -364,7 +371,6 @@ public class ServletModuleContent extends ServletModule
       //obsolete, because of psqgl 7.1.x
       //mergeData.put("content_data", entContent.getContentData());
       mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList());
-      mergeData.put("gruppenPopupData", gruppenModule.getGruppenAsSimpleList());
       try {
         mergeData.put("articletypePopupData", DatabaseArticleType.getInstance().getPopupData());
       } catch (Exception e) {
@@ -383,14 +389,13 @@ public class ServletModuleContent extends ServletModule
       }
 
 
-      //mergeData.put("gruppenHashData", gruppenModule.getHashData());
       mergeData.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList());
       // hier code um zur liste zurueckzukommen
       String offsetParam, whereParam, orderParam;
       if ((offsetParam = req.getParameter("offset"))!=null) mergeData.put("offset", offsetParam);
       if ((whereParam = req.getParameter("where"))!=null) mergeData.put("where", whereParam);
       if ((orderParam = req.getParameter("order"))!=null) mergeData.put("order", orderParam);
-      mergeData.put("login_user", HTMLTemplateProcessor.makeSimpleHash(_getUser(req)));
+      mergeData.put("login_user", _getUser(req));
       deliver(req, res, mergeData, templateObjektString);
     } catch (Exception e) {
       throw new ServletModuleException(e.toString());
@@ -407,7 +412,6 @@ public class ServletModuleContent extends ServletModule
         SimpleHash modelRoot = HTMLTemplateProcessor.makeSimpleHashWithEntitylistInfos(theList);
         modelRoot.put("themenHashData", themenModule.getHashData());
         modelRoot.put("schwerpunktHashData", schwerpunktModule.getHashData());
-        modelRoot.put("gruppenHashData", gruppenModule.getHashData());
         modelRoot.put("articletypeHash", DatabaseArticleType.getInstance().getHashData());
         deliver(req, res, modelRoot, templateListString);
       } else  { // count = 1
@@ -422,11 +426,10 @@ public class ServletModuleContent extends ServletModule
     throws ServletModuleException {
 
     try {
-      // hier dann htmlcode rausschreiben
+      // delivering html
       if (theList == null || theList.getCount() == 0 || theList.getCount()>1) {
         SimpleHash modelRoot = HTMLTemplateProcessor.makeSimpleHashWithEntitylistInfos(theList);
         modelRoot.put("articletypeHash", DatabaseArticleType.getInstance().getHashData());
-        modelRoot.put("gruppenHashData", gruppenModule.getHashData());
         deliver(req, res, modelRoot, templateListString);
       } else  { // count = 1
         _showObject(theList.elementAt(0).getId(), req, res);