import mircoders.storage.*;
import mircoders.module.*;
import mircoders.producer.*;
+import mircoders.media.MediaRequest;
/*
* ServletModuleOpenIndy -
* open-postings to the newswire
*
* @author $Author: mh $
- * @version $Revision: 1.36 $ $Date: 2002/06/29 15:45:20 $
+ * @version $Revision: 1.37 $ $Date: 2002/07/21 22:41:45 $
*
* $Log: ServletModuleOpenIndy.java,v $
+ * Revision 1.37 2002/07/21 22:41:45 mh
+ * make use of new MediaRequest class. A big cleanup and optimization.
+ *
* Revision 1.36 2002/06/29 15:45:20 mh
* cvs macros
*
try {
WebdbMultipartRequest mp = new WebdbMultipartRequest(req);
+
+ EntityList mediaList = null;
+ try {
+ // new MediaRequest, "1" is the id for the openPosting user
+ mediaList = new MediaRequest(mp, "1").getMedia(true, true);
+ } catch (MirMediaUserException e) {
+ throw new ServletModuleUserException(e.getMsg());
+ }
HashMap withValues = mp.getParameters();
withValues.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
withValues.put("publish_path", StringUtil.webdbDate2path((String)withValues.get("date")));
withValues.put("is_produced", "0");
- // op-articles are not immediatly published
- // we don't know that all is good yet (media, title is present, etc..)
- withValues.put("is_published","0");
+ // by default stuff is published, they can be un-published through the
+ // admin interface.
+ withValues.put("is_published","1");
// if op direct article-type == newswire
if (directOp.equals("yes")) withValues.put("to_article_type","1");
throw new ServletModuleException("smod - openindy :: insposting: setting content_x_topic failed: "+e.toString());
} //end try
} //end if
-
- // if op contains uploaddata
- String mediaId=null;
- int i=1;
- for(Iterator it = mp.requestList.iterator(); it.hasNext();){
- MpRequest mpReq = (MpRequest)it.next();
- String fileName = mpReq.getFilename();
-
- //get the content-type from what the client browser
- //sends us. (the "Oreilly method")
- String contentType = mpReq.getContentType();
-
- theLog.printInfo("FROM BROWSER: "+contentType);
-
- //if the client browser sent us unknown (text/plain is default)
- //or if we got application/octet-stream, it's possible that
- //the browser is in error, better check against the file extension
- if (contentType.equals("text/plain") ||
- contentType.equals("application/octet-stream")) {
- /**
- * Fallback to finding the mime-type through the standard ServletApi
- * ServletContext getMimeType() method.
- *
- * This is a way to get the content-type via the .extension,
- * we could maybe use a magic method as an additional method of
- * figuring out the content-type, by looking at the header (first
- * few bytes) of the file. (like the file(1) command). We could
- * also call the "file" command through Runtime. This is an
- * option that I almost prefer as it is already implemented and
- * exists with an up-to-date map on most modern Unix like systems.
- * I haven't found a really nice implementation of the magic method
- * in pure java yet.
- *
- * The first method we try thought is the "Oreilly method". It
- * relies on the content-type that the client browser sends and
- * that sometimes is application-octet stream with
- * broken/mis-configured browsers.
- *
- * The map file we use for the extensions is the standard web-app
- * deployment descriptor file (web.xml). See Mir's web.xml or see
- * your Servlet containers (most likely Tomcat) documentation.
- * So if you support a new media type you have to make sure that
- * it is in this file -mh
- */
- ServletContext ctx =
- (ServletContext)MirConfig.getPropAsObject("ServletContext");
- contentType = ctx.getMimeType(fileName);
- if (contentType==null)
- contentType = "text/plain"; // rfc1867 says this is the default
- }
- HashMap mediaValues = new HashMap();
-
- theLog.printInfo("CONTENT TYPE IS: "+contentType);
-
- if (contentType.equals("text/plain") ||
- contentType.equals("application/octet-stream")) {
- contentModule.deleteById(cid);
- _throwBadContentType(fileName, contentType);
- }
-
- String mediaTitle=(String)withValues.get("media_title"+i);
- i++;
-
- if ((mediaTitle == null) || (mediaTitle.length() == 0))
- throw new ServletModuleUserException("Missing field");
- //mediaTitle = (String)withValues.get("title");
-
- mediaValues.put("title", mediaTitle);
- mediaValues.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
- mediaValues.put("to_publisher", "1"); // op user
- mediaValues.put("to_media_folder", "7"); // op media_folder
- mediaValues.put("is_produced", "0");
- mediaValues.put("is_published","0");
-
- // @todo this should probably be moved to DatabaseMediaType -mh
- String[] cTypeSplit = StringUtil.split(contentType, "/");
- String wc = " mime_type LIKE '"+cTypeSplit[0]+"%'";
-
- DatabaseMediaType mediaTypeStor = DatabaseMediaType.getInstance();
- EntityList mediaTypesList = mediaTypeStor.selectByWhereClause(wc);
-
- String mediaTypeId = null;
- MirMedia mediaHandler;
- Database mediaStorage;
- ProducerMedia mediaProducer;
-
- //if we didn't find an entry matching the
- //content-type int the table.
- if (mediaTypesList.size() == 0) {
- contentModule.deleteById(cid);
- _throwBadContentType(fileName, contentType);
- }
-
- Entity mediaType = null;
- Entity mediaType2 = null;
-
- // find out if we an exact content-type match if so take it.
- // otherwise try to match majortype/*
- // @todo this should probably be moved to DatabaseMediaType -mh
- for(int j=0;j<mediaTypesList.size();j++) {
- if(contentType.equals(
- mediaTypesList.elementAt(j).getValue("mime_type")))
- mediaType = mediaTypesList.elementAt(j);
- else if ((mediaTypesList.elementAt(j).getValue("mime_type")).equals(
- cTypeSplit[0]+"/*") )
- mediaType2= mediaTypesList.elementAt(j);
- }
-
- if ( (mediaType == null) && (mediaType2 == null) ) {
- contentModule.deleteById(cid);
- _throwBadContentType(fileName, contentType);
- }
- else if( (mediaType == null) && (mediaType2 != null) )
- mediaType = mediaType2;
-
- //get the class names from the media_type table.
- mediaTypeId = mediaType.getId();
- try {
- // ############### @todo: merge these and the getURL call into one
- // getURL helper call that just takes the Entity as a parameter
- // along with media_type
- mediaHandler = MediaHelper.getHandler(mediaType);
- mediaStorage = MediaHelper.getStorage(mediaType,
- "mircoders.storage.Database");
- Class prodCls = Class.forName("mircoders.producer.Producer"
- +mediaType.getValue("tablename"));
- mediaProducer = (ProducerMedia)prodCls.newInstance();
- } catch (Exception e) {
- theLog.printError("getting media handler failed: "+e.toString());
- contentModule.deleteById(cid);
- throw new ServletModuleException("getting media handler failed: "
- +e.toString());
- }
-
- mediaValues.put("to_media_type",mediaTypeId);
-
- //load the classes via reflection
- String MediaId;
- Entity mediaEnt = null;
- try {
- mediaEnt = (Entity)mediaStorage.getEntityClass().newInstance();
- mediaEnt.setStorage(mediaStorage);
- mediaEnt.setValues(mediaValues);
- mediaId = mediaEnt.insert();
-
- //save and store the media data/metadata
- mediaHandler.set(mpReq.getMedia(), mediaEnt,
- mediaType);
-
- //were done with mpReq at this point, dereference it.
- //as it contains mucho mem. -mh 01.10.2001
- mpReq=null;
-
- //we got this far, associate the media to the article
- mediaEnt.setValueForProperty("is_published","1");
- mediaEnt.update();
- //produce it
- mediaProducer.handle(null, null, false, false, mediaId);
- DatabaseContentToMedia.getInstance().addMedia(cid,mediaId);
- } catch (Exception e) {
- theLog.printError("setting media failed: "+e.toString());
- contentModule.deleteById(cid);
- throw new ServletModuleException("setting media failed: "
- +e.toString());
- }
-
- } //end for Iterator...
-
- //if we're here all is ok...
- EntityContent contentEnt = (EntityContent)contentModule.getById(cid);
- contentEnt.setValueForProperty("is_published","1");
- contentEnt.update();
-
-
- //dereference mp. -mh
- mp=null;
+
+ //if we're here all is ok... associate the media to the article
+ for(int i=0;i<mediaList.size();i++) {
+ Entity mediaEnt = (Entity)mediaList.elementAt(i);
+ DatabaseContentToMedia.getInstance().addMedia(cid,mediaEnt.getId());
+ }
// producing openpostinglist
new ProducerOpenPosting().handle(null,null,false,false);
theLog.printDebugInfo("rsync: "+exitValue);
}
+ catch (MirMediaException e) { throw new ServletModuleException("MediaException: "+ e.toString());}
catch (IOException e) { throw new ServletModuleException("IOException: "+ e.toString());}
catch (StorageObjectException e) { throw new ServletModuleException("StorageObjectException" + e.toString());}
catch (ModuleException e) { throw new ServletModuleException("ModuleException"+e.toString());}
package mircoders.servlet;
import freemarker.template.SimpleHash;
+import freemarker.template.SimpleList;
import mir.entity.Entity;
import mir.entity.EntityList;
import mir.media.MediaHelper;
import mircoders.entity.EntityUsers;
import mircoders.storage.DatabaseMediaType;
import mircoders.storage.DatabaseMediafolder;
+import mircoders.media.MediaRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
throws ServletModuleException, ServletModuleUserException {
try {
WebdbMultipartRequest mp = new WebdbMultipartRequest(req);
- HashMap parameters = mp.getParameters();
EntityUsers user = _getUser(req);
- String mediaId = null;
- MpRequest mpReq = (MpRequest) mp.requestList.get(0);
- String mediaTypeId; //= null;
- MirMedia mediaHandler;
- Database mediaStorage;
-
- // get the content-type from what the client browser
- // sends us. (the "Oreilly method")
- String contentType = mpReq.getContentType();
- String fileName = mpReq.getFilename();
- theLog.printInfo("CONTENT-TYPE FROM BROWSER: " + contentType);
-
- // if the client browser sent us unknown (text/plain is default)
- // or if we got application/octet-stream, it's possible that
- // the browser is in error, better check against the file extension
- if (contentType.equals("text/plain") ||
- contentType.equals("application/octet-stream")) {
- /**
- * Fallback to finding the mime-type through the standard ServletApi
- * ServletContext getMimeType() method.
- *
- * This is a way to get the content-type via the .extension,
- * we could maybe use a magic method as an additional method of
- * figuring out the content-type, by looking at the header (first
- * few bytes) of the file. (like the file(1) command). We could
- * also call the "file" command through Runtime. This is an
- * option that I almost prefer as it is already implemented and
- * exists with an up-to-date map on most modern Unix like systems.
- * I haven't found a really nice implementation of the magic method
- * in pure java yet.
- *
- * The first method we try thought is the "Oreilly method". It
- * relies on the content-type that the client browser sends and
- * that sometimes is application-octet stream with
- * broken/mis-configured browsers.
- *
- * The map file we use for the extensions is the standard web-app
- * deployment descriptor file (web.xml). See Mir's web.xml or see
- * your Servlet containers (most likely Tomcat) documentation.
- * So if you support a new media type you have to make sure that
- * it is in this file -mh
- */
- ServletContext ctx =
- (ServletContext)MirConfig.getPropAsObject("ServletContext");
- contentType = ctx.getMimeType(fileName);
- if (contentType == null)
- contentType = "text/plain"; // rfc1867 says this is the default
- }
- theLog.printInfo("CONTENT TYPE IS: " + contentType);
-
- if (contentType.equals("text/plain") ||
- contentType.equals("application/octet-stream")) {
- _throwBadContentType(fileName, contentType);
- }
-
- parameters.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
- parameters.put("to_publisher", user.getId());
-
- //the where clause to find the media_type entry from the content-type.
- //we use the media type entry to lookup the media Handler/Storage classes
- // @todo this should probably be moved to DatabaseMediaType or
- // somewhere else appropriate -mh
- String[] contentTypeSplit = StringUtil.split(contentType, "/");
- String wc = " mime_type LIKE '" + contentTypeSplit[0] + "%'";
- DatabaseMediaType mediaTypeStor = DatabaseMediaType.getInstance();
- EntityList mediaTypesList = mediaTypeStor.selectByWhereClause(wc);
-
- // if we didn't find an entry matching the
- // content-type in the table.
- if (mediaTypesList.size() == 0) {
- _throwBadContentType(fileName, contentType);
- }
- Entity mediaType = null;
- Entity mediaType2 = null;
-
- // find out if we an exact content-type match if so take it.
- // otherwise try to match majortype/*
- // @todo this should probably be moved to DatabaseMediaType -mh
- for(int j=0;j<mediaTypesList.size();j++) {
- if(contentType.equals(
- mediaTypesList.elementAt(j).getValue("mime_type")))
- mediaType = mediaTypesList.elementAt(j);
- else if ((mediaTypesList.elementAt(j).getValue("mime_type")).equals(
- contentTypeSplit[0]+"/*"))
- mediaType2= mediaTypesList.elementAt(j);
- }
-
- if ( (mediaType == null) && (mediaType2 == null) ) {
- _throwBadContentType(fileName, contentType);
- }
- else if( (mediaType == null) && (mediaType2 != null) )
- mediaType = mediaType2;
-
-
- // get the class names from the media_type table.
- mediaTypeId = mediaType.getId();
- try {
- // ############### @todo: merge these and the getURL call into one
- // getURL helper call that just takes the Entity as a parameter
- // along with media_type
- mediaHandler = MediaHelper.getHandler(mediaType);
- mediaStorage = MediaHelper.getStorage(mediaType,
- "mircoders.storage.Database");
- }
- catch (Exception e) {
- theLog.printError("getting media handler failed: " + e.toString());
- throw new MirMediaException("getting media handler failed: "
- + e.toString());
- }
-
- parameters.put("to_media_type", mediaTypeId);
- //load the classes via reflection
- Entity mediaEnt = null;
- try {
- mediaEnt = (Entity) mediaStorage.getEntityClass().newInstance();
- mediaEnt.setStorage(mediaStorage);
- mediaEnt.setValues(parameters);
- // unfortunatly we have to insert it first because of the way
- // Image setting works right now. that should change soon. -mh
- mediaId = mediaEnt.insert();
- //save and store the media data/metadata
- mediaHandler.set(mpReq.getMedia(), mediaEnt, mediaType);
-
- //were done with mpReq at this point, dereference it.
- //as it contains mucho mem. -mh 01.10.2001
- mpReq = null;
-
- //we got this far, associate the media to the article
- mediaEnt.setValueForProperty("is_published", "1");
- mediaEnt.update();
- }
- catch (Exception e) {
- try {
- mediaStorage.delete(mediaId);
- }
- catch (Exception e2) {
- // dont't do anything here as the error was setting the media,
- // this just means that the entity may not have been inserted yet
- }
- theLog.printError("setting media failed: " + e.toString());
- throw new MirMediaException("setting media failed: " + e.toString());
- }
-
- _edit(mediaId, req, res);
+ EntityList mediaList =
+ new MediaRequest(mp, user.getId()).getMedia(false, false);
+ list(req, res);
+ }
+ catch (MirMediaUserException e) {
+ throw new ServletModuleUserException(e.getMsg());
}
catch (MirMediaException e) {
throw new ServletModuleException(
catch (IOException e) {
throw new ServletModuleException("upload -- ioexception " + e.toString());
}
- catch (StorageObjectException e) {
- throw new ServletModuleException("StorageObjectException" + e.toString());
- }
-
- }
-
- private void _throwBadContentType (String fileName, String contentType)
- throws ServletModuleUserException {
-
- theLog.printDebugInfo("Wrong file type uploaded!: " + fileName+" "
- +contentType);
- throw new ServletModuleUserException("The file you uploaded is of the "
- +"following mime-type: "+contentType
- +", we do not support this mime-type. "
- +"Error One or more files of unrecognized type. Sorry");
}
-
public void update(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException {
mergeData.put("new", "1");
SimpleHash popups = new SimpleHash();
popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());
+ String maxMedia = MirConfig.getProp("ServletModule.OpenIndy.MaxMediaUploadItems");
+ String numOfMedia = req.getParameter("medianum");
+ if(numOfMedia==null||numOfMedia.equals("")){
+ numOfMedia="1";
+ } else if(Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
+ numOfMedia = maxMedia;
+ }
+
+ int mediaNum = Integer.parseInt(numOfMedia);
+ SimpleList mediaFields = new SimpleList();
+ for(int i =0; i<mediaNum;i++){
+ Integer mNum = new Integer(i+1);
+ mediaFields.add(mNum.toString());
+ }
+ mergeData.put("medianum",numOfMedia);
+ mergeData.put("mediafields",mediaFields);
deliver(req, res, mergeData, popups, templateObjektString);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new ServletModuleException(e.toString());
}
}
projects / mir.git / commitdiff