package mircoders.servlet;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ArrayList;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import mir.config.MirPropertiesConfiguration;
import mir.entity.Entity;
import mir.entity.adapter.EntityAdapter;
-import mir.entity.adapter.EntityAdapterModel;
-import mir.entity.adapter.EntityIteratorAdapter;
-import mir.log.LoggerWrapper;
-import mircoders.media.MediaHelper;
+import mir.entity.adapter.EntityAdapterEngine;
import mir.media.MediaHandler;
-import mir.servlet.ServletModule;
+import mir.servlet.AdminServletModule;
import mir.servlet.ServletModuleExc;
import mir.servlet.ServletModuleFailure;
import mir.servlet.ServletModuleUserExc;
import mir.session.UploadedFile;
-import mir.util.CachingRewindableIterator;
-import mir.util.ExceptionFunctions;
+import mir.session.CommonsUploadedFileAdapter;
+import mir.util.ExceptionRoutines;
import mir.util.HTTPParsedRequest;
import mir.util.HTTPRequestParser;
import mir.util.JDBCStringRoutines;
import mircoders.entity.EntityComment;
import mircoders.entity.EntityContent;
import mircoders.entity.EntityUploadedMedia;
-import mircoders.global.MirGlobal;
+import mircoders.media.MediaHelper;
import mircoders.media.MediaUploadProcessor;
-import mircoders.module.ModuleMediaType;
+import mircoders.media.UnsupportedMediaTypeExc;
import mircoders.storage.DatabaseComment;
import mircoders.storage.DatabaseContent;
-
import org.apache.commons.fileupload.FileItem;
-/**
- *
- * <p>Title: </p>
- * <p>Description: </p>
- * <p>Copyright: Copyright (c) 2003</p>
- * <p>Company: </p>
- * @author the mir coders
- * @version 1.0
- */
-
-public abstract class ServletModuleUploadedMedia extends ServletModule {
- protected String moduleName = "UploadedMedia";
-
- public static ServletModule getInstance() {
- return null;
- }
+import javax.servlet.ServletContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
- public ServletModuleUploadedMedia() {
- super();
+public abstract class ServletModuleUploadedMedia extends AdminServletModule {
+ private String moduleName;
+ protected ServletModuleUploadedMedia(String aModuleName) {
+ moduleName = aModuleName;
definition = "uploadedMedia";
- logger = new LoggerWrapper("ServletModule.UploadedMedia");
}
public void insert(HttpServletRequest aRequest, HttpServletResponse aResponse)
throws ServletModuleExc, ServletModuleUserExc {
+
try {
HTTPParsedRequest parsedRequest = new HTTPParsedRequest(aRequest,
- configuration.getString("Mir.DefaultEncoding"),
- configuration.getInt("MaxMediaUploadSize")*1024,
- configuration.getString("TempDir"));
+ getConfiguration().getString("Mir.DefaultEncoding"),
+ getConfiguration().getInt("MaxMediaUploadSize")*1024,
+ getConfiguration().getString("TempDir"));
Map mediaValues = new HashMap();
mediaValues.put("to_publisher", ServletHelper.getUser(aRequest).getId());
- Iterator i = mainModule.getStorageObject().getFields().iterator();
+ Iterator i = mainModule.getStorageObject().getFieldNames().iterator();
while (i.hasNext()) {
String field = (String) i.next();
String value = parsedRequest.getParameter(field);
i = parsedRequest.getFiles().iterator();
while (i.hasNext()) {
- UploadedFile file = new mir.session.CommonsUploadedFileAdapter((FileItem) i.next());
+ UploadedFile file = new CommonsUploadedFileAdapter((FileItem) i.next());
String suffix = file.getFieldName().substring(5);
mediaValues.put("title", parsedRequest.getParameter("media_title" + suffix));
String commentid = parsedRequest.getParameter("commentid");
if (articleid!=null) {
- EntityContent entContent = (EntityContent) DatabaseContent.getInstance().selectById(articleid);
+ EntityContent entContent = (EntityContent)
+ DatabaseContent.getInstance().selectById(articleid);
- i=mediaList.iterator();
+ i = mediaList.iterator();
while (i.hasNext()) {
- String id = ((EntityUploadedMedia) i.next()).getId();
+ String id = ((Entity) i.next()).getId();
entContent.attach(id);
logAdminUsage(aRequest, id, "object attached to article " + articleid);
}
- (ServletModuleContent.getInstance()).editObject(aRequest, aResponse, articleid);
-
+ ServletHelper.redirect(aResponse, "module=Content&do=edit&id=" + articleid);
return;
}
logAdminUsage(aRequest, id, "object attached to comment " + commentid);
}
- (ServletModuleComment.getInstance()).editObject(aRequest, aResponse, commentid);
+ ServletHelper.redirect(aResponse, "module=Comment&do=edit&id=" + commentid);
return;
}
logAdminUsage(aRequest, "", mediaList.size() + " objects added");
- returnUploadedMediaList(aRequest, aResponse, mediaList, 1, mediaList.size(), mediaList.size(), "", null, null);
+ returnUploadedMediaList(aRequest, aResponse, mediaList, 1, mediaList.size(), "", null, null);
}
catch (Throwable t) {
- Throwable cause = ExceptionFunctions.traceCauseException(t);
+ Throwable cause = ExceptionRoutines.traceCauseException(t);
- if (cause instanceof ModuleMediaType.UnsupportedMimeTypeExc) {
+ if (cause instanceof UnsupportedMediaTypeExc) {
throw new ServletModuleUserExc("media.error.unsupportedformat", new String[] {});
}
throw new ServletModuleFailure("ServletModuleUploadedMedia.insert: " + t.toString(), t);
try {
HTTPParsedRequest parsedRequest = new HTTPParsedRequest(aRequest,
- configuration.getString("Mir.DefaultEncoding"),
- configuration.getInt("MaxMediaUploadSize")*1024,
- configuration.getString("TempDir"));
+ getConfiguration().getString("Mir.DefaultEncoding"),
+ getConfiguration().getInt("MaxMediaUploadSize")*1024,
+ getConfiguration().getString("TempDir"));
+
Map mediaValues = new HashMap();
- Iterator i = mainModule.getStorageObject().getFields().iterator();
+ Iterator i = mainModule.getStorageObject().getFieldNames().iterator();
while (i.hasNext()) {
String field = (String) i.next();
String value = parsedRequest.getParameter(field);
- if (value!=null)
+ if (value!=null) {
mediaValues.put(field, value);
+ }
}
mediaValues.put("to_publisher", ServletHelper.getUser(aRequest).getId());
mediaValues.put("is_produced", "0");
- if (!mediaValues.containsKey("is_published"))
+ if (!mediaValues.containsKey("is_published")) {
mediaValues.put("is_published", "0");
+ }
String id = mainModule.set(mediaValues);
- logger.debug("update: media ID = " + id);
+ getLogger().debug("update: media ID = " + id);
logAdminUsage(aRequest, id, "object modified");
editUploadedMediaObject(id, aRequest, aResponse);
}
public void returnUploadedMediaList(HttpServletRequest aRequest, HttpServletResponse aResponse,
- Object aList, int aFrom, int aTo, int aCount,
+ Object aList, int aFrom, int aTo,
String aThisUrl, String aNextUrl, String aPreviousUrl) throws ServletModuleExc {
try {
responseData.put("from", Integer.toString(aFrom));
- responseData.put("count", Integer.toString(aCount));
responseData.put("to", Integer.toString(aTo));
responseData.put("medialist", aList);
HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
URLBuilder urlBuilder = new URLBuilder();
- EntityAdapterModel model;
String nextPageUrl = null;
String previousPageUrl = null;
String thisUrl = null;
- int count;
-
try {
- model = MirGlobal.localizer().dataModel().adapterModel();
-
- Object mediaList =
- new CachingRewindableIterator(
- new EntityIteratorAdapter(aWhereClause, anOrderByClause, nrEntitiesPerListPage,
- model, definition, nrEntitiesPerListPage, anOffset)
- );
-
- count = mainModule.getSize(aWhereClause);
+ List list =
+ EntityAdapterEngine.retrieveAdapterList(getModel(), definition, aWhereClause, anOrderByClause, nrEntitiesPerListPage, anOffset);
urlBuilder.setValue("module", moduleName);
urlBuilder.setValue("do", "list");
urlBuilder.setValue("offset", anOffset);
thisUrl = urlBuilder.getQuery();
- if (count >= anOffset + nrEntitiesPerListPage) {
+ if (list.size() >= nrEntitiesPerListPage) {
urlBuilder.setValue("offset", anOffset + nrEntitiesPerListPage);
nextPageUrl = urlBuilder.getQuery();
}
previousPageUrl = urlBuilder.getQuery();
}
- returnUploadedMediaList(aRequest, aResponse, mediaList,
- anOffset+1, anOffset+nrEntitiesPerListPage, count, thisUrl,
+ returnUploadedMediaList(aRequest, aResponse, list,
+ anOffset+1, anOffset+nrEntitiesPerListPage, thisUrl,
nextPageUrl, previousPageUrl);
}
catch (Throwable e) {
Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)});
int nrMedia = requestParser.getIntegerWithDefault("nrmedia", 1);
- int maxNrMedia=configuration.getInt("ServletModule.OpenIndy.MaxMediaUploadItems", 20);
+ int maxNrMedia = getConfiguration().getInt("ServletModule.OpenIndy.MaxMediaUploadItems", 20);
- List fields = mainModule.getStorageObject().getFields();
+ List fields = mainModule.getStorageObject().getFieldNames();
Map media = new HashMap();
Iterator i = fields.iterator();
while (i.hasNext()) {
}
private void editUploadedMediaObject(String idParam, HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
- if (idParam != null && !idParam.equals("")) {
+ if (idParam != null && !"".equals(idParam)) {
try {
Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)});
EntityAdapter object =
- model.makeEntityAdapter(definition, mainModule.getById(idParam));
+ getModel().makeEntityAdapter(definition, mainModule.getById(idParam));
HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
responseData.put("uploadedmedia", object);
responseData.put("new", Boolean.FALSE);
if (idParam!=null && !idParam.equals("")) {
try {
- EntityUploadedMedia entity = (EntityUploadedMedia)mainModule.getById(idParam);
+ EntityUploadedMedia entity = (EntityUploadedMedia) mainModule.getById(idParam);
Entity mediaType = entity.getMediaType();
MediaHandler mediaHandler;
throw new ServletModuleFailure(e);
}
}
- else logger.error("id not specified.");
+ else {
+ getLogger().error("id not specified.");
+ }
// no exception allowed
}
getThumbnail(aRequest, aResponse);
}
- /**
- *
- * @param aRequest
- * @param aResponse
- * @throws ServletModuleExc
- */
public void getThumbnail(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
String id = aRequest.getParameter("id");
}
}
catch (Throwable e) {
- logger.error("getIcon: " + e.toString());
+ getLogger().error("getIcon: " + e.toString());
}
}
- else logger.error("getIcon: id not specified.");
+ else {
+ getLogger().error("getIcon: id not specified.");
+ }
}
protected void addExtraData(Map aTarget) throws ServletModuleExc, ServletModuleFailure {
try {
aTarget.put("mediafolders",
- new EntityIteratorAdapter("", "", 20, MirGlobal.localizer().dataModel().adapterModel(), "mediaFolder"));
+ EntityAdapterEngine.retrieveAdapterList(getModel(), "mediaFolder", "", "", -1, 0));
}
catch (Throwable t) {
throw new ServletModuleFailure(t);
}
}
- public void showarticles(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc
- {
+ public void showarticles(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
String idParam = aRequest.getParameter("id");
if (idParam!=null && !idParam.equals("")) {
try {
// TODO rewrite as relational sql
- ServletModuleContent.getInstance().returnList(
+ ServletHelper.getServletModuleContent().returnList(
aRequest,
aResponse,
- "exists (select * from content_x_media where content_id=content.id and media_id=" + JDBCStringRoutines.escapeStringLiteral( idParam ) + ")", "", 0);
+ "exists (select * from content_x_media where content_id=content.id and media_id='" +
+ JDBCStringRoutines.escapeStringLiteral( idParam ) + "')", "", 0);
}
catch (Throwable t) {
throw new ServletModuleFailure(t);
}
}
- else logger.error("showarticles: id not specified.");
+ else {
+ getLogger().error("showarticles: id not specified.");
+ }
}
public void showcomments(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc
if (idParam!=null && !idParam.equals("")) {
try {
// TODO rewrite as relational sql
- ServletModuleComment.getInstance().returnList(
+ ServletHelper.getServletModuleComment().returnList(
aRequest,
aResponse,
- "exists (select * from comment_x_media where comment_id=comment.id and media_id=" + JDBCStringRoutines.escapeStringLiteral( idParam ) + ")", "", 0);
+ "exists (select * from comment_x_media where comment_id=comment.id and media_id='" + JDBCStringRoutines.escapeStringLiteral( idParam ) + "')", "", 0);
}
catch (Throwable t) {
throw new ServletModuleFailure(t);
}
}
- else logger.error("showcomments: id not specified.");
+ else {
+ getLogger().error("showcomments: id not specified.");
+ }
}
}
\ No newline at end of file
projects / mir.git / blobdiff