/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
*
* This file is part of Mir.
*
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two. You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries. If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so. If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
*/
package mircoders.servlet;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Vector;
import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleList;
-
import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
import mir.entity.Entity;
import mir.entity.EntityList;
import mir.log.LoggerWrapper;
import mir.media.MediaHelper;
import mir.media.MirMedia;
-import mir.misc.FileHandler;
-import mir.misc.WebdbMultipartRequest;
import mir.servlet.ServletModule;
import mir.servlet.ServletModuleExc;
import mir.servlet.ServletModuleFailure;
import mir.servlet.ServletModuleUserExc;
-import mir.storage.StorageObjectFailure;
+import mir.session.UploadedFile;
import mir.util.ExceptionFunctions;
+import mir.util.HTTPParsedRequest;
+import mircoders.entity.EntityComment;
import mircoders.entity.EntityContent;
import mircoders.entity.EntityUploadedMedia;
import mircoders.entity.EntityUsers;
-import mircoders.media.MediaRequest;
-import mircoders.media.UnsupportedMediaFormatExc;
+import mircoders.media.MediaUploadProcessor;
+import mircoders.module.*;
+import mircoders.storage.DatabaseComment;
import mircoders.storage.DatabaseContent;
import mircoders.storage.DatabaseMediafolder;
+import org.apache.commons.fileupload.FileItem;
+
+import freemarker.template.SimpleHash;
+import freemarker.template.SimpleList;
+
/*
* ServletModuleBilder -
* liefert HTML fuer Bilder
*
- * @version $Id: ServletModuleUploadedMedia.java,v 1.21 2003/03/09 03:53:12 zapata Exp $
+ * @version $Id: ServletModuleUploadedMedia.java,v 1.28 2003/04/29 02:36:51 zapata Exp $
* @author RK, the mir-coders group
*/
public void insert(HttpServletRequest req, HttpServletResponse res)
throws ServletModuleExc, ServletModuleUserExc {
try {
+ HTTPParsedRequest parsedRequest = new HTTPParsedRequest(req,
+ configuration.getString("Mir.DefaultEncoding"),
+ configuration.getInt("MaxMediaUploadSize")*1024,
+ configuration.getString("TempDir"));
+
EntityUsers user = _getUser(req);
- MediaRequest mediaReq = new MediaRequest(user.getId(), false);
- WebdbMultipartRequest mp = new WebdbMultipartRequest(req, (FileHandler)mediaReq);
- EntityList mediaList = mediaReq.getEntityList();
- String articleid = (String) mp.getParameters().get("articleid");
+ Map mediaValues = new HashMap();
+
+ mediaValues.put("to_publisher", _getUser(req).getId());
+
+ Iterator i = mainModule.getStorageObject().getFields().iterator();
+ while (i.hasNext()) {
+ String field = (String) i.next();
+ String value = parsedRequest.getParameter(field);
+ if (value!=null)
+ mediaValues.put(field, value);
+ }
+
+ List mediaList = new Vector();
+
+ i = parsedRequest.getFiles().iterator();
+ while (i.hasNext()) {
+ UploadedFile file = new mir.session.CommonsUploadedFileAdapter((FileItem) i.next());
+
+ String suffix = file.getFieldName().substring(5);
+ mediaValues.put("title", parsedRequest.getParameter("media_title" + suffix));
+
+ mediaList.add(MediaUploadProcessor.processMediaUpload(file, mediaValues));
+ }
+
+ String articleid = parsedRequest.getParameter("articleid");
+ String commentid = parsedRequest.getParameter("commentid");
if (articleid!=null) {
EntityContent entContent = (EntityContent) DatabaseContent.getInstance().selectById(articleid);
- mediaList.rewind();
+ i=mediaList.iterator();
- while (mediaList.hasNext()) {
- entContent.attach( ( (EntityUploadedMedia) mediaList.next()).getId());
+ while (i.hasNext()) {
+ entContent.attach(((EntityUploadedMedia) i.next()).getId());
}
- mediaList.rewind();
((ServletModuleContent) ServletModuleContent.getInstance())._showObject(articleid, req, res);
return;
}
+ if (commentid!=null) {
+ EntityComment comment = (EntityComment) DatabaseComment.getInstance().selectById(commentid);
+
+ i=mediaList.iterator();
+
+ while (i.hasNext()) {
+ comment.attach( ( (EntityUploadedMedia) i.next()).getId());
+ }
+
+ ((ServletModuleComment) ServletModuleComment.getInstance()).showComment(commentid, req, res);
+
+ return;
+ }
+
SimpleHash mergeData = new SimpleHash();
SimpleHash popups = new SimpleHash();
- mergeData.put("contentlist", mediaList);
- if (mediaList.getOrder() != null) {
- mergeData.put("order", mediaList.getOrder());
- mergeData.put("order_encoded", URLEncoder.encode(mediaList.getOrder()));
- }
- mergeData.put("count", (new Integer(mediaList.getCount())).toString());
- mergeData.put("from", (new Integer(mediaList.getFrom())).toString());
- mergeData.put("to", (new Integer(mediaList.getTo())).toString());
- if (mediaList.hasNextBatch())
- mergeData.put("next", (new Integer(mediaList.getNextBatch())).toString());
- if (mediaList.hasPrevBatch())
- mergeData.put("prev", (new Integer(mediaList.getPrevBatch())).toString());
+ mergeData.put("contentlist", mir.generator.FreemarkerGenerator.makeAdapter(mediaList));
+
+ mergeData.put("count", Integer.toString(mediaList.size()));
+ mergeData.put("from", "1");
+ mergeData.put("to", Integer.toString(mediaList.size()));
+
//fetch the popups
popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());
// raus damit
catch (Throwable t) {
Throwable cause = ExceptionFunctions.traceCauseException(t);
- if (cause instanceof UnsupportedMediaFormatExc) {
- throw new ServletModuleUserExc("Unsupported media format");
+ if (cause instanceof ModuleMediaType.UnsupportedMimeTypeExc) {
+ throw new ServletModuleUserExc("media.error.unsupportedformat", new String[] {});
}
throw new ServletModuleFailure("ServletModuleUploadedMedia.insert: " + t.toString(), t);
}
public void update(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc {
try {
+ HTTPParsedRequest parsedRequest = new HTTPParsedRequest(req,
+ configuration.getString("Mir.DefaultEncoding"),
+ configuration.getInt("MaxMediaUploadSize")*1024,
+ configuration.getString("TempDir"));
EntityUsers user = _getUser(req);
- WebdbMultipartRequest mp = new WebdbMultipartRequest(req, null);
- Map parameters = mp.getParameters();
+ Map mediaValues = new HashMap();
+
+ Iterator i = mainModule.getStorageObject().getFields().iterator();
+ while (i.hasNext()) {
+ String field = (String) i.next();
+ String value = parsedRequest.getParameter(field);
+ if (value!=null)
+ mediaValues.put(field, value);
+ }
- parameters.put("to_publisher", user.getId());
- parameters.put("is_produced", "0");
- if (!parameters.containsKey("is_published"))
- parameters.put("is_published", "0");
+ mediaValues.put("to_publisher", user.getId());
+ mediaValues.put("is_produced", "0");
+ if (!mediaValues.containsKey("is_published"))
+ mediaValues.put("is_published", "0");
- String id = mainModule.set(parameters);
+ String id = mainModule.set(mediaValues);
logger.debug("update: media ID = " + id);
_edit(id, req, res);
}
if (order == null || order.equals("")) order = "webdb_lastchange desc";
// if in connection mode to content
- String cid = req.getParameter("cid");
- mergeData.put("cid", cid);
+ mergeData.put("articleid", req.getParameter("articleid"));
+ mergeData.put("commentid", req.getParameter("commentid"));
// sql basteln
mergeData.put("new", "1");
mergeData.put("articleid", req.getParameter("articleid"));
+ mergeData.put("commentid", req.getParameter("commentid"));
popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());
String idParam = req.getParameter("id");
if (idParam!=null && !idParam.equals("")) {
try {
- EntityUploadedMedia ent = (EntityUploadedMedia)mainModule.getById(idParam);
+ EntityUploadedMedia ent = (EntityUploadedMedia) mainModule.getById(idParam);
Entity mediaType = ent.getMediaType();
MirMedia mediaHandler;
- ServletContext ctx = MirPropertiesConfiguration.getContext();
- String fName = ent.getId()+"."+mediaType.getValue("name");
-
mediaHandler = MediaHelper.getHandler(mediaType);
InputStream in = mediaHandler.getIcon(ent);
- res.setContentType(ctx.getMimeType(fName));
+ if (in==null)
+ throw new ServletModuleExc("no icon available");
+
+ res.setContentType(mediaHandler.getIconMimeType(ent, mediaType));
//important that before calling this res.getWriter was not called first
ServletOutputStream out = res.getOutputStream();
projects / mir.git / blobdiff