X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleOpenIndy.java;h=573cd3b8260f7b5710ef8688965031c21e147a81;hb=7f8c84deada65f3aad3ef3931b3153d504969f6e;hp=2374afe7ffa9b794c093a17e5399d687e4e11e9d;hpb=f9eb3e7d0c79c407615deeac7a6bd10775fde15d;p=mir.git diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java index 2374afe7..573cd3b8 100755 --- a/source/mircoders/servlet/ServletModuleOpenIndy.java +++ b/source/mircoders/servlet/ServletModuleOpenIndy.java @@ -1,6 +1,7 @@ package mircoders.servlet; import java.io.*; +import java.lang.*; import java.sql.*; import java.util.*; import java.net.*; @@ -157,14 +158,15 @@ public class ServletModuleOpenIndy extends ServletModule } mergeData.put("medianum",numOfMedia); mergeData.put("mediafields",mediaFields); - mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList()); /** @todo popups missing */ try{ mergeData.put("languagePopUpData",DatabaseLanguage.getInstance().getPopupData()); + mergeData.put("themenPopupData", themenModule.getTopicsAsSimpleList()); } catch (Exception e) { - theLog.printError("languagePopUpData failed"); + theLog.printError("languagePopUpData or getTopicslist failed"); + throw new ServletModuleException("smod -- openindy -- getting language or topics failed: "+e.toString()); } deliver(req, res, mergeData, postingFormTemplate); } @@ -175,15 +177,21 @@ public class ServletModuleOpenIndy extends ServletModule */ public void insposting(HttpServletRequest req, HttpServletResponse res) - throws ServletModuleException + throws ServletModuleException, ServletModuleUserException { SimpleHash mergeData = new SimpleHash(); boolean setMedia=false; + boolean setTopic = false; try { WebdbMultipartRequest mp = new WebdbMultipartRequest(req); HashMap withValues = mp.getParameters(); + + if ((((String)withValues.get("title")).length() == 0) || + (((String)withValues.get("description")).length() == 0) || + (((String)withValues.get("content_data")).length() == 0)) + throw new ServletModuleUserException("Missing field"); // call the routines that escape html @@ -204,8 +212,9 @@ public class ServletModuleOpenIndy extends ServletModule 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 immediatly published - withValues.put("is_published","1"); + // 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"); // if op direct article-type == newswire if (directOp.equals("yes")) withValues.put("to_article_type","1"); @@ -219,16 +228,26 @@ public class ServletModuleOpenIndy extends ServletModule theLog.printDebugInfo("id: "+cid); //insert was not successfull if(cid==null){ + //How do we know that it was not succesful cause of a + //dupe, what if it failed cause of "No space left on device"? + //Or is there something I am missing? Wouldn't it be better + //to have an explicit dupe check and then insert? I have no + //idea what I am talking about. this comment is in case + //I forget to explicitely ask. -mh deliver(req, res, mergeData, postingFormDupeTemplate); } String[] to_topicsArr = mp.getParameterValues("to_topic"); - if (to_topicsArr != null && to_topicsArr.length > 0) { + + if (to_topicsArr != null && to_topicsArr.length > 0) { try{ DatabaseContentToTopics.getInstance().setTopics(cid,to_topicsArr); - theLog.printError("setting content_x_topic success"); + setTopic = true; + theLog.printError("setting content_x_topic success"); } catch (Exception e) { theLog.printError("setting content_x_topic failed"); + contentModule.deleteById(cid); + throw new ServletModuleException("smod - openindy :: insposting: setting content_x_topic failed: "+e.toString()); } //end try } //end if @@ -238,16 +257,46 @@ public class ServletModuleOpenIndy extends ServletModule for(Iterator it = mp.requestList.iterator(); it.hasNext();){ MpRequest mpReq = (MpRequest)it.next(); String fileName = mpReq.getFilename(); - String contentType = FileUtil.guessContentTypeFromName(fileName); + + //get the content-type from what the client browser + //sends us. (the "Oreilly method") + String contentType = mpReq.getContentType(); + + theLog.printError("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")) { + /** + * This is just a temporary way to get the content-type via + * the .extension , we could maybe use a magic method, by looking + * at the header (first few bytes) of the file. (like the file(1) + * command). + * The Oreilly method 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 should be Mir/content-types.properties, it's the + * default Sun Java file with some additional entries that it did + * not have. So if you support a new media type you have to make + * sure that it is in this file -mh + */ + contentType = FileUtil.guessContentTypeFromName(fileName); + theLog.printError("tYPE: "+contentType); + if (contentType==null) + contentType = "text/plain"; // rfc1867 says this is the default + } HashMap mediaValues = new HashMap(); theLog.printError("CONTENT TYPE IS: "+contentType); - - if ((contentType==null) || (contentType=="application/octet-stream")) { - throw new ServletModuleException("ModuleException: One or more files of unrecognized types"); + + if (contentType.equals("text/plain") || + contentType.equals("application/octet-stream")) { + throw new ServletModuleUserException("One or more files of unrecognized types"); } - String mediaTitle=(String)withValues.get("media_title"+i); i++; @@ -259,8 +308,12 @@ public class ServletModuleOpenIndy extends ServletModule 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","1"); + mediaValues.put("is_published","0"); + //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 String wc = " mime_type='"+contentType+"'"; EntityList mediaTypesList = DatabaseMediaType.getInstance().selectByWhereClause(wc); @@ -268,49 +321,64 @@ public class ServletModuleOpenIndy extends ServletModule String mediaTypeId = null; String mediaStorageName = null; String mediaHandlerName = null; - + + //if we found an entry matching the + //content-type int the table. if (mediaTypesList.size() > 0) { + //get the class names from the media_type table. mediaTypeId = mediaTypesList.elementAt(0).getId(); mediaStorageName = mediaTypesList.elementAt(0).getValue("tablename"); mediaHandlerName = mediaTypesList.elementAt(0).getValue("classname"); mediaValues.put("to_media_type",mediaTypeId); - + + //load the classes via reflection String MediaId; + Entity mediaEnt = null; try { - Class mediaStorageClass = Class.forName("mircoders.storage.Database"+mediaStorageName); - Method m = mediaStorageClass.getMethod("getInstance", null); - Database mediaStorage = (Database)m.invoke(null, null); - Entity mediaEnt = (Entity)mediaStorage.getEntityClass().newInstance(); - mediaEnt.setStorage(mediaStorage); - mediaEnt.setValues(mediaValues); - mediaId = mediaEnt.insert(); - - theLog.printError("done inserting!!! "); - Class mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName); - MirMedia mediaHandler = (MirMedia)mediaHandlerClass.newInstance(); - mediaHandler.set(mpReq.getMedia(), mediaEnt,mediaTypesList.elementAt(0)); - theLog.printError("about to run ProduceMedia"+mediaId); - if(mediaId!=null){ - new ProducerMedia().handle(null, null, false, false, mediaId); - } - } catch (Exception e) { - theLog.printError("setting uploaded_media failed: "+e.toString()); - } + Class mediaStorageClass = Class.forName("mircoders.storage.Database"+mediaStorageName); + Method m = mediaStorageClass.getMethod("getInstance", null); + Database mediaStorage = (Database)m.invoke(null, null); + mediaEnt = (Entity)mediaStorage.getEntityClass().newInstance(); + mediaEnt.setStorage(mediaStorage); + mediaEnt.setValues(mediaValues); + mediaId = mediaEnt.insert(); + + Class mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName); + MirMedia mediaHandler = (MirMedia)mediaHandlerClass.newInstance(); + //save and store the media data/metadata + mediaHandler.set(mpReq.getMedia(), mediaEnt,mediaTypesList.elementAt(0)); + + //were done with mpReq at this point, dereference it. + //as it contains mucho mem. -mh 01.10.2001 + mpReq=null; - - try{ - DatabaseContentToMedia.getInstance().addMedia(cid,mediaId); - theLog.printError("setting content_x_media success"); + //we got this far, associate the media to the article + theLog.printError("ID"+mediaId); + mediaEnt.setValueForProperty("is_published","1"); + mediaEnt.update(); + new ProducerMedia().handle(null,null,false,false,mediaId); + DatabaseContentToMedia.getInstance().addMedia(cid,mediaId); } catch (Exception e) { - theLog.printError("setting content_x_media failed"); + theLog.printError("setting media failed: "+e.toString()); + contentModule.deleteById(cid); + throw new ServletModuleException("setting media failed: "+e.toString()); } } else { - theLog.printDebugInfo("Wrong file uploaded!: " + fileName); - throw new ServletModuleException("ModuleException: One or more files of unrecognized types"); - } + contentModule.deleteById(cid); + theLog.printDebugInfo("Wrong file type uploaded!: " + fileName); + throw new ServletModuleUserException("One or more files of unrecognized types"); + } // end if-else mediaTypesList.size() > 0 - } + } //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; // producing openpostinglist new ProducerOpenPosting().handle(null,null,false,false); @@ -319,6 +387,10 @@ public class ServletModuleOpenIndy extends ServletModule //if direct op producing startpage if (directOp.equals("yes")) new ProducerStartPage().handle(null,null); + //produce the topicPages if set + //should be more intelligent + //if(setTopic==true) new ProducerTopics().handle(null,null); + // sync the server //should be configureable int exitValue = Helper.rsync();