/*\r
- * Copyright (C) 2001, 2002 The Mir-coders group\r
+ * Copyright (C) 2001, 2002 The Mir-coders group\r
*\r
* This file is part of Mir.\r
*\r
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\r
*\r
* In addition, as a special exception, The Mir-coders gives permission to link\r
- * the code of this program with the com.oreilly.servlet library, any library\r
- * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
- * the above that use the same license as the above), and distribute linked\r
- * combinations including the two. You must obey the GNU General Public\r
- * License in all respects for all of the code used other than the above\r
- * mentioned libraries. If you modify this file, you may extend this exception\r
- * to your version of the file, but you are not obligated to do so. If you do\r
- * not wish to do so, delete this exception statement from your version.\r
+ * the code of this program with any library licensed under the Apache Software License,\r
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library\r
+ * (or with modified versions of the above that use the same license as the above),\r
+ * and distribute linked combinations including the two. You must obey the\r
+ * GNU General Public License in all respects for all of the code used other than\r
+ * the above mentioned libraries. If you modify this file, you may extend this\r
+ * exception to your version of the file, but you are not obligated to do so.\r
+ * If you do not wish to do so, delete this exception statement from your version.\r
*/\r
-\r
package mir.servlet;\r
\r
-import java.io.IOException;\r
-import java.io.PrintWriter;\r
import java.util.HashMap;\r
+import java.util.Iterator;\r
import java.util.List;\r
import java.util.Locale;\r
import java.util.Map;\r
-\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
import javax.servlet.http.HttpSession;\r
\r
import mir.config.MirPropertiesConfiguration;\r
import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
-import mir.entity.EntityList;\r
+import mir.entity.adapter.EntityAdapterDefinition;\r
+import mir.entity.adapter.EntityAdapterEngine;\r
+import mir.entity.adapter.EntityAdapterModel;\r
import mir.log.LoggerWrapper;\r
-import mir.misc.HTMLParseException;\r
-import mir.misc.HTMLTemplateProcessor;\r
-import mir.misc.LineFilterWriter;\r
import mir.module.AbstractModule;\r
-import mir.module.ModuleException;\r
import mir.storage.StorageObject;\r
import mir.util.HTTPRequestParser;\r
-import freemarker.template.SimpleHash;\r
-import freemarker.template.TemplateModelRoot;\r
-\r
-\r
-\r
+import mir.util.URLBuilder;\r
+import mircoders.servlet.ServletHelper;\r
\r
/**\r
- * Abstract class ServletModule provides the base functionality for servlets.\r
- * Deriving a class from ServletModule enables class to insert/edit/update/delete\r
- * and list Entity from a Database via mainModule.\r
*\r
- *\r
- * Abstrakte Klasse ServletModule stellt die Basisfunktionalitaet der\r
- * abgeleiteten ServletModule zur Verf?gung.\r
- *\r
- * @version 28.6.1999\r
- * @author RK\r
+ * <p>Title: </p>\r
+ * <p>Description: </p>\r
+ * <p>Copyright: Copyright (c) 2003</p>\r
+ * <p>Company: </p>\r
+ * @author not attributable\r
+ * @version 1.0\r
*/\r
\r
public abstract class ServletModule {\r
-\r
public String defaultAction;\r
protected LoggerWrapper logger;\r
protected MirPropertiesConfiguration configuration;\r
+ protected Locale fallbackLocale;\r
+\r
protected AbstractModule mainModule;\r
- protected String templateListString;\r
- protected String templateObjektString;\r
- protected String templateConfirmString;\r
+ protected String definition;\r
+ protected EntityAdapterModel model;\r
+\r
+ protected String listGenerator;\r
+ protected String editGenerator;\r
+ protected String deleteConfirmationGenerator;\r
+ protected int nrEntitiesPerListPage;\r
\r
\r
public ServletModule(){\r
+ definition = null;\r
+ model = null;\r
+\r
try {\r
configuration = MirPropertiesConfiguration.instance();\r
}\r
catch (PropertiesConfigExc e) {\r
throw new RuntimeException("Can't get configuration: " + e.getMessage());\r
}\r
+\r
+ listGenerator = configuration.getString("ServletModule."+getOperationModuleName()+".ListTemplate");\r
+ editGenerator = configuration.getString("ServletModule."+getOperationModuleName()+".EditTemplate");\r
+ deleteConfirmationGenerator = configuration.getString("ServletModule."+getOperationModuleName()+".DeleteConfirmationTemplate");\r
+ nrEntitiesPerListPage =\r
+ configuration.getInt("ServletModule."+getOperationModuleName()+".ListSize",\r
+ configuration.getInt("ServletModule.Default.ListSize", 20));\r
+\r
+ fallbackLocale = new Locale(configuration.getString("Mir.Admin.FallbackLanguage", "en"), "");\r
}\r
\r
\r
/**\r
- * Singelton - Methode muss in den abgeleiteten Klassen ueberschrieben werden.\r
- * @return ServletModule\r
+ * Singleton instance retrievel method. MUST be overridden in subclasses.\r
+ *\r
+ * @return ServletModule the single instance of the servletmodule class\r
*/\r
public static ServletModule getInstance() {\r
return null;\r
}\r
\r
/**\r
- * get the module name to be used for generic operations like delete.\r
+ * Get the module name\r
+ *\r
+ * @return\r
*/\r
protected String getOperationModuleName() {\r
return getClass().getName().substring((new String("mircoders.servlet.ServletModule")).length());\r
}\r
\r
/**\r
- * get the session binded language\r
- */\r
- public String getLanguage(HttpServletRequest req) {\r
- HttpSession session = req.getSession(false);\r
- String language = (String) session.getAttribute("Language");\r
- if (language == null) {\r
- language = configuration.getString("StandardLanguage");\r
- }\r
- return language;\r
- }\r
-\r
- /**\r
* get the locale either from the session or the accept-language header ot the request\r
* this supersedes getLanguage for the new i18n\r
*/\r
- public Locale getLocale(HttpServletRequest req) {\r
+ public Locale getLocale(HttpServletRequest aRequest) {\r
Locale loc = null;\r
- HttpSession session = req.getSession(false);\r
+ HttpSession session = aRequest.getSession(false);\r
if (session != null) {\r
// session can be null in case of logout\r
- loc = (Locale) session.getAttribute("Locale");\r
+ loc = (Locale) session.getAttribute("locale");\r
}\r
// if there is nothing in the session get it fron the accept-language\r
if (loc == null) {\r
- loc = req.getLocale();\r
+ loc = aRequest.getLocale();\r
}\r
return loc;\r
}\r
\r
- public void redirect(HttpServletResponse aResponse, String aQuery) throws ServletModuleExc, ServletModuleFailure {\r
- try {\r
- aResponse.sendRedirect(MirPropertiesConfiguration.instance().getString("RootUri") + "/Mir?"+aQuery);\r
- }\r
- catch (Throwable t) {\r
- throw new ServletModuleFailure("ServletModule.redirect: " +t.getMessage(), t);\r
- }\r
+ /**\r
+ * get the locale either from the session or the accept-language header ot the request\r
+ * this supersedes getLanguage for the new i18n\r
+ */\r
+ public Locale getFallbackLocale(HttpServletRequest aRequest) {\r
+ return fallbackLocale;\r
}\r
\r
/**\r
- * list(req,res) - generische Listmethode. Wennn die Funktionalitaet\r
- * nicht reicht, muss sie in der abgeleiteten ServletModule-Klasse\r
- * ueberschreiben werden.\r
+ * Function to specify the default ordering for lists. May be overridden.\r
+ *\r
*\r
- * @param req Http-Request, das vom Dispatcher durchgereicht wird\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
+ * @return\r
*/\r
- public void list(HttpServletRequest req, HttpServletResponse res)\r
- throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
- try {\r
- EntityList theList;\r
- String offsetParam = req.getParameter("offset");\r
- int offset = 0;\r
- PrintWriter out = res.getWriter();\r
-\r
- // hier offsetcode bearbeiten\r
- if (offsetParam != null && !offsetParam.equals("")) {\r
- offset = Integer.parseInt(offsetParam);\r
- }\r
- if (req.getParameter("next") != null) {\r
- offset = Integer.parseInt(req.getParameter("nextoffset"));\r
- }\r
- else {\r
- if (req.getParameter("prev") != null) {\r
- offset = Integer.parseInt(req.getParameter("prevoffset"));\r
- }\r
- }\r
- theList = mainModule.getByWhereClause(null, offset);\r
+ public String getDefaultListOrdering() {\r
\r
- HTMLTemplateProcessor.process(res, templateListString, theList, out, getLocale(req));\r
- }\r
- catch (Throwable e) {\r
- throw new ServletModuleFailure(e);\r
+ if (mainModule!=null && mainModule.getStorageObject()!=null){\r
+ if (mainModule.getStorageObject().getFields().contains("webdb_create"))\r
+ return "webdb_create desc";\r
}\r
+\r
+ return "id asc";\r
}\r
\r
/**\r
- * add(req,res) - generische Addmethode. Wennn die Funktionalitaet\r
- * nicht reicht, muss sie in der abgeleiteten ServletModule-Klasse\r
- * ueberschreiben werden.\r
- * @param req Http-Request, das vom Dispatcher durchgereicht wird\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
+ *\r
+ * @param aResponse\r
+ * @param aQuery\r
+ * @throws ServletModuleExc\r
+ * @throws ServletModuleFailure\r
*/\r
- public void add(HttpServletRequest req, HttpServletResponse res)\r
- throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
-\r
+ public void redirect(HttpServletResponse aResponse, String aQuery) throws ServletModuleExc, ServletModuleFailure {\r
try {\r
- SimpleHash mergeData = new SimpleHash();\r
- mergeData.put("new", "1");\r
- deliver(req, res, mergeData, templateObjektString);\r
+ aResponse.sendRedirect(aResponse.encodeRedirectURL(MirPropertiesConfiguration.instance().getString("RootUri") + "/Mir?"+aQuery));\r
}\r
- catch (Throwable e) {\r
- throw new ServletModuleFailure(e);\r
+ catch (Throwable t) {\r
+ throw new ServletModuleFailure("ServletModule.redirect: " +t.getMessage(), t);\r
}\r
}\r
\r
/**\r
- * insert(req,res) - generische Insertmethode, folgt auf add.\r
- * Wennn die Funktionalitaet\r
- * nicht reicht, muss sie in der abgeleiteten ServletModule-Klasse\r
- * ueberschreiben werden.\r
+ * Generic list method\r
*\r
- * @param req Http-Request, das vom Dispatcher durchgereicht wird\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
+ * @param aRequest\r
+ * @param aResponse\r
+ * @throws ServletModuleExc\r
+ * @throws ServletModuleUserExc\r
+ * @throws ServletModuleFailure\r
*/\r
- public void insert(HttpServletRequest req, HttpServletResponse res)\r
- throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
+\r
+ public void list(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc\r
+ {\r
+ HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
+\r
+ String where = requestParser.getParameter("where");\r
+ String order = requestParser.getParameterWithDefault("order", getDefaultListOrdering());\r
+ int offset = requestParser.getIntegerWithDefault("offset", 0);\r
+\r
+ returnList(aRequest, aResponse, where, order, offset);\r
+ }\r
+\r
+\r
+ public void returnList(HttpServletRequest aRequest, HttpServletResponse aResponse,\r
+ String aWhereClause, String anOrderByClause, int anOffset) throws ServletModuleExc {\r
+\r
+ HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
+ URLBuilder urlBuilder = new URLBuilder();\r
+ int count;\r
+\r
try {\r
- Map withValues = getIntersectingValues(req, mainModule.getStorageObject());\r
- logger.debug("--trying to add...");\r
- String id = mainModule.add(withValues);\r
- logger.debug("--trying to deliver..." + id);\r
- list(req, res);\r
+ Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)});\r
+\r
+ List list =\r
+ EntityAdapterEngine.retrieveAdapterList(model, definition, aWhereClause, anOrderByClause, nrEntitiesPerListPage, anOffset);\r
+\r
+ responseData.put("nexturl", null);\r
+ responseData.put("prevurl", null);\r
+ responseData.put("module", getOperationModuleName());\r
+\r
+ count=mainModule.getSize(aWhereClause);\r
+\r
+ urlBuilder.setValue("module", getOperationModuleName());\r
+ urlBuilder.setValue("do", "list");\r
+ urlBuilder.setValue("where", aWhereClause);\r
+ urlBuilder.setValue("order", anOrderByClause);\r
+\r
+ urlBuilder.setValue("searchfield", requestParser.getParameter("searchfield"));\r
+ urlBuilder.setValue("searchtext", requestParser.getParameter("searchtext"));\r
+ urlBuilder.setValue("searchispublished", requestParser.getParameter("searchispublished"));\r
+ urlBuilder.setValue("searchstatus", requestParser.getParameter("searchstatus"));\r
+ urlBuilder.setValue("searchorder", requestParser.getParameter("searchorder"));\r
+\r
+ responseData.put("searchfield", requestParser.getParameter("searchfield"));\r
+ responseData.put("searchtext", requestParser.getParameter("searchtext"));\r
+ responseData.put("searchispublished", requestParser.getParameter("searchispublished"));\r
+ responseData.put("searchstatus", requestParser.getParameter("searchstatus"));\r
+ responseData.put("searchorder", requestParser.getParameter("searchorder"));\r
+\r
+ urlBuilder.setValue("offset", anOffset);\r
+ responseData.put("offset" , new Integer(anOffset).toString());\r
+ responseData.put("thisurl" , urlBuilder.getQuery());\r
+\r
+ if (count>anOffset+nrEntitiesPerListPage) {\r
+ urlBuilder.setValue("offset", anOffset + nrEntitiesPerListPage);\r
+ responseData.put("nexturl" , urlBuilder.getQuery());\r
+ }\r
+\r
+ if (anOffset>0) {\r
+ urlBuilder.setValue("offset", Math.max(anOffset - nrEntitiesPerListPage, 0));\r
+ responseData.put("prevurl" , urlBuilder.getQuery());\r
+ }\r
+\r
+ responseData.put("entities", list);\r
+ responseData.put("from" , Integer.toString(anOffset+1));\r
+ responseData.put("count", Integer.toString(count));\r
+ responseData.put("to", Integer.toString(Math.min(anOffset+nrEntitiesPerListPage, count)));\r
+\r
+ ServletHelper.generateResponse(aResponse.getWriter(), responseData, listGenerator);\r
}\r
catch (Throwable e) {\r
throw new ServletModuleFailure(e);\r
}\r
}\r
\r
- /**\r
- * delete(req,res) - generic delete method. Can be overridden in subclasses.\r
- *\r
- */\r
+ public void editObject(HttpServletRequest aRequest, HttpServletResponse aResponse, Object anObject, boolean anIsNew, String anId) throws ServletModuleExc {\r
+ HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
+ URLBuilder urlBuilder = new URLBuilder();\r
+ EntityAdapterModel model;\r
\r
- public void delete(HttpServletRequest req, HttpServletResponse res)\r
- throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
try {\r
- String idParam = req.getParameter("id");\r
+ Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)});\r
\r
- if (idParam == null)\r
- throw new ServletModuleExc("Invalid call to delete: no id supplied");\r
+ responseData.put("module", getOperationModuleName());\r
+ responseData.put("entity", anObject);\r
+ responseData.put("new", new Boolean(anIsNew));\r
\r
- String confirmParam = req.getParameter("confirm");\r
- String cancelParam = req.getParameter("cancel");\r
- if (confirmParam == null && cancelParam == null) {\r
- SimpleHash mergeData = new SimpleHash();\r
-\r
- mergeData.put("module", getOperationModuleName());\r
- mergeData.put("infoString", getOperationModuleName() + ": " + idParam);\r
- mergeData.put("id", idParam);\r
- mergeData.put("where", req.getParameter("where"));\r
- mergeData.put("order", req.getParameter("order"));\r
- mergeData.put("offset", req.getParameter("offset"));\r
- // this stuff is to be compatible with the other more advanced\r
- // search method used for media and comments\r
- mergeData.put("query_media_folder", req.getParameter("query_media_folder"));\r
- mergeData.put("query_is_published", req.getParameter("query_is_published"));\r
- mergeData.put("query_text", req.getParameter("query_text"));\r
- mergeData.put("query_field", req.getParameter("query_field"));\r
-\r
- deliver(req, res, mergeData, templateConfirmString);\r
- }\r
+\r
+ urlBuilder.setValue("module", getOperationModuleName());\r
+ urlBuilder.setValue("returnurl", requestParser.getParameter("returnurl"));\r
+ if (anIsNew)\r
+ urlBuilder.setValue("do", "add");\r
else {\r
- if (confirmParam != null && !confirmParam.equals("")) {\r
- //theLog.printInfo("delete confirmed!");\r
- mainModule.deleteById(idParam);\r
- list(req, res); // back to list\r
- }\r
- else {\r
- if (req.getParameter("where") != null)\r
- list(req, res);\r
- else\r
- edit(req, res);\r
- }\r
+ urlBuilder.setValue("id", anId);\r
+ urlBuilder.setValue("do", "edit");\r
}\r
+ responseData.put("returnurl", requestParser.getParameter("returnurl"));\r
+ responseData.put("thisurl", urlBuilder.getQuery());\r
+\r
+ ServletHelper.generateResponse(aResponse.getWriter(), responseData, editGenerator);\r
}\r
catch (Throwable e) {\r
throw new ServletModuleFailure(e);\r
}\r
}\r
\r
+\r
/**\r
- * edit(req,res) - generische Editmethode. Wennn die Funktionalitaet\r
- * nicht reicht, muss sie in der abgeleiteten ServletModule-Klasse\r
- * ueberschreiben werden.\r
+ * Generic add method\r
*\r
- * @param req Http-Request, das vom Dispatcher durchgereicht wird\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
+ * @param aRequest\r
+ * @param aResponse\r
+ * @throws ServletModuleExc\r
+ * @throws ServletModuleUserExc\r
+ * @throws ServletModuleFailure\r
*/\r
- public void edit(HttpServletRequest req, HttpServletResponse res)\r
+ public void add(HttpServletRequest aRequest, HttpServletResponse aResponse)\r
throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
- edit(req, res, req.getParameter("id"));\r
+\r
+ Map object = new HashMap();\r
+\r
+ Iterator i = mainModule.getStorageObject().getFields().iterator();\r
+\r
+ while (i.hasNext())\r
+ object.put(i.next(), "");\r
+\r
+ initializeNewObject(object, aRequest, aResponse);\r
+\r
+ editObject(aRequest, aResponse, object, true, null);\r
+ }\r
+\r
+ protected void initializeNewObject(Map aNewObject, HttpServletRequest aRequest, HttpServletResponse aResponse) {\r
+ }\r
+\r
+ /**\r
+ * Method called when the user edits an object.\r
+ *\r
+ * @param aRequest\r
+ * @param aResponse\r
+ * @throws ServletModuleExc\r
+ * @throws ServletModuleUserExc\r
+ * @throws ServletModuleFailure\r
+ */\r
+ public void edit(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
+ edit(aRequest, aResponse, aRequest.getParameter("id"));\r
}\r
\r
/**\r
- * edit(req,res) - generische Editmethode. Wennn die Funktionalitaet\r
- * nicht reicht, muss sie in der abgeleiteten ServletModule-Klasse\r
- * ueberschreiben werden.\r
+ * Generic edit method\r
*\r
- * @param req Http-Request, das vom Dispatcher durchgereicht wird\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
+ * @param aRequest\r
+ * @param aResponse\r
+ * @param anIdentifier\r
+ * @throws ServletModuleExc\r
+ * @throws ServletModuleUserExc\r
+ * @throws ServletModuleFailure\r
*/\r
public void edit(HttpServletRequest aRequest, HttpServletResponse aResponse, String anIdentifier)\r
throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
try {\r
- deliver(aRequest, aResponse, mainModule.getById(anIdentifier), templateObjektString);\r
+ editObject(aRequest, aResponse, model.makeEntityAdapter(definition, mainModule.getById(anIdentifier)), false, anIdentifier);\r
}\r
catch (Throwable e) {\r
throw new ServletModuleFailure(e);\r
}\r
\r
/**\r
- * update(req,res) - generische Updatemethode. Wennn die Funktionalitaet\r
- * nicht reicht, muss sie in der abgeleiteten ServletModule-Klasse\r
- * ueberschreiben werden.\r
+ * Generic update method\r
*\r
- * @param req Http-Request, das vom Dispatcher durchgereicht wird\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
+ * @param aRequest\r
+ * @param aResponse\r
+ * @throws ServletModuleExc\r
+ * @throws ServletModuleUserExc\r
+ * @throws ServletModuleFailure\r
*/\r
-\r
- public void update(HttpServletRequest req, HttpServletResponse res)\r
+ public void update(HttpServletRequest aRequest, HttpServletResponse aResponse)\r
throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
try {\r
- String idParam = req.getParameter("id");\r
- Map withValues = getIntersectingValues(req, mainModule.getStorageObject());\r
+ HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
\r
- String id = mainModule.set(withValues);\r
- String whereParam = req.getParameter("where");\r
- String orderParam = req.getParameter("order");\r
+ String id = aRequest.getParameter("id");\r
+ Map withValues = getIntersectingValues(aRequest, mainModule.getStorageObject());\r
+ mainModule.set(withValues);\r
\r
- if ((whereParam != null && !whereParam.equals("")) || (orderParam != null && !orderParam.equals(""))) {\r
- list(req, res);\r
+ String returnUrl = requestParser.getParameter("returnurl");\r
+\r
+ if (returnUrl!=null) {\r
+ redirect(aResponse, returnUrl);\r
}\r
else {\r
- edit(req, res);\r
+ edit(aRequest, aResponse, id);\r
}\r
}\r
catch (Throwable e) {\r
}\r
\r
/**\r
- * deliver liefert das Template mit dem Filenamen templateFilename\r
- * an den HttpServletResponse res aus, nachdem es mit den Daten aus\r
- * TemplateModelRoot rtm gemischt wurde\r
+ * Generic insert method\r
*\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
- * @param rtm beinahalten das freemarker.template.TempalteModelRoot mit den\r
- * Daten, die ins Template gemerged werden sollen.\r
- * @param tmpl Name des Templates\r
- * @exception ServletModuleException\r
+ * @param aRequest\r
+ * @param aResponse\r
+ * @throws ServletModuleExc\r
+ * @throws ServletModuleUserExc\r
+ * @throws ServletModuleFailure\r
*/\r
- public void deliver(HttpServletRequest req, HttpServletResponse res, TemplateModelRoot rtm,\r
- TemplateModelRoot popups, String templateFilename) throws ServletModuleFailure {\r
- if (rtm == null)\r
- rtm = new SimpleHash();\r
-\r
+ public void insert(HttpServletRequest aRequest, HttpServletResponse aResponse)\r
+ throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
try {\r
- PrintWriter out = res.getWriter();\r
- HTMLTemplateProcessor.process(res, templateFilename, rtm, popups, out, getLocale(req));\r
-\r
- // we default to admin bundles here, which is not exactly beautiful...\r
- // but this whole producer stuff is going to be rewritten soon.\r
- // ServletModuleOpenIndy overwrites deliver() to use open bundles\r
- // (br1)\r
- out.close();\r
+ HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
+\r
+ Map object = getIntersectingValues(aRequest, mainModule.getStorageObject());\r
+\r
+ String id = processInstertedObject(object, aRequest, aResponse);\r
+\r
+ String returnUrl = requestParser.getParameter("returnurl");\r
+\r
+ if (returnUrl!=null) {\r
+ redirect(aResponse, returnUrl);\r
+ }\r
+ else {\r
+ edit(aRequest, aResponse, id);\r
+ }\r
}\r
catch (Throwable e) {\r
throw new ServletModuleFailure(e);\r
}\r
}\r
\r
+ public String processInstertedObject(Map anObject, HttpServletRequest aRequest, HttpServletResponse aResponse) {\r
+ try {\r
+ return mainModule.add(anObject);\r
+ }\r
+ catch (Throwable t) {\r
+ throw new ServletModuleFailure(t);\r
+ }\r
+ };\r
\r
/**\r
- * deliver liefert das Template mit dem Filenamen templateFilename\r
- * an den HttpServletResponse res aus, nachdem es mit den Daten aus\r
- * TemplateModelRoot rtm gemischt wurde\r
- *\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
- * @param rtm beinahalten das freemarker.template.TempalteModelRoot mit den\r
- * Daten, die ins Template gemerged werden sollen.\r
- * @param tmpl Name des Templates\r
- * @exception ServletModuleException\r
- */\r
- public void deliver(HttpServletRequest req, HttpServletResponse res,\r
- TemplateModelRoot rtm, String templateFilename) throws ServletModuleFailure {\r
- deliver(req, res, rtm, null, templateFilename);\r
- }\r
-\r
- /**\r
- * deliver liefert das Template mit dem Filenamen templateFilename\r
- * an den HttpServletResponse res aus, nachdem es mit den Daten aus\r
- * TemplateModelRoot rtm gemischt wurde\r
*\r
- * @param res Http-Response, die vom Dispatcher durchgereicht wird\r
- * @param rtm beinahalten das freemarker.template.TempalteModelRoot mit den\r
- * Daten, die ins Template gemerged werden sollen.\r
- * @param tmpl Name des Templates\r
- * @exception ServletModuleException\r
+ * @param aRequest\r
+ * @param aResponse\r
*/\r
- public void deliver_compressed(HttpServletRequest req, HttpServletResponse res,\r
- TemplateModelRoot rtm, String templateFilename)\r
- throws ServletModuleFailure {\r
- if (rtm == null) rtm = new SimpleHash();\r
+ public void confirmdelete(HttpServletRequest aRequest, HttpServletResponse aResponse) {\r
try {\r
- PrintWriter out = new LineFilterWriter(res.getWriter());\r
- //PrintWriter out = res.getWriter();\r
- HTMLTemplateProcessor.process(res, templateFilename, rtm, out, getLocale(req));\r
- out.close();\r
+ String idParam = aRequest.getParameter("id");\r
+ String confirmParam = aRequest.getParameter("confirm");\r
+ String cancelParam = aRequest.getParameter("cancel");\r
+\r
+ if (confirmParam != null && !confirmParam.equals("")) {\r
+ mainModule.deleteById(idParam);\r
+ redirect(aResponse, aRequest.getParameter("okurl"));\r
+ }\r
+ else\r
+ redirect(aResponse, aRequest.getParameter("cancelurl"));\r
}\r
- catch (Throwable e) {\r
- throw new ServletModuleFailure(e);\r
+ catch (Throwable t) {\r
+ throw new ServletModuleFailure(t);\r
}\r
}\r
\r
/**\r
- * deliver liefert das Template mit dem Filenamen templateFilename\r
- * an den HttpServletResponse res aus, nachdem es mit den Daten aus\r
- * TemplateModelRoot rtm gemischt wurde\r
*\r
- * @param out ist der OutputStream, in den die gergten Daten geschickt werden sollen.\r
- * @param rtm beinahalten das freemarker.template.TempalteModelRoot mit den\r
- * Daten, die ins Template gemerged werden sollen.\r
- * @param tmpl Name des Templates\r
- * @exception ServletModuleException\r
+ * @param aRequest\r
+ * @param aResponse\r
+ * @throws ServletModuleExc\r
+ * @throws ServletModuleUserExc\r
+ * @throws ServletModuleFailure\r
*/\r
- private void deliver(HttpServletResponse res, HttpServletRequest req, PrintWriter out,\r
- TemplateModelRoot rtm, String templateFilename)\r
- throws ServletModuleFailure {\r
+ public void delete(HttpServletRequest aRequest, HttpServletResponse aResponse)\r
+ throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {\r
try {\r
- HTMLTemplateProcessor.process(res, templateFilename, rtm, out,\r
- getLocale(req));\r
+ String idParam = aRequest.getParameter("id");\r
+\r
+ if (idParam == null)\r
+ throw new ServletModuleExc("Invalid call to delete: no id supplied");\r
+\r
+ Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)});\r
+\r
+ responseData.put("module", getOperationModuleName());\r
+ responseData.put("id", idParam);\r
+ responseData.put("cancelurl", aRequest.getParameter("cancelurl"));\r
+ responseData.put("okurl", aRequest.getParameter("okurl"));\r
+\r
+ ServletHelper.generateResponse(aResponse.getWriter(), responseData, deleteConfirmationGenerator);\r
}\r
catch (Throwable e) {\r
throw new ServletModuleFailure(e);\r
*\r
* @return Map with the values\r
*/\r
- public Map getIntersectingValues(HttpServletRequest req, StorageObject theStorage)\r
+ public Map getIntersectingValues(HttpServletRequest aRequest, StorageObject theStorage)\r
throws ServletModuleExc, ServletModuleFailure {\r
\r
try {\r
HTTPRequestParser parser;\r
List theFieldList;\r
\r
- logger.debug("using charset: " + req.getParameter("charset"));\r
- logger.debug("using method: " + req.getParameter("do"));\r
- if (req.getParameter("charset") != null) {\r
- parser = new HTTPRequestParser(req, req.getParameter("charset"));\r
- logger.debug("using charset: " + req.getParameter("charset"));\r
- logger.debug("original charset: " + req.getCharacterEncoding());\r
- }\r
- else {\r
- parser = new HTTPRequestParser(req);\r
- }\r
+ parser = new HTTPRequestParser(aRequest);\r
\r
theFieldList = theStorage.getFields();\r
\r
for (int i = 0; i < theFieldList.size(); i++) {\r
aField = (String) theFieldList.get(i);\r
\r
- logger.debug("field " + aField + " = " + parser.getParameter(aField));\r
-\r
aValue = parser.getParameter(aField);\r
if (aValue != null)\r
withValues.put(aField, aValue);\r
throw new ServletModuleFailure( "ServletModule.getIntersectingValues: " + e.getMessage(), e);\r
}\r
}\r
-\r
-}\r
+}
\ No newline at end of file
projects / mir.git / blobdiff