projects
/
mir.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f159ad5
)
*** empty log message ***
author
tob
<tob>
Wed, 6 Feb 2002 01:33:34 +0000
(
01:33
+0000)
committer
tob
<tob>
Wed, 6 Feb 2002 01:33:34 +0000
(
01:33
+0000)
source/mircoders/servlet/ServletModuleContent.java
patch
|
blob
|
history
diff --git
a/source/mircoders/servlet/ServletModuleContent.java
b/source/mircoders/servlet/ServletModuleContent.java
index
85de290
..
156502b
100755
(executable)
--- a/
source/mircoders/servlet/ServletModuleContent.java
+++ b/
source/mircoders/servlet/ServletModuleContent.java
@@
-147,7
+147,11
@@
public class ServletModuleContent extends ServletModule
mergeData.put("is_published", "1");
String now = StringUtil.date2webdbDate(new GregorianCalendar());
mergeData.put("date", new SimpleScalar(now));
mergeData.put("is_published", "1");
String now = StringUtil.date2webdbDate(new GregorianCalendar());
mergeData.put("date", new SimpleScalar(now));
+ try {
mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList());
mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList());
+ } catch (ModuleException e) {
+ theLog.printError("themenPopupData could not be fetched.");
+ }
try {
mergeData.put("articletypePopupData", DatabaseArticleType.getInstance().getPopupData());
} catch (Exception e) {
try {
mergeData.put("articletypePopupData", DatabaseArticleType.getInstance().getPopupData());
} catch (Exception e) {
@@
-158,7
+162,11
@@
public class ServletModuleContent extends ServletModule
} catch (Exception e) {
theLog.printError("language-popup could not be fetched.");
}
} catch (Exception e) {
theLog.printError("language-popup could not be fetched.");
}
+ try {
mergeData.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList());
mergeData.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList());
+ } catch (ModuleException e) {
+ theLog.printError("schwerpunktPopupData could not be fetched.");
+ }
mergeData.put("login_user", user);
deliver(req, res, mergeData, templateObjektString);
}
mergeData.put("login_user", user);
deliver(req, res, mergeData, templateObjektString);
}
@@
-264,6
+272,10
@@
public class ServletModuleContent extends ServletModule
catch(ModuleException e) {
theLog.printError("smod content :: attach :: could not get entityContent");
}
catch(ModuleException e) {
theLog.printError("smod content :: attach :: could not get entityContent");
}
+ catch(StorageObjectException e) {
+ theLog.printError("smod content :: attach :: could not get entityContent");
+ }
+
_showObject(idParam, req, res);
}
_showObject(idParam, req, res);
}
@@
-281,6
+293,10
@@
public class ServletModuleContent extends ServletModule
catch(ModuleException e) {
theLog.printError("smod content :: dettach :: could not get entityContent");
}
catch(ModuleException e) {
theLog.printError("smod content :: dettach :: could not get entityContent");
}
+ catch(StorageObjectException e) {
+ theLog.printError("smod content :: dettach :: could not get entityContent");
+ }
+
_showObject(cidParam, req, res);
}
_showObject(cidParam, req, res);
}
@@
-295,6
+311,10
@@
public class ServletModuleContent extends ServletModule
catch(ModuleException e) {
theLog.printError("smod content :: newswire :: could not get entityContent");
}
catch(ModuleException e) {
theLog.printError("smod content :: newswire :: could not get entityContent");
}
+ catch(StorageObjectException e) {
+ theLog.printError("smod content :: dettach :: could not get entityContent");
+ }
+
list(req, res);
}
list(req, res);
}
@@
-442,7
+462,7
@@
public class ServletModuleContent extends ServletModule
String tinyIcon;
String iconAlt;
String tinyIcon;
String iconAlt;
- opList = HTMLTemplateProcessor.makeSimpleList(theList);
+
/*
opList = HTMLTemplateProcessor.makeSimpleList(theList);
for (int i=0; i < theList.size();i++) {
currentContent = (EntityContent)theList.elementAt(i);
for (int i=0; i < theList.size();i++) {
currentContent = (EntityContent)theList.elementAt(i);
@@
-468,7
+488,6
@@
public class ServletModuleContent extends ServletModule
* can we make getIdasInt() or can we just have
* another getId() that returns an Int and the VM
* will handle it transparantly? -mh
* can we make getIdasInt() or can we just have
* another getId() that returns an Int and the VM
* will handle it transparantly? -mh
- */
try {
mediaHandlerName = mediaType.getValue("classname");
mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName);
try {
mediaHandlerName = mediaType.getValue("classname");
mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName);
@@
-511,6
+530,7
@@
public class ServletModuleContent extends ServletModule
contentHash.put("icon_alt", iconAlt);
} catch (Exception e){}
}
contentHash.put("icon_alt", iconAlt);
} catch (Exception e){}
}
+*/
deliver(req, res, modelRoot, templateListString);
deliver(req, res, modelRoot, templateListString);