X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleComment.java;h=be28e74b307c0a7a158d2e53289848c21876779e;hb=626a903ec07e58e845d9bf5c6467adc7a95db1c9;hp=0415fbb4bfeab49575c1301bc8de99ab87eef606;hpb=12e4a04e3d6b16aa91029f125997d38a1f05aeb5;p=mir.git diff --git a/source/mircoders/servlet/ServletModuleComment.java b/source/mircoders/servlet/ServletModuleComment.java index 0415fbb4..be28e74b 100755 --- a/source/mircoders/servlet/ServletModuleComment.java +++ b/source/mircoders/servlet/ServletModuleComment.java @@ -30,23 +30,12 @@ package mircoders.servlet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import mir.config.MirPropertiesConfiguration; +import mir.entity.adapter.EntityAdapterEngine; import mir.entity.adapter.EntityAdapterModel; -import mir.entity.adapter.EntityIteratorAdapter; -import mir.log.LoggerWrapper; -import mir.servlet.ServletModule; +import mir.servlet.AdminServletModule; import mir.servlet.ServletModuleExc; import mir.servlet.ServletModuleFailure; import mir.servlet.ServletModuleUserExc; -import mir.util.CachingRewindableIterator; import mir.util.HTTPRequestParser; import mir.util.JDBCStringRoutines; import mir.util.SQLQueryBuilder; @@ -54,63 +43,53 @@ import mir.util.URLBuilder; import mircoders.entity.EntityComment; import mircoders.global.MirGlobal; import mircoders.module.ModuleComment; -import mircoders.module.ModuleContent; import mircoders.storage.DatabaseComment; -import mircoders.storage.DatabaseContent; -/* - * ServletModuleComment - controls navigation for Comments - * - * - * @author RK - */ +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; -public class ServletModuleComment extends ServletModule -{ - private ModuleContent moduleContent; +/** + * ServletModule for managing Comments + */ - private static ServletModuleComment instance = new ServletModuleComment(); - public static ServletModule getInstance() { return instance; } +public class ServletModuleComment extends AdminServletModule { + public ServletModuleComment() { + mainModule = new ModuleComment(); + definition = "comment"; + } - private ServletModuleComment() { - logger = new LoggerWrapper("ServletModule.Comment"); + public void delete(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure { try { - configuration = MirPropertiesConfiguration.instance(); - templateListString = configuration.getString("ServletModule.Comment.ListTemplate"); - templateObjektString = configuration.getString("ServletModule.Comment.ObjektTemplate"); - templateConfirmString = configuration.getString("ServletModule.Comment.ConfirmTemplate"); + MirGlobal.accessControl().general().assertMayDeleteComments(ServletHelper.getUser(aRequest)); - mainModule = new ModuleComment(DatabaseComment.getInstance()); - moduleContent = new ModuleContent(DatabaseContent.getInstance()); + super.delete(aRequest, aResponse); } - catch (Exception e) { - logger.error("servletmodule comment could not be initialized:" + e.getMessage()); + catch (Throwable t) { + throw new ServletModuleFailure(t); } } - public void delete(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure { - if (!configuration.getString("Mir.Localizer.Admin.AllowDeleteArticle", "0").equals("1")) - throw new ServletModuleExc("Operation not permitted"); - - super.delete(req, res); - } - - public void edit(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { - String idParam = req.getParameter("id"); + public void edit(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + String idParam = aRequest.getParameter("id"); - if (idParam == null) + if (idParam == null) { throw new ServletModuleExc("Invalid call: id not supplied "); + } - showComment(idParam, req, res); + editObject(aRequest, aResponse, idParam, null); } - public void showComment(String anId, HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + public void editObject(HttpServletRequest aRequest, HttpServletResponse aResponse, String anId, String aTemplate) throws ServletModuleExc { try { HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)}); EntityAdapterModel model = MirGlobal.localizer().dataModel().adapterModel(); - Map comment; + Object comment; URLBuilder urlBuilder = new URLBuilder(); urlBuilder.setValue("module", "Comment"); @@ -123,34 +102,35 @@ public class ServletModuleComment extends ServletModule comment = model.makeEntityAdapter("comment", mainModule.getById(anId)); } else { - List fields = DatabaseComment.getInstance().getFields(); + List fields = DatabaseComment.getInstance().getFieldNames(); responseData.put("new", Boolean.TRUE); - comment = new HashMap(); + Map emptyComment = new HashMap(); Iterator i = fields.iterator(); while (i.hasNext()) { - comment.put(i.next(), null); + emptyComment.put(i.next(), null); } -// MirGlobal.localizer().adminInterface().initializeArticle(article); + comment = emptyComment; } responseData.put("comment", comment); responseData.put("returnurl", requestParser.getParameter("returnurl")); responseData.put("thisurl", urlBuilder.getQuery()); - ServletHelper.generateResponse(aResponse.getWriter(), responseData, templateObjektString); + ServletHelper.generateResponse(aResponse.getWriter(), responseData, editGenerator); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void attach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { - String mediaIdParam = req.getParameter("mid"); - String commentId = req.getParameter("commentid"); + public void attach(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + String mediaIdParam = aRequest.getParameter("mid"); + String commentId = aRequest.getParameter("commentid"); - if (commentId == null || mediaIdParam==null) throw new ServletModuleExc("smod comment :: attach :: commentid/mid missing"); + if (commentId == null || mediaIdParam==null) { + throw new ServletModuleExc("smod comment :: attach :: commentid/mid missing"); + } try { EntityComment comment = (EntityComment) mainModule.getById(commentId); @@ -160,17 +140,20 @@ public class ServletModuleComment extends ServletModule throw new ServletModuleFailure(e); } - showComment(commentId, req, res); + logAdminUsage(aRequest, commentId, "media " + mediaIdParam + " attached"); + + editObject(aRequest, aResponse, commentId, null); } - public void dettach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { - String commentId = req.getParameter("commentid"); - String midParam = req.getParameter("mid"); - if (commentId == null) + public void dettach(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + String commentId = aRequest.getParameter("commentid"); + String midParam = aRequest.getParameter("mid"); + if (commentId == null) { throw new ServletModuleExc("smod comment :: dettach :: commentid missing"); - if (midParam == null) + } + if (midParam == null) { throw new ServletModuleExc("smod comment :: dettach :: mid missing"); + } try { EntityComment comment = (EntityComment)mainModule.getById(commentId); @@ -180,7 +163,9 @@ public class ServletModuleComment extends ServletModule throw new ServletModuleFailure(e); } - showComment(commentId, req, res); + logAdminUsage(aRequest, commentId, "media " + midParam + " deattached"); + + editObject(aRequest, aResponse, commentId, null); } @@ -192,7 +177,7 @@ public class ServletModuleComment extends ServletModule String order = requestParser.getParameterWithDefault("order", "webdb_create desc"); int offset = requestParser.getIntegerWithDefault("offset", 0); - returnCommentList(aRequest, aResponse, where, order, offset); + returnList(aRequest, aResponse, where, order, offset); } public void search(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc @@ -200,17 +185,16 @@ public class ServletModuleComment extends ServletModule HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); SQLQueryBuilder queryBuilder = new SQLQueryBuilder(); - String queryField = ""; String searchField = requestParser.getParameter("searchfield"); String searchText = requestParser.getParameter("searchtext"); String searchIsPublished = requestParser.getParameter("searchispublished"); String searchStatus = requestParser.getParameter("searchstatus"); String searchOrder = requestParser.getParameter("searchorder"); - if (searchIsPublished.equals("0")) { + if ("0".equals(searchIsPublished)) { queryBuilder.appendAndCondition("is_published='f'"); } - else if (searchIsPublished.equals("1")) { + else if ("1".equals(searchIsPublished)) { queryBuilder.appendAndCondition("is_published='t'"); } @@ -225,58 +209,51 @@ public class ServletModuleComment extends ServletModule } if (searchOrder.length()>0) { - if (searchOrder.equals("datedesc")) - queryBuilder.appendAscendingOrder("webdb_create"); - else if (searchOrder.equals("dateasc")) + if ("datedesc".equals(searchOrder)) { queryBuilder.appendDescendingOrder("webdb_create"); - else if (searchOrder.equals("articletitle")) + } + else if ("dateasc".equals(searchOrder)) { + queryBuilder.appendAscendingOrder("webdb_create"); + } + else if ("articletitle".equals(searchOrder)) { queryBuilder.appendAscendingOrder("(select content.title from content where content.id = comment.to_media)"); - else if (searchOrder.equals("creator")) + } + else if ("creator".equals(searchOrder)) { queryBuilder.appendDescendingOrder("creator"); + } } - returnCommentList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0); + returnList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0); } - public void articlecomments(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { - String articleIdString = req.getParameter("articleid"); - int articleId; - + public void articlecomments(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + String articleIdString = aRequest.getParameter("articleid"); try { - articleId = Integer.parseInt(articleIdString); + int articleId = Integer.parseInt(articleIdString); - returnCommentList( req, res, "to_media="+articleId, "webdb_create desc", 0); + returnList( aRequest, aResponse, "to_media="+articleId, "webdb_create desc", 0); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void returnCommentList(HttpServletRequest aRequest, HttpServletResponse aResponse, + public void returnList(HttpServletRequest aRequest, HttpServletResponse aResponse, String aWhereClause, String anOrderByClause, int anOffset) throws ServletModuleExc { HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); URLBuilder urlBuilder = new URLBuilder(); - EntityAdapterModel model; - int nrCommentsPerPage = 20; - int count; try { Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}); - model = MirGlobal.localizer().dataModel().adapterModel(); - Object commentList = - new CachingRewindableIterator( - new EntityIteratorAdapter( aWhereClause, anOrderByClause, nrCommentsPerPage, - MirGlobal.localizer().dataModel().adapterModel(), "comment", nrCommentsPerPage, anOffset) - ); + List commentList = + EntityAdapterEngine.retrieveAdapterList(getModel(), definition, aWhereClause, + anOrderByClause, nrEntitiesPerListPage, anOffset); responseData.put("nexturl", null); responseData.put("prevurl", null); - count=mainModule.getSize(aWhereClause); - urlBuilder.setValue("module", "Comment"); urlBuilder.setValue("do", "list"); urlBuilder.setValue("where", aWhereClause); @@ -295,29 +272,69 @@ public class ServletModuleComment extends ServletModule responseData.put("searchorder", requestParser.getParameter("searchorder")); urlBuilder.setValue("offset", anOffset); - responseData.put("offset" , new Integer(anOffset).toString()); + responseData.put("offset" , Integer.toString(anOffset)); responseData.put("thisurl" , urlBuilder.getQuery()); - if (count>=anOffset+nrCommentsPerPage) { - urlBuilder.setValue("offset", anOffset + nrCommentsPerPage); + if (commentList.size()>=nrEntitiesPerListPage) { + urlBuilder.setValue("offset", anOffset + nrEntitiesPerListPage); responseData.put("nexturl" , urlBuilder.getQuery()); } if (anOffset>0) { - urlBuilder.setValue("offset", Math.max(anOffset - nrCommentsPerPage, 0)); + urlBuilder.setValue("offset", Math.max(anOffset - nrEntitiesPerListPage, 0)); responseData.put("prevurl" , urlBuilder.getQuery()); } responseData.put("comments", commentList); responseData.put("from" , Integer.toString(anOffset+1)); - responseData.put("count", Integer.toString(count)); - responseData.put("to", Integer.toString(Math.min(anOffset+nrCommentsPerPage, count))); + responseData.put("to", Integer.toString(anOffset+commentList.size()-1)); - ServletHelper.generateResponse(aResponse.getWriter(), responseData, "commentlist.template"); + ServletHelper.generateResponse(aResponse.getWriter(), responseData, listGenerator); } catch (Throwable e) { throw new ServletModuleFailure(e); } } -} + public void update(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc + { + try { + HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); + + String returnUrl = requestParser.getParameter("returnurl"); + + String idParam = aRequest.getParameter("id"); + if (idParam == null) { + throw new ServletModuleExc("Wrong call: (id) is missing"); + } + + Map withValues = getIntersectingValues(aRequest, DatabaseComment.getInstance()); + + if (!withValues.containsKey("is_published")) { + withValues.put("is_published","0"); + } + if (!withValues.containsKey("is_html")) { + withValues.put("is_html","0"); + } + + String webdbCreate = (String) withValues.get("webdb_create"); + if (webdbCreate==null || webdbCreate.trim().length()==0) { + withValues.remove("webdb_create"); + } + + String id = mainModule.set(withValues); + + logAdminUsage(aRequest, id, "object modified"); + + if (returnUrl!=null){ + ServletHelper.redirect(aResponse, returnUrl); + } + else { + editObject(aRequest, aResponse, idParam, null); + } + } + catch (Throwable e) { + throw new ServletModuleFailure(e); + } + } +} \ No newline at end of file