some needed date-converters

[mir.git] / source / mir / media / MediaHandlerGeneric.java

diff --git a/source/mir/media/MediaHandlerGeneric.java b/source/mir/media/MediaHandlerGeneric.java
index c06141e..a466a98 100755 (executable)
--- a/source/mir/media/MediaHandlerGeneric.java
+++ b/source/mir/media/MediaHandlerGeneric.java
@@ -38,7 +38,9 @@ public class MediaHandlerGeneric implements MirMedia
     protected String imageHost = MirConfig.getProp("Producer.Image.Host");
     protected String imageRoot = MirConfig.getProp("Producer.ImageRoot");
     protected Logfile theLog = Logfile.getInstance(MirConfig.getProp("Home")+"log/media.log");
-    public boolean set (byte[] uploadedData, Entity ent, Entity mediaTypeEnt ) {
+    public boolean set (byte[] uploadedData, Entity ent, Entity mediaTypeEnt )
+        throws MirMediaException {
+
         String ext = mediaTypeEnt.getValue("name");
         String dir = MirConfig.getProp("Producer.Media.Path");
         String mediaHost = MirConfig.getProp("Producer.Media.Host");
@@ -46,40 +48,42 @@ public class MediaHandlerGeneric implements MirMedia
         String date = ent.getValue("date");
         String datePath = StringUtil.webdbDate2path(date);
         Integer size = new Integer(uploadedData.length);
-        if(FileUtil.write(dir+"/"+datePath+"/"+mediaFname, uploadedData)) {
-        //if(FileUtil.write(dir+"/"+mediaFname, uploadedData)) {
+        try {
+            FileUtil.write(dir+"/"+datePath+"/"+mediaFname, uploadedData);
+            //if(FileUtil.write(dir+"/"+mediaFname, uploadedData)) {
             //were done with the data, dereference.
             uploadedData=null;
             
-            try {
-                ent.setValueForProperty("is_produced", "1");
-                ent.setValueForProperty("icon_is_produced", "1");
-                ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
-                //ent.setValueForProperty("publish_path", mediaFname);
-                ent.setValueForProperty("publish_server", mediaHost);
-                ent.setValueForProperty("size", size.toString());
-                ent.update();
-            } catch (StorageObjectException e) {
-                theLog.printError("StorageObjectException: "+e.toString()); 
-                return false;
-            }
-        } else {
-            theLog.printError("could not write FILE!"); 
-            return false;
+            ent.setValueForProperty("is_produced", "1");
+            ent.setValueForProperty("icon_is_produced", "1");
+            ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
+            //ent.setValueForProperty("publish_path", mediaFname);
+            ent.setValueForProperty("publish_server", mediaHost);
+            ent.setValueForProperty("size", size.toString());
+            ent.update();
+        } catch (Exception e) {
+            theLog.printError(e.toString()); 
+            throw new MirMediaException(e.toString());
         }
 
         return true;
     }
 
     //a class that will probably never get used..
-    private byte[] getFile (String fileName) {
+    private byte[] getFile (String fileName)
+        throws MirMediaException {
+
         long size = FileUtil.getSize(fileName);
         if (size < 0) return null;
 
         byte[] container = new byte[(int)size];
             
-        if(!FileUtil.read(fileName, container))
-            return null;
+        try {
+            FileUtil.read(fileName, container);
+        } catch (Exception e) {
+            theLog.printError(e.toString()); 
+            throw new MirMediaException(e.toString());
+        }
 
         return container;
     }
@@ -89,8 +93,7 @@ public class MediaHandlerGeneric implements MirMedia
     }
 
     public byte[] getIcon (Entity ent) {
-        String name = "/path/to/some/generic/icon";
-        return getFile(name);
+        return null;
     }
 
     public String getStoragePath()