X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleContent.java;h=7e8684af0452bf51c5e8d0ea11cf2418be209710;hb=4451d4c8c25d46e9c405e966ff6bd016a1512f4f;hp=01e6abeaf1a475d0779cb6561dd87fed58ba62b9;hpb=da98183e311156246d826104eb4af70ec24c6273;p=mir.git diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java index 01e6abea..7e8684af 100755 --- a/source/mircoders/servlet/ServletModuleContent.java +++ b/source/mircoders/servlet/ServletModuleContent.java @@ -36,10 +36,10 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Vector; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import mir.entity.adapter.EntityAdapterModel; import mir.entity.adapter.EntityIteratorAdapter; @@ -52,47 +52,34 @@ import mir.util.CachingRewindableIterator; import mir.util.HTTPRequestParser; import mir.util.JDBCStringRoutines; import mir.util.SQLQueryBuilder; +import mir.util.StringRoutines; import mir.util.URLBuilder; import mircoders.entity.EntityContent; -import mircoders.entity.EntityUsers; import mircoders.global.MirGlobal; import mircoders.module.ModuleContent; -import mircoders.search.IndexUtil; -import mircoders.storage.DatabaseComment; import mircoders.storage.DatabaseContent; -import mircoders.storage.DatabaseContentToMedia; import mircoders.storage.DatabaseContentToTopics; -import org.apache.lucene.index.IndexReader; - -import freemarker.template.SimpleHash; - /* * ServletModuleContent - * deliver html for the article admin form. * - * @version $Id: ServletModuleContent.java,v 1.51 2003/04/28 00:44:06 zapata Exp $ + * @version $Id: ServletModuleContent.java,v 1.52.2.12 2003/10/23 14:55:25 rk Exp $ * @author rk, mir-coders * */ public class ServletModuleContent extends ServletModule { - private String editTemplate = configuration.getString("ServletModule.Content.ObjektTemplate");; - private String listTemplate = configuration.getString("ServletModule.Content.ListTemplate"); - private static ServletModuleContent instance = new ServletModuleContent(); public static ServletModule getInstance() { return instance; } private ServletModuleContent() { super(); - logger = new LoggerWrapper("ServletModule.Content"); - try { - templateListString = configuration.getString("ServletModule.Content.ListTemplate"); - templateObjektString = configuration.getString("ServletModule.Content.ObjektTemplate"); - templateConfirmString = configuration.getString("ServletModule.Content.ConfirmTemplate"); + logger = new LoggerWrapper("ServletModule.Content"); + try { mainModule = new ModuleContent(DatabaseContent.getInstance()); } catch (Throwable e) { @@ -109,7 +96,7 @@ public class ServletModuleContent extends ServletModule int offset = requestParser.getIntegerWithDefault("offset", 0); String selectArticleUrl = requestParser.getParameter("selectarticleurl"); - returnArticleList(aRequest, aResponse, where, order, offset, selectArticleUrl); + returnList(aRequest, aResponse, where, order, offset, selectArticleUrl); } public void search(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleFailure { @@ -150,126 +137,74 @@ public class ServletModuleContent extends ServletModule if (searchOrder.length()>0) { if (searchOrder.equals("datedesc")) - queryBuilder.appendAscendingOrder("webdb_create"); - else if (searchOrder.equals("dateasc")) queryBuilder.appendDescendingOrder("webdb_create"); + else if (searchOrder.equals("dateasc")) + queryBuilder.appendAscendingOrder("webdb_create"); else if (searchOrder.equals("title")) - queryBuilder.appendDescendingOrder("title"); + queryBuilder.appendAscendingOrder("title"); else if (searchOrder.equals("creator")) - queryBuilder.appendDescendingOrder("creator"); + queryBuilder.appendAscendingOrder("creator"); } - returnArticleList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0, selectArticleUrl); + returnList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0, selectArticleUrl); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void add(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc { - _showObject(null, req, res); + public void add(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + editObject(aRequest, aResponse, null); } - public void insert(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc + public void insert(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { //theLog.printDebugInfo(":: content :: trying to insert"); try { - EntityUsers user = _getUser(req); - Map withValues = getIntersectingValues(req, DatabaseContent.getInstance()); + Map withValues = getIntersectingValues(aRequest, DatabaseContent.getInstance()); 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("to_publisher", ServletHelper.getUser(aRequest).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"); + String webdbCreate = (String) withValues.get("webdb_create"); + if (webdbCreate==null || webdbCreate.trim().length()==0) + withValues.remove("webdb_create"); + String id = mainModule.add(withValues); + logAdminUsage(aRequest, id, "object added"); + List topics; - DatabaseContentToTopics.getInstance().setTopics(id, req.getParameterValues("to_topic")); + DatabaseContentToTopics.getInstance().setTopics(id, aRequest.getParameterValues("to_topic")); - _showObject(id, req, res); + editObject(aRequest, aResponse, id); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void delete(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc + public void edit(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { - if (!configuration.getString("Mir.Localizer.Admin.AllowDeleteArticle", "0").equals("1")) - throw new ServletModuleExc("Operation not permitted"); - - EntityUsers user = _getUser(req); - - String idParam = req.getParameter("id"); - if (idParam == null) throw new ServletModuleExc("Invalid call: id missing"); - - String confirmParam = req.getParameter("confirm"); - String cancelParam = req.getParameter("cancel"); - - logger.info("where = " + req.getParameter("where")); - - if (confirmParam == null && cancelParam == null) { - - 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); - - /** @todo the following two should be implied in - * DatabaseContent */ - DatabaseContentToTopics.getInstance().deleteByContentId(idParam); - DatabaseComment.getInstance().deleteByContentId(idParam); - DatabaseContentToMedia.getInstance().deleteByContentId(idParam); - - - //delete from lucene index, if any - String index = configuration.getString("IndexPath"); - if (IndexReader.indexExists(index)){ - IndexUtil.unindexID(idParam,index); - } - - } - catch (Throwable e) { - throw new ServletModuleFailure(e); - } - list(req,res); - } - else { - // Datensatz anzeigen - _showObject(idParam, req, res); - } - } - } - - public void edit(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { - String idParam = req.getParameter("id"); + String idParam = aRequest.getParameter("id"); if (idParam == null) throw new ServletModuleExc("Invalid call: id not supplied "); - _showObject(idParam, req, res); + editObject(aRequest, aResponse, idParam); } // methods for attaching media file - public void attach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc + public void attach(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { - String mediaIdParam = req.getParameter("mid"); - String articleId = req.getParameter("articleid"); + String mediaIdParam = aRequest.getParameter("mid"); + String articleId = aRequest.getParameter("articleid"); if (articleId == null || mediaIdParam==null) throw new ServletModuleExc("smod content :: attach :: articleid/mid missing"); @@ -282,13 +217,15 @@ public class ServletModuleContent extends ServletModule throw new ServletModuleFailure(e); } - _showObject(articleId, req, res); + logAdminUsage(aRequest, articleId, "media " + mediaIdParam + " attached"); + + editObject(aRequest, aResponse, articleId); } - public void dettach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc + public void dettach(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { - String articleId = req.getParameter("articleid"); - String midParam = req.getParameter("mid"); + String articleId = aRequest.getParameter("articleid"); + String midParam = aRequest.getParameter("mid"); if (articleId == null) throw new ServletModuleExc("smod content :: dettach :: articleid missing"); if (midParam == null) @@ -302,7 +239,9 @@ public class ServletModuleContent extends ServletModule throw new ServletModuleFailure(e); } - _showObject(articleId, req, res); + logAdminUsage(aRequest, articleId, "media " + midParam + " deattached"); + + editObject(aRequest, aResponse, articleId); } public void update(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc @@ -326,17 +265,21 @@ public class ServletModuleContent extends ServletModule 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); - DatabaseContentToTopics.getInstance().setTopics(aRequest.getParameter("id"), aRequest.getParameterValues("to_topic")); - String whereParam = aRequest.getParameter("where"); - String orderParam = aRequest.getParameter("order"); + logAdminUsage(aRequest, id, "object modified"); - if (returnUrl!=null){ + DatabaseContentToTopics.getInstance().setTopics(aRequest.getParameter("id"), aRequest.getParameterValues("to_topic")); + + if (returnUrl!=null && !returnUrl.equals("")){ redirect(aResponse, returnUrl); } else - _showObject(idParam, aRequest, aResponse); + editObject(aRequest, aResponse, idParam); } catch (Throwable e) { throw new ServletModuleFailure(e); @@ -355,11 +298,11 @@ public class ServletModuleContent extends ServletModule * @param aResponse * @throws ServletModuleExc */ - public void _showObject(String id, HttpServletRequest aRequest, HttpServletResponse aResponse) + public void editObject(HttpServletRequest aRequest, HttpServletResponse aResponse, String id) throws ServletModuleExc { try { HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); - Map responseData = ServletHelper.makeGenerationData(new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}); + Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}); EntityAdapterModel model = MirGlobal.localizer().dataModel().adapterModel(); Map article; URLBuilder urlBuilder = new URLBuilder(); @@ -388,23 +331,78 @@ public class ServletModuleContent extends ServletModule } responseData.put("article", article); - responseData.put("topics", - new EntityIteratorAdapter("", configuration.getString("Mir.Localizer.Admin.TopicListOrder"), - 20, MirGlobal.localizer().dataModel().adapterModel(), "topic")); + List topicsList = new Vector(); + String[] topicCategories = configuration.getStringArray("Mir.Localizer.Admin.TopicLists"); + if (topicCategories.length==0 ) { + Map categoryMap = new HashMap(); + categoryMap.put("key", "topic"); + categoryMap.put("listtype", "0"); + categoryMap.put("listparameter", "3"); + categoryMap.put("items", + new EntityIteratorAdapter("", "title", + 20, MirGlobal.localizer().dataModel().adapterModel(), "topic")); + topicsList.add(categoryMap); + } + else + { + + for (int i = 0; i < topicCategories.length; i++) { + try { + Map categoryMap = new HashMap(); + List parts = StringRoutines.splitString(topicCategories[i], ":"); + String key = null; + String listtype = "0"; + String listparameter = "5"; + String where = ""; + String order = ""; + + if (parts.size() > 0) + key = (String) parts.get(0); + if (parts.size() > 1) + listtype = (String) parts.get(1); + if (parts.size() > 2) + listparameter = (String) parts.get(2); + if (parts.size() > 3) + where = (String) parts.get(3); + if (parts.size() > 4) + order = (String) parts.get(4); + + if (key != null) { + categoryMap.put("key", key); + categoryMap.put("listtype", listtype); + categoryMap.put("listparameter", listparameter); + categoryMap.put("items", + new EntityIteratorAdapter(where, order, + 20, MirGlobal.localizer().dataModel().adapterModel(), "topic")); + topicsList.add(categoryMap); + } + } + catch (Throwable t) { + logger.error("error while preparing topics: " + t.toString()); + } + } + } + + responseData.put("topics", topicsList); responseData.put("returnurl", requestParser.getParameter("returnurl")); responseData.put("thisurl", urlBuilder.getQuery()); - ServletHelper.generateResponse(aResponse.getWriter(), responseData, editTemplate); + ServletHelper.generateResponse(aResponse.getWriter(), responseData, editGenerator); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void returnArticleList( + public void returnList(HttpServletRequest aRequest, HttpServletResponse aResponse, + String aWhereClause, String anOrderByClause, int anOffset) throws ServletModuleExc { + this.returnList(aRequest, aResponse, aWhereClause, anOrderByClause, anOffset, null); + } + + public void returnList( HttpServletRequest aRequest, HttpServletResponse aResponse, String aWhereClause, @@ -415,17 +413,16 @@ public class ServletModuleContent extends ServletModule HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); URLBuilder urlBuilder = new URLBuilder(); EntityAdapterModel model; - int nrArticlesPerPage = 20; int count; try { - Map responseData = ServletHelper.makeGenerationData(new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}); + Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}); model = MirGlobal.localizer().dataModel().adapterModel(); Object articleList = new CachingRewindableIterator( - new EntityIteratorAdapter( aWhereClause, anOrderByClause, nrArticlesPerPage, - MirGlobal.localizer().dataModel().adapterModel(), "content", nrArticlesPerPage, anOffset) + new EntityIteratorAdapter( aWhereClause, anOrderByClause, nrEntitiesPerListPage, + MirGlobal.localizer().dataModel().adapterModel(), "content", nrEntitiesPerListPage, anOffset) ); responseData.put("nexturl", null); @@ -457,13 +454,13 @@ public class ServletModuleContent extends ServletModule responseData.put("offset" , new Integer(anOffset).toString()); responseData.put("thisurl" , urlBuilder.getQuery()); - if (count>=anOffset+nrArticlesPerPage) { - urlBuilder.setValue("offset", (anOffset + nrArticlesPerPage)); + if (count>=anOffset+nrEntitiesPerListPage) { + urlBuilder.setValue("offset", (anOffset + nrEntitiesPerListPage)); responseData.put("nexturl" , urlBuilder.getQuery()); } if (anOffset>0) { - urlBuilder.setValue("offset", Math.max(anOffset - nrArticlesPerPage, 0)); + urlBuilder.setValue("offset", Math.max(anOffset - nrEntitiesPerListPage, 0)); responseData.put("prevurl" , urlBuilder.getQuery()); } @@ -471,12 +468,12 @@ public class ServletModuleContent extends ServletModule responseData.put("from" , Integer.toString(anOffset+1)); responseData.put("count", Integer.toString(count)); - responseData.put("to", Integer.toString(Math.min(anOffset+nrArticlesPerPage, count))); + responseData.put("to", Integer.toString(Math.min(anOffset+nrEntitiesPerListPage, count))); responseData.put("offset" , Integer.toString(anOffset)); responseData.put("order", anOrderByClause); responseData.put("where" , aWhereClause); - ServletHelper.generateResponse(aResponse.getWriter(), responseData, listTemplate); + ServletHelper.generateResponse(aResponse.getWriter(), responseData, listGenerator); } catch (Throwable e) { throw new ServletModuleFailure(e); @@ -494,7 +491,7 @@ public class ServletModuleContent extends ServletModule urlBuilder.setValue("childid", requestParser.getParameter("id")); urlBuilder.setValue("returnurl", requestParser.getParameter("returnurl")); - returnArticleList(aRequest, aResponse, "", "", 0, urlBuilder.getQuery()); + returnList(aRequest, aResponse, "", "", 0, urlBuilder.getQuery()); } catch (Throwable e) { throw new ServletModuleFailure(e); @@ -510,7 +507,7 @@ public class ServletModuleContent extends ServletModule if (articleId == null) throw new ServletModuleExc("ServletModuleContent.listchildren: article_id not set!"); - returnArticleList(aRequest, aResponse, "to_content = " + articleId, "", 0, null); + returnList(aRequest, aResponse, "to_content = " + articleId, "", 0, null); } catch (Throwable e) { throw new ServletModuleFailure(e); @@ -529,6 +526,7 @@ public class ServletModuleContent extends ServletModule article.setValueForProperty("to_content", parentId); article.setProduced(false); article.update(); + logAdminUsage(aRequest, articleId, "parent set to " + parentId); } catch(Throwable e) { logger.error("ServletModuleContent.setparent: " + e.getMessage()); @@ -549,6 +547,7 @@ public class ServletModuleContent extends ServletModule article.setValueForProperty("to_content", ""); article.setProduced(false); article.update(); + logAdminUsage(aRequest, articleId, "parent cleared"); } catch(Throwable e) { e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); @@ -559,11 +558,4 @@ public class ServletModuleContent extends ServletModule redirect(aResponse, returnUrl); } - - private EntityUsers _getUser(HttpServletRequest req) - { - HttpSession session=req.getSession(false); - - return (EntityUsers)session.getAttribute("login.uid"); - } }