there is still one none obvious use of makeSimpleHash in ServletModuleContent that needs to be taken #
care of.
bytes
n) CVS id, author stamps
o) make Entity implement freemarke TemplateModel (done, rk)
-p) don't use deprecated methods. specifically the SimpleList stuff
+p) don't use deprecated methods. specifically the SimpleList stuff (done, mh, rk)
New Features:
e) It should be possible to choose between direct and indirect open posting. (09/14/2001,
done, idfx).
g) "Upcoming Events"-include-file (ha)
-h) indymedia-links (fh)
+h) indymedia-links (done, fh)
i) objectStore (underway, -rk)
long sessionConnectTime = 0;
long startTime = (new java.util.Date()).getTime();
EntityContent currentContent;
- HashMap currentContentValues;
//get all new unproduced content-entities
String whereClause="is_produced='0' && to_article_type>0";
while (entityList != null) {
for(int i=0;i<entityList.size();i++) {
currentContent = (EntityContent)entityList.elementAt(i);
- currentContentValues = currentContent.getValues();
EntityList topicEntityList = DatabaseContentToTopics.getInstance().getTopics(currentContent);
SimpleHash topicHash = HTMLTemplateProcessor.makeSimpleHash(topicEntityList);
orderBy="date desc";
listTemplate = MirConfig.getProp("Producer.FeatureList.Template");
EntityList featureEntityList = featureModule.getByWhereClause("","title", -1);
- SimpleList featureList = HTMLTemplateProcessor.makeSimpleList(featureEntityList);
boolean first=true;
whereClause="is_published!=true AND to_article_type=0 AND id IN (";
for(int i=0; i < featureEntityList.size(); i++){
// get the imclinks
entityList = linksImcsModule.getByWhereClause("", "sortpriority, title", -1);
- SimpleList imcList = HTMLTemplateProcessor.makeSimpleList(entityList);
-
EntityList theParentList = linksImcsModule.getByWhereClause("to_parent_id=NULL", "sortpriority, title", -1);
- SimpleList parentList = HTMLTemplateProcessor.makeSimpleList(theParentList);
// put the informations into the navipagemodel
naviPageModel = new SimpleHash();
naviPageModel.put("topics", topicsModule.getTopicsList());
- naviPageModel.put("imclist", imcList);
- naviPageModel.put("parentlist", parentList);
+ naviPageModel.put("imclist", entityList);
+ naviPageModel.put("parentlist", theParentList);
htmlFileName = producerDocRoot + "/navigation.inc";
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()));
mergeData.put("articleHash", articleHash);
// get comment
- mergeData.put("contentlist",HTMLTemplateProcessor.makeSimpleList(theList));
+ mergeData.put("contentlist",theList);
mergeData.put("count", (new Integer(theList.getCount())).toString());
mergeData.put("from", (new Integer(theList.getFrom())).toString());
mergeData.put("to", (new Integer(theList.getTo())).toString());
// get the images
EntityList currentMedia = DatabaseContentToMedia.getInstance().getMedia(entContent);
if (currentMedia!=null && currentMedia.getCount()>=1) {
- SimpleList mediaList = HTMLTemplateProcessor.makeSimpleList(currentMedia);
- mergeData.put("to_media", mediaList);
+ mergeData.put("to_media", currentMedia);
}
String tinyIcon;
String iconAlt;
- opList = HTMLTemplateProcessor.makeSimpleList(theList);
-
for (int i=0; i < theList.size();i++) {
currentContent = (EntityContent)theList.elementAt(i);
//fetching/setting the images
//must of had a non-existant to_media_type entry..
//let's save our ass.
if (mediaType != null) {
- /*
- * grrr. why doesn't getId return an int! if It
- * did I could just compare the value of getId and
- * pick the biggest one. or is there
- * another way around this that I am missing?
- * 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{
//mediaList = HTMLTemplateProcessor.makeSimpleList(upMediaEntityList);
- contentHash = (SimpleHash)opList.get(i);
+ contentHash = (SimpleHash)theList.get(i);
contentHash.put("tiny_icon", imageRoot+"/"+tinyIcon);
contentHash.put("icon_alt", iconAlt);
} catch (Exception e){}
public class ServletModuleImages extends mir.servlet.ServletModule
{
- private static ModuleMediafolder mediafolderModule;
- private static DatabaseRights dbRights;
- private static DatabaseImageFormat dbImageFormat;
- private static DatabaseImageType dbImageType;
- private static DatabaseImageColor dbImageColor;
- private static DatabaseImageLayout dbImageLayout;
+ //private static DatabaseRights dbRights;
// Singelton / Kontruktor
private static ServletModuleImages instance = new ServletModuleImages();
templateConfirmString = MirConfig.getProp("ServletModule.Bilder.ConfirmTemplate");
try {
mainModule = new ModuleImages(DatabaseImages.getInstance());
- mediafolderModule = new ModuleMediafolder(DatabaseMediafolder.getInstance());
- dbRights = DatabaseRights.getInstance();
- dbImageFormat = DatabaseImageFormat.getInstance();
- dbImageColor = DatabaseImageColor.getInstance();
- dbImageType = DatabaseImageType.getInstance();
- dbImageLayout = DatabaseImageLayout.getInstance();
+ //dbRights = DatabaseRights.getInstance();
}
catch (StorageObjectException e) {
theLog.printDebugInfo("servletmodulebilder konnte nicht initialisiert werden");
// fetch und ausliefern
try {
- mergeData.put("mediafolderPopupData", mediafolderModule.getPopupData());
- mergeData.put("mediafolderHashdata", mediafolderModule.getHashData());
if (query_text!=null || query_is_published!=null || query_media_folder!=null) {
EntityList theList = mainModule.getByWhereClause(whereClause, order, (new Integer(offset)).intValue(),10);
if (theList != null) {
- 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()));
try {
SimpleHash mergeData = new SimpleHash();
mergeData.put("new", "1");
- mergeData.put("mediafolderPopupData", mediafolderModule.getPopupData());
deliver(req, res, mergeData, templateObjektString);
}
catch (Exception e) { throw new ServletModuleException(e.toString());}
private void _edit(String idParam, HttpServletRequest req, HttpServletResponse res) throws ServletModuleException {
if (idParam!=null && !idParam.equals("")) {
try {
- SimpleHash mergeData = HTMLTemplateProcessor.makeSimpleHash(mainModule.getById(idParam));
- mergeData.put("mediafolderPopupData", mediafolderModule.getPopupData());
- mergeData.put("rightsHashdata", dbRights.getHashData());
- mergeData.put("imgformatHashdata", dbImageFormat.getHashData());
- mergeData.put("imgcolorHashdata", dbImageColor.getHashData());
- mergeData.put("imgtypeHashdata", dbImageType.getHashData());
- mergeData.put("imglayoutHashdata", dbImageLayout.getHashData());
- deliver(req, res, mergeData, templateObjektString);
+ //mergeData.put("rightsHashdata", dbRights.getHashData());
+ deliver(req, res, mainModule.getById(idParam), templateObjektString);
}
catch (ModuleException e) { throw new ServletModuleException(e.toString());}
}
theLanguageList = languageModule.getByWhereClause(null, "name", 0);
modelRoot.put("new", "1");
- modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(theParentList));
- modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
+ modelRoot.put("parentlist",theParentList);
+ modelRoot.put("languagelist",theLanguageList);
if (theParentList == null || theParentList.getCount() == 0 || theParentList.getCount()>1){
HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateObjektString,
throw new ServletModuleException(e.toString());
} catch (IOException e) {
throw new ServletModuleException(e.toString());
- } catch(StorageObjectException e) {
- throw new ServletModuleException(e.toString());
}
}
theImcsList = mainModule.getByWhereClause(whereClause, "title", (new Integer(offset)).intValue());
theLanguageList = languageModule.getByWhereClause(null, "name", 0);
- modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(theParentList));
- modelRoot.put("imcslist",HTMLTemplateProcessor.makeSimpleList(theImcsList));
- modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
+ modelRoot.put("parentlist",theParentList);
+ modelRoot.put("imcslist",theImcsList);
+ modelRoot.put("languagelist",theLanguageList);
modelRoot.put("count", (new Integer(theImcsList.getCount())).toString());
modelRoot.put("from", (new Integer(theImcsList.getFrom())).toString());
modelRoot.put("to", (new Integer(theImcsList.getTo())).toString());
parentList = mainModule.getByWhereClause("to_parent_id=NULL", "title", offset, 1000);
theLanguageList = languageModule.getByWhereClause(null, "name", 0);
- modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(parentList));
- modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
+ modelRoot.put("parentlist",parentList);
+ modelRoot.put("languagelist",theLanguageList);
modelRoot.put("entity", mainModule.getById(idParam));
deliver(req, res, modelRoot, templateObjektString);
} catch(ModuleException e) {
throw new ServletModuleException(e.toString());
- } catch(StorageObjectException e) {
- throw new ServletModuleException(e.toString());
}
}
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()));