From d4b09f3c9ce5f22936748ff38e21200ece577433 Mon Sep 17 00:00:00 2001 From: idfx Date: Fri, 31 Aug 2001 00:22:09 +0000 Subject: [PATCH] bugfixx: numberformatexception at deleting a topic, an some other small bugfixes. --- source/mir/servlet/ServletModule.java | 22 +- source/mircoders/servlet/ServletModuleContent.java | 766 +++++++++++---------- .../mircoders/storage/DatabaseContentToTopics.java | 384 ++++++----- 3 files changed, 591 insertions(+), 581 deletions(-) diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java index 9dbfbdb5..0ac4a6cb 100755 --- a/source/mir/servlet/ServletModule.java +++ b/source/mir/servlet/ServletModule.java @@ -72,26 +72,27 @@ public abstract class ServletModule { try { EntityList theList; String offsetParam = req.getParameter("offset"); - int offset; + int offset=0; PrintWriter out = res.getWriter(); // hier offsetcode bearbeiten - if (offsetParam != null || !offsetParam.equals("")){ + if (offsetParam != null && !offsetParam.equals("")){ offset = Integer.parseInt(offsetParam); - } else { - offset = 0; } - if (req.getParameter("next") != null) + if (req.getParameter("next") != null){ offset=Integer.parseInt(req.getParameter("nextoffset")); - else - if (req.getParameter("prev") != null) + } else { + if (req.getParameter("prev") != null){ offset = Integer.parseInt(req.getParameter("prevoffset")); + } + } theList = mainModule.getByWhereClause(null, offset); //theList = mainModule.getByWhereClause((String)null, offset); - if (theList == null || theList.getCount() == 0 || theList.getCount()>1) + if (theList == null || theList.getCount() == 0 || theList.getCount()>1){ HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateListString, theList, out); - else + } else { deliver(req, res, theList.elementAt(0), templateObjektString); + } } catch (Exception e) { throw new ServletModuleException(e.toString()); } @@ -131,7 +132,8 @@ public abstract class ServletModule { HashMap withValues = getIntersectingValues(req, mainModule.getStorageObject()); String id = mainModule.add(withValues); // theLog.printDebugInfo("--trying to deliver..."+id); - deliver(req, res, mainModule.getById(id), templateObjektString); + list(req,res); + //deliver(req, res, mainModule.getById(id), templateObjektString); } catch (Exception e) { throw new ServletModuleException(e.toString());} } diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java index a4e04658..7b46a8fc 100755 --- a/source/mircoders/servlet/ServletModuleContent.java +++ b/source/mircoders/servlet/ServletModuleContent.java @@ -32,309 +32,316 @@ import mircoders.entity.*; public class ServletModuleContent extends ServletModule { - static ModuleTopics themenModule; - static ModuleSchwerpunkt schwerpunktModule; - static ModuleGruppen gruppenModule; - static ModuleImages imageModule; - - static String templateOpString; - - // Singelton / Kontruktor - - private static ServletModuleContent instance = new ServletModuleContent(); - public static ServletModule getInstance() { return instance; } - - 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"); - 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"); - } - } - - // Methoden - - public void list(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException - { - try { - EntityUsers user = _getUser(req); - EntityList theList; - String offsetParam = req.getParameter("offset"); - int offset =0; - - // hier offsetcode bearbeiteb - if (offsetParam != null && !offsetParam.equals("")) - offset = Integer.parseInt(offsetParam); - - if (req.getParameter("next") != null) - offset=Integer.parseInt(req.getParameter("nextoffset")); - else - if (req.getParameter("prev") != null) - offset = Integer.parseInt(req.getParameter("prevoffset")); - - String whereParam = req.getParameter("where"); - String orderParam = req.getParameter("order"); - - theList = ((ModuleContent)mainModule).getContent(whereParam, orderParam, offset, user); - _list(theList, req, res); - } catch (ModuleException e) { - throw new ServletModuleException(e.toString()); - } - } - - public void listop(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException - { - try { - EntityUsers user = _getUser(req); - EntityList theList; - String offsetParam = req.getParameter("offset"); - int offset =0; - - String whereParam = req.getParameter("where"); - - if (whereParam==null) whereParam = "to_article_type='0'"; - - // hier offsetcode bearbeiteb - if (offsetParam != null && !offsetParam.equals("")) - offset = Integer.parseInt(offsetParam); - - if (req.getParameter("next") != null) - offset=Integer.parseInt(req.getParameter("nextoffset")); - else - if (req.getParameter("prev") != null) - offset = Integer.parseInt(req.getParameter("prevoffset")); - - String orderParam = req.getParameter("order"); - - theList = ((ModuleContent)mainModule).getContent(whereParam, orderParam, offset, user); - _list(theList, req, res); - } catch (ModuleException e) { - throw new ServletModuleException(e.toString()); - } - } - - - public void search(HttpServletRequest req, HttpServletResponse res) - throws ServletModuleException { - try { - EntityUsers user = _getUser(req); - EntityList theList; - String fieldParam = req.getParameter("field"); - String fieldValueParam = req.getParameter("fieldvalue"); - String orderParam = req.getParameter("order"); - - theList = ((ModuleContent)mainModule).getContentByField(fieldParam, fieldValueParam, orderParam, 0, user); - _list(theList, req, res); - } catch (ModuleException e) { - throw new ServletModuleException(e.toString()); - } - } - - public void add(HttpServletRequest req, HttpServletResponse res) - throws ServletModuleException { - - EntityUsers user = _getUser(req); - SimpleHash mergeData = new SimpleHash(); - mergeData.put("new", "1"); - 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("articletypePopupData", DatabaseArticleType.getInstance().getPopupData()); - } catch (Exception e) {theLog.printError("articletype could not be fetched.");} - //mergeData.put("gruppenHashData", gruppenModule.getHashData()); - mergeData.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList()); - mergeData.put("login_user", HTMLTemplateProcessor.makeSimpleHash(user)); - deliver(req, res, mergeData, templateObjektString); - } - - - public void insert(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException - { - //theLog.printDebugInfo(":: content :: trying to insert"); - try { - EntityUsers user = _getUser(req); - HashMap withValues = getIntersectingValues(req, DatabaseContent.getInstance()); - //theLog.printDebugInfo(":: content :: got intersecting values"); - String now = StringUtil.date2webdbDate(new GregorianCalendar()); - withValues.put("date", now); - withValues.put("publish_path", StringUtil.webdbDate2path(now)); - withValues.put("to_publisher", user.getId()); - withValues.put("is_produced", "0"); - if (!withValues.containsKey("is_published")) - withValues.put("is_published","0"); - if (!withValues.containsKey("is_html")) - withValues.put("is_html","0"); - if (withValues.get("creator").toString().equals("")) - withValues.put("creator","Anonym"); - String id = mainModule.add(withValues); - DatabaseContentToTopics.getInstance().setTopics(id,req.getParameterValues("to_topic")); - //theLog.printDebugInfo(":: content :: inserted"); - _showObject(id, req, res); - } - catch (StorageObjectException e) { throw new ServletModuleException(e.toString());} - catch (ModuleException e) { throw new ServletModuleException(e.toString());} - } - - public void delete(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException - { - - EntityUsers user = _getUser(req); - // hier pruefen ob dem akt. user loeschen erlaubt ist... - String idParam = req.getParameter("id"); - if (idParam == null) throw new ServletModuleException("Falscher Aufruf: (id) nicht angegeben"); - - String confirmParam = req.getParameter("confirm"); - String cancelParam = req.getParameter("cancel"); - - if (confirmParam == null && cancelParam == null) { - // HTML Ausgabe zum Confirmen! - SimpleHash mergeData = new SimpleHash(); - mergeData.put("module", "Content"); - mergeData.put("infoString", "Content: " + idParam); - mergeData.put("id", idParam); - mergeData.put("where", req.getParameter("where")); - mergeData.put("order", req.getParameter("order")); - mergeData.put("offset", req.getParameter("offset")); - deliver(req, res, mergeData, templateConfirmString); - } - else { - if (confirmParam!= null && !confirmParam.equals("")) { - try { - mainModule.deleteById(idParam); - //delete rows in the content_x_topic-table - DatabaseContentToTopics.getInstance().deleteByContentId(idParam); - //delete rows in the comment-table - DatabaseComment.getInstance().deleteByContentId(idParam); - } catch (ModuleException e) { - throw new ServletModuleException(e.toString()); - } catch (StorageObjectException e) { - throw new ServletModuleException(e.toString()); - } - list(req,res); - } - else { - // Datensatz anzeigen - _showObject(idParam, req, res); - } - } - } - - public void edit(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException - { - String idParam = req.getParameter("id"); - if (idParam == null) throw new ServletModuleException("Falscher Aufruf: (id) nicht angegeben"); - _showObject(idParam, req, res); - } - - // methods for attaching media file - public void attach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException - { - 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) { - theLog.printError("smod content :: attach :: could not get entityContent"); - } - _showObject(idParam, req, res); - } - - public void dettach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException - { - String idParam = req.getParameter("cid"); - if (idParam == null) throw new ServletModuleException("smod content :: dettach :: cid missing"); - try { - EntityContent entContent = (EntityContent)mainModule.getById(idParam); - entContent.dettach(); - } - catch(ModuleException e) { - theLog.printError("smod content :: dettach :: could not get entityContent"); - } - _showObject(idParam, req, res); - } - - public void newswire(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException - { - String idParam = req.getParameter("id"); - if (idParam == null) throw new ServletModuleException("smod content :: newswire :: id missing"); - try { - EntityContent entContent = (EntityContent)mainModule.getById(idParam); - entContent.newswire(); - } - catch(ModuleException e) { - theLog.printError("smod content :: newswire :: could not get entityContent"); - } - list(req, res); - } - - - public void update(HttpServletRequest req, HttpServletResponse res) - throws ServletModuleException - { - try { - - EntityUsers user = _getUser(req); - if (user==null) theLog.printDebugInfo("user null!"); - String idParam = req.getParameter("id"); - if (idParam == null) throw new ServletModuleException("Falscher Aufruf: (id) nicht angegeben"); - - HashMap withValues = getIntersectingValues(req, DatabaseContent.getInstance()); - //String topic_id = req.getParameter("to_topic"); - String[] topic_id = req.getParameterValues("to_topic"); - String content_id = req.getParameter("id"); - // withValues.put("publish_path", StringUtil.webdbDate2path((String)withValues.get("date"))); - if(user != null) withValues.put("user_id", user.getId()); - withValues.put("is_produced", "0"); - if (!withValues.containsKey("is_published")) - withValues.put("is_published","0"); - if (!withValues.containsKey("is_html")) - withValues.put("is_html","0"); - if (withValues.get("creator").toString().equals("")) - withValues.put("creator","Anonym"); - //theLog.printDebugInfo("updating. "); - String id = mainModule.set(withValues); - DatabaseContentToTopics.getInstance().setTopics(req.getParameter("id"),topic_id); - //theLog.printDebugInfo("update done. "); - String whereParam = req.getParameter("where"); - String orderParam = req.getParameter("order"); - if ((whereParam!=null && !whereParam.equals("")) || (orderParam!=null && !orderParam.equals(""))){ - //theLog.printDebugInfo("update to list"); - list(req,res); - } - else - _showObject(idParam, req, res); - } - catch (StorageObjectException e) { throw new ServletModuleException(e.toString());} - catch (ModuleException e) { throw new ServletModuleException(e.toString());} - } - - // - // Hilfsmethoden - - private void _showObject(String id, HttpServletRequest req, HttpServletResponse res) - throws ServletModuleException { - - try { - EntityContent entContent=(EntityContent)mainModule.getById(id); - SimpleHash mergeData = HTMLTemplateProcessor.makeSimpleHash(entContent); - EntityList topicToContent = DatabaseContentToTopics.getInstance().getTopics(entContent); - if (topicToContent!=null && topicToContent.size()>0){ + static ModuleTopics themenModule; + static ModuleSchwerpunkt schwerpunktModule; + static ModuleGruppen gruppenModule; + static ModuleImages imageModule; + + static String templateOpString; + + // Singelton / Kontruktor + + private static ServletModuleContent instance = new ServletModuleContent(); + public static ServletModule getInstance() { return instance; } + + 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"); + 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"); + } + } + + // Methoden + + public void list(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException + { + try { + EntityUsers user = _getUser(req); + EntityList theList; + String offsetParam = req.getParameter("offset"); + int offset =0; + + // hier offsetcode bearbeiteb + if (offsetParam != null && !offsetParam.equals("")) + offset = Integer.parseInt(offsetParam); + + if (req.getParameter("next") != null) + offset=Integer.parseInt(req.getParameter("nextoffset")); + else + if (req.getParameter("prev") != null) + offset = Integer.parseInt(req.getParameter("prevoffset")); + + String whereParam = req.getParameter("where"); + String orderParam = req.getParameter("order"); + + theList = ((ModuleContent)mainModule).getContent(whereParam, orderParam, offset, user); + _list(theList, req, res); + } catch (ModuleException e) { + throw new ServletModuleException(e.toString()); + } + } + + public void listop(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException + { + try { + EntityUsers user = _getUser(req); + EntityList theList; + String offsetParam = req.getParameter("offset"); + int offset =0; + + String whereParam = req.getParameter("where"); + + if (whereParam==null) whereParam = "to_article_type='0'"; + + // hier offsetcode bearbeiteb + if (offsetParam != null && !offsetParam.equals("")) + offset = Integer.parseInt(offsetParam); + + if (req.getParameter("next") != null) + offset=Integer.parseInt(req.getParameter("nextoffset")); + else + if (req.getParameter("prev") != null) + offset = Integer.parseInt(req.getParameter("prevoffset")); + + String orderParam = req.getParameter("order"); + + theList = ((ModuleContent)mainModule).getContent(whereParam, orderParam, offset, user); + _list(theList, req, res); + } catch (ModuleException e) { + throw new ServletModuleException(e.toString()); + } + } + + + public void search(HttpServletRequest req, HttpServletResponse res) + throws ServletModuleException { + try { + EntityUsers user = _getUser(req); + EntityList theList; + String fieldParam = req.getParameter("field"); + String fieldValueParam = req.getParameter("fieldvalue"); + String orderParam = req.getParameter("order"); + + theList = ((ModuleContent)mainModule).getContentByField(fieldParam, fieldValueParam, orderParam, 0, user); + _list(theList, req, res); + } catch (ModuleException e) { + throw new ServletModuleException(e.toString()); + } + } + + public void add(HttpServletRequest req, HttpServletResponse res) + throws ServletModuleException { + + EntityUsers user = _getUser(req); + SimpleHash mergeData = new SimpleHash(); + mergeData.put("new", "1"); + 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("articletypePopupData", DatabaseArticleType.getInstance().getPopupData()); + } catch (Exception e) {theLog.printError("articletype could not be fetched.");} + //mergeData.put("gruppenHashData", gruppenModule.getHashData()); + mergeData.put("schwerpunktPopupData", schwerpunktModule.getSchwerpunktAsSimpleList()); + mergeData.put("login_user", HTMLTemplateProcessor.makeSimpleHash(user)); + deliver(req, res, mergeData, templateObjektString); + } + + + public void insert(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException + { + //theLog.printDebugInfo(":: content :: trying to insert"); + try { + EntityUsers user = _getUser(req); + HashMap withValues = getIntersectingValues(req, DatabaseContent.getInstance()); + //theLog.printDebugInfo(":: content :: got intersecting values"); + String now = StringUtil.date2webdbDate(new GregorianCalendar()); + withValues.put("date", now); + withValues.put("publish_path", StringUtil.webdbDate2path(now)); + withValues.put("to_publisher", user.getId()); + withValues.put("is_produced", "0"); + if (!withValues.containsKey("is_published")) + withValues.put("is_published","0"); + if (!withValues.containsKey("is_html")) + withValues.put("is_html","0"); + if (withValues.get("creator").toString().equals("")) + withValues.put("creator","Anonym"); + String id = mainModule.add(withValues); + DatabaseContentToTopics.getInstance().setTopics(id,req.getParameterValues("to_topic")); + //theLog.printDebugInfo(":: content :: inserted"); + _showObject(id, req, res); + } + catch (StorageObjectException e) { + throw new ServletModuleException(e.toString()); + } + catch (ModuleException e) { + throw new ServletModuleException(e.toString()); + } + } + + public void delete(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException + { + + EntityUsers user = _getUser(req); + // hier pruefen ob dem akt. user loeschen erlaubt ist... + String idParam = req.getParameter("id"); + if (idParam == null) throw new ServletModuleException("Falscher Aufruf: (id) nicht angegeben"); + + String confirmParam = req.getParameter("confirm"); + String cancelParam = req.getParameter("cancel"); + + if (confirmParam == null && cancelParam == null) { + // HTML Ausgabe zum Confirmen! + SimpleHash mergeData = new SimpleHash(); + mergeData.put("module", "Content"); + mergeData.put("infoString", "Content: " + idParam); + mergeData.put("id", idParam); + mergeData.put("where", req.getParameter("where")); + mergeData.put("order", req.getParameter("order")); + mergeData.put("offset", req.getParameter("offset")); + deliver(req, res, mergeData, templateConfirmString); + } + else { + if (confirmParam!= null && !confirmParam.equals("")) { + try { + mainModule.deleteById(idParam); + //delete rows in the content_x_topic-table + DatabaseContentToTopics.getInstance().deleteByContentId(idParam); + //delete rows in the comment-table + DatabaseComment.getInstance().deleteByContentId(idParam); + } catch (ModuleException e) { + throw new ServletModuleException(e.toString()); + } catch (StorageObjectException e) { + throw new ServletModuleException(e.toString()); + } + list(req,res); + } + else { + // Datensatz anzeigen + _showObject(idParam, req, res); + } + } + } + + public void edit(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException + { + String idParam = req.getParameter("id"); + if (idParam == null) throw new ServletModuleException("Falscher Aufruf: (id) nicht angegeben"); + _showObject(idParam, req, res); + } + + // methods for attaching media file + public void attach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException + { + 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) { + theLog.printError("smod content :: attach :: could not get entityContent"); + } + _showObject(idParam, req, res); + } + + public void dettach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException + { + String idParam = req.getParameter("cid"); + if (idParam == null) throw new ServletModuleException("smod content :: dettach :: cid missing"); + try { + EntityContent entContent = (EntityContent)mainModule.getById(idParam); + entContent.dettach(); + } + catch(ModuleException e) { + theLog.printError("smod content :: dettach :: could not get entityContent"); + } + _showObject(idParam, req, res); + } + + public void newswire(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException + { + String idParam = req.getParameter("id"); + if (idParam == null) throw new ServletModuleException("smod content :: newswire :: id missing"); + try { + EntityContent entContent = (EntityContent)mainModule.getById(idParam); + entContent.newswire(); + } + catch(ModuleException e) { + theLog.printError("smod content :: newswire :: could not get entityContent"); + } + list(req, res); + } + + + public void update(HttpServletRequest req, HttpServletResponse res) + throws ServletModuleException + { + try { + + EntityUsers user = _getUser(req); + if (user==null) theLog.printDebugInfo("user null!"); + String idParam = req.getParameter("id"); + if (idParam == null) throw new ServletModuleException("Falscher Aufruf: (id) nicht angegeben"); + + HashMap withValues = getIntersectingValues(req, DatabaseContent.getInstance()); + //String topic_id = req.getParameter("to_topic"); + String[] topic_id = req.getParameterValues("to_topic"); + String content_id = req.getParameter("id"); + // withValues.put("publish_path", StringUtil.webdbDate2path((String)withValues.get("date"))); + if(user != null) withValues.put("user_id", user.getId()); + withValues.put("is_produced", "0"); + if (!withValues.containsKey("is_published")) + withValues.put("is_published","0"); + if (!withValues.containsKey("is_html")) + withValues.put("is_html","0"); + if (withValues.get("creator").toString().equals("")) + withValues.put("creator","Anonym"); + //theLog.printDebugInfo("updating. "); + String id = mainModule.set(withValues); + DatabaseContentToTopics.getInstance().setTopics(req.getParameter("id"),topic_id); + //theLog.printDebugInfo("update done. "); + String whereParam = req.getParameter("where"); + String orderParam = req.getParameter("order"); + if ((whereParam!=null && !whereParam.equals("")) || (orderParam!=null && !orderParam.equals(""))){ + //theLog.printDebugInfo("update to list"); + list(req,res); + } + else + _showObject(idParam, req, res); + } + catch (StorageObjectException e) { + throw new ServletModuleException(e.toString()); + } + catch (ModuleException e) { + throw new ServletModuleException(e.toString()); + } + } + + // + // Hilfsmethoden + + private void _showObject(String id, HttpServletRequest req, HttpServletResponse res) + throws ServletModuleException { + + try { + EntityContent entContent=(EntityContent)mainModule.getById(id); + SimpleHash mergeData = HTMLTemplateProcessor.makeSimpleHash(entContent); + EntityList topicToContent = DatabaseContentToTopics.getInstance().getTopics(entContent); + if (topicToContent!=null && topicToContent.size()>0){ theLog.printDebugInfo("topicanzahl: "+topicToContent.size()); Entity topics = null; SimpleList topicList = new SimpleList(); @@ -342,83 +349,82 @@ public class ServletModuleContent extends ServletModule topics = (EntityTopics)topicToContent.elementAt(i); topicList.add(topics.getId()); } - mergeData.put("to_topic",topicList); - } - //obsolete, because of psqgl 7.1.x + mergeData.put("to_topic",topicList); + } + //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) {theLog.printError("articletype could not be fetched.");} - - // get the images - String currentMediaId = entContent.getValue("to_media"); - SimpleHash imageHash = new SimpleHash(); - if (currentMediaId!=null && !currentMediaId.equals("")) { - imageHash.put(currentMediaId, HTMLTemplateProcessor.makeSimpleHash(imageModule.getById(currentMediaId))); - mergeData.put("images", imageHash); - } - - - //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))); - deliver(req, res, mergeData, templateObjektString); - } - catch (Exception e) { throw new ServletModuleException(e.toString());} - } - - - public void _list(EntityList theList, HttpServletRequest req, HttpServletResponse res) - throws ServletModuleException { - - try { - // hier dann htmlcode rausschreiben - if (theList == null || theList.getCount() == 0 || theList.getCount()>1) { - 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 - _showObject(theList.elementAt(0).getId(),req,res); - } - } catch (StorageObjectException e) { - throw new ServletModuleException(e.toString()); - } - } - - public void _listop(EntityList theList, HttpServletRequest req, HttpServletResponse res) - throws ServletModuleException { - - try { - // hier dann htmlcode rausschreiben - 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); - } - } catch (StorageObjectException e) { - throw new ServletModuleException(e.toString()); - } - } - - private EntityUsers _getUser(HttpServletRequest req) - { - HttpSession session=req.getSession(false); - return (EntityUsers)session.getAttribute("login.uid"); - } - - + mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList()); + mergeData.put("gruppenPopupData", gruppenModule.getGruppenAsSimpleList()); + try { + mergeData.put("articletypePopupData", DatabaseArticleType.getInstance().getPopupData()); + } catch (Exception e) {theLog.printError("articletype could not be fetched.");} + + // get the images + String currentMediaId = entContent.getValue("to_media"); + SimpleHash imageHash = new SimpleHash(); + if (currentMediaId!=null && !currentMediaId.equals("")) { + imageHash.put(currentMediaId, HTMLTemplateProcessor.makeSimpleHash(imageModule.getById(currentMediaId))); + mergeData.put("images", imageHash); + } + + + //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))); + deliver(req, res, mergeData, templateObjektString); + } catch (Exception e) { + throw new ServletModuleException(e.toString()); + } + } + + + public void _list(EntityList theList, HttpServletRequest req, HttpServletResponse res) + throws ServletModuleException { + + try { + // hier dann htmlcode rausschreiben + if (theList == null || theList.getCount() == 0 || theList.getCount()>1) { + 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 + _showObject(theList.elementAt(0).getId(),req,res); + } + } catch (StorageObjectException e) { + throw new ServletModuleException(e.toString()); + } + } + + public void _listop(EntityList theList, HttpServletRequest req, HttpServletResponse res) + throws ServletModuleException { + + try { + // hier dann htmlcode rausschreiben + 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); + } + } catch (StorageObjectException e) { + throw new ServletModuleException(e.toString()); + } + } + + private EntityUsers _getUser(HttpServletRequest req) + { + HttpSession session=req.getSession(false); + return (EntityUsers)session.getAttribute("login.uid"); + } } diff --git a/source/mircoders/storage/DatabaseContentToTopics.java b/source/mircoders/storage/DatabaseContentToTopics.java index a5a511b6..3a6bdd83 100755 --- a/source/mircoders/storage/DatabaseContentToTopics.java +++ b/source/mircoders/storage/DatabaseContentToTopics.java @@ -21,198 +21,200 @@ import mircoders.entity.*; public class DatabaseContentToTopics extends Database implements StorageObject{ - private static DatabaseContentToTopics instance; - - public static DatabaseContentToTopics getInstance() - throws StorageObjectException { - if (instance == null) { - instance = new DatabaseContentToTopics(); - instance.myselfDatabase = instance; - } - return instance; - } - - private DatabaseContentToTopics() - throws StorageObjectException { - - super(); - this.hasTimestamp = false; - this.theTable="content_x_topic"; - /** + private static DatabaseContentToTopics instance; + + public static DatabaseContentToTopics getInstance() + throws StorageObjectException { + if (instance == null) { + instance = new DatabaseContentToTopics(); + instance.myselfDatabase = instance; + } + return instance; + } + + private DatabaseContentToTopics() + throws StorageObjectException { + + super(); + this.hasTimestamp = false; + this.theTable="content_x_topic"; + /** try { - this.theEntityClass = Class.forName("mircoders.entity.EntityGruppen"); - } catch (Exception e) { - throw new StorageObjectException(e.toString()); - } + this.theEntityClass = Class.forName("mircoders.entity.EntityGruppen"); + } catch (Exception e) { + throw new StorageObjectException(e.toString()); + } */ - } - - - public EntityList getTopics(EntityContent content) { - EntityList returnList=null; - if (content != null) { - // get all to_topic from content_x_topic - String id = content.getId(); - String subselect = "id in (select topic_id from " + theTable + " where content_id=" + id+")"; - - try { - returnList = DatabaseTopics.getInstance().selectByWhereClause(subselect,-1); - } catch (Exception e) { - theLog.printDebugInfo("-- get topics failed " + e.toString()); - } - } - return returnList; - } - - - public void setTopics(String contentId, String[] topicId) { - if (contentId == null && topicId == null) { - return; - } - //first delete all row with content_id=contentId - String sql = "delete from "+ theTable +" where content_id=" + contentId; - - Connection con=null;Statement stmt=null; - try { - con = getPooledCon(); - // should be a preparedStatement because is faster - stmt = con.createStatement(); - ResultSet rs = executeSql(stmt,sql); - } catch (Exception e) { - theLog.printDebugInfo("-- set topics failed -- delete"); - } finally { - freeConnection(con,stmt); - } - - //now insert - //first delete all row with content_id=contentId - - for (int i=0;i