fix long standing bug that caused produced media files to have their publish_path...

diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java
index 1088ea9..57d9baf 100755 (executable)
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -58,8 +58,8 @@ import mir.storage.*;
  * Of course it implements the MirMedia interface.
  *
  * @see mir.media.MirMedia
- * @author mh <heckmann@hbe.ca>
- * @version 24.09.2001
+ * @author mh <mh@nadir.org>
+ * @version $Id: MediaHandlerGeneric.java,v 1.7.2.4 2002/11/27 06:52:47 mh Exp $
  */
 
 public class MediaHandlerGeneric implements MirMedia
@@ -81,7 +81,7 @@ public class MediaHandlerGeneric implements MirMedia
         try {
             long size = FileUtil.write(getStoragePath()+sepChar+datePath+
                                       sepChar+mediaFname, in);
-            ent.setValueForProperty("publish_path",datePath+sepChar+mediaFname);
+            ent.setValueForProperty("publish_path",datePath+mediaFname);
             ent.setValueForProperty("size", new Long(size).toString());
             ent.update();
         } catch (Exception e) {
@@ -108,12 +108,12 @@ public class MediaHandlerGeneric implements MirMedia
 
     public InputStream getMedia (Entity ent, Entity mediaTypeEnt)
       throws MirMediaException {
-      String publishPath = mediaTypeEnt.getValue("publish_path");
+      String publishPath = ent.getValue("publish_path");
       String fname = getStoragePath()+publishPath;
       File f = new File(fname);
       if(! f.exists())
         throw new MirMediaException("error in MirMedia.getMedia(): "+fname+
-                                    "does not exist!");
+                                    " does not exist!");
       FileInputStream in;
       try {
         in = new FileInputStream(f);
@@ -139,7 +139,7 @@ public class MediaHandlerGeneric implements MirMedia
 
     public String getPublishHost()
     {
-        return MirConfig.getProp("Producer.Media.Host");
+        return StringUtil.removeSlash(MirConfig.getProp("Producer.Media.Host"));
     }
 
     public String getTinyIconName()

diff --git a/source/mircoders/media/MediaHandlerImages.java b/source/mircoders/media/MediaHandlerImages.java
index 8c89bb6..19c87e2 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImages.java
+++ b/source/mircoders/media/MediaHandlerImages.java
@@ -59,7 +59,7 @@ import mircoders.entity.EntityImages;
  *
  * @see mir.media.MirMedia
  * @author mh
- * @version $Date: 2002/11/01 05:38:21 $ $Revision: 1.9.2.2 $
+ * @version $Date: 2002/11/27 06:52:47 $ $Revision: 1.9.2.3 $
  */
 
 
@@ -166,7 +166,7 @@ public abstract class MediaHandlerImages implements MirMedia
 
   public String getPublishHost()
   {
-    return MirConfig.getProp("Producer.Image.Host");
+    return StringUtil.removeSlash(MirConfig.getProp("Producer.Image.Host"));
   }
 
   public String getTinyIconName()
@@ -201,7 +201,7 @@ public abstract class MediaHandlerImages implements MirMedia
 
   public String getDescr(Entity mediaType)
   {
-    return "";
+    return "image/jpeg";
   }
 
 }

diff --git a/source/mircoders/media/MediaHandlerImagesJpeg.java b/source/mircoders/media/MediaHandlerImagesJpeg.java
index 7498855..6bb5066 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImagesJpeg.java
+++ b/source/mircoders/media/MediaHandlerImagesJpeg.java
@@ -32,15 +32,8 @@
 
 package mircoders.media;
 
-//import java.lang.*;
-//import java.io.*;
-//import java.util.*;
-//import java.lang.reflect.*;
-
-//import freemarker.template.SimpleList;
-
 import mir.media.*;
-//import mir.misc.*;
+import mir.entity.Entity;
 
 /**
  * This class handles saving, fetching creating representations
@@ -51,8 +44,8 @@ import mir.media.*;
  *
  * @see mir.media.MirMedia
  * @see mircoders.media.MediaHandlerImages
- * @author mh
- * @version 24.09.2001
+ * @author mh, mir-coders group
+ * @version $Id: MediaHandlerImagesJpeg.java,v 1.1.4.2 2002/11/27 06:52:47 mh Exp $
  */
 
 
@@ -62,4 +55,9 @@ public class MediaHandlerImagesJpeg extends MediaHandlerImages implements MirMed
     return JPEG;
   }
 
+  public String getDescr(Entity mediaType)
+  {
+      return "image/jpeg";
+  }
+
 }

diff --git a/source/mircoders/media/MediaHandlerImagesPng.java b/source/mircoders/media/MediaHandlerImagesPng.java
index 8a124ae..71992cd 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImagesPng.java
+++ b/source/mircoders/media/MediaHandlerImagesPng.java
@@ -32,15 +32,8 @@
 
 package mircoders.media;
 
-//import java.lang.*;
-//import java.io.*;
-//import java.util.*;
-//import java.lang.reflect.*;
-
-//import freemarker.template.SimpleList;
-
 import mir.media.*;
-//import mir.misc.*;
+import mir.entity.Entity;
 
 /**
  * This class handles saving, fetching creating representations
@@ -51,8 +44,8 @@ import mir.media.*;
  *
  * @see mir.media.MirMedia
  * @see mircoders.media.MediaHandlerImages
- * @author mh
- * @version 24.09.2001
+ * @author mh ,mir-coders
+ * @version $Id: MediaHandlerImagesPng.java,v 1.1.4.2 2002/11/27 06:52:47 mh Exp $
  */
 
 
@@ -62,4 +55,9 @@ public class MediaHandlerImagesPng extends MediaHandlerImages implements MirMedi
     return PNG;
   }
 
+  public String getDescr(Entity mediaType)
+  {
+      return "image/png";
+  }
+
 }

diff --git a/source/mircoders/media/MediaHandlerRealAudio.java b/source/mircoders/media/MediaHandlerRealAudio.java
index 5b16e4a..bab016b 100755 (executable)
--- a/source/mircoders/media/MediaHandlerRealAudio.java
+++ b/source/mircoders/media/MediaHandlerRealAudio.java
@@ -118,7 +118,7 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements
 
   public String getPublishHost()
   {
-    return MirConfig.getProp("Producer.RealMedia.Host");
+    return StringUtil.removeSlash(MirConfig.getProp("Producer.RealMedia.Host"));
   }
 
 }

diff --git a/source/mircoders/media/MediaHandlerRealVideo.java b/source/mircoders/media/MediaHandlerRealVideo.java
index 47ece1f..e1f92b7 100755 (executable)
--- a/source/mircoders/media/MediaHandlerRealVideo.java
+++ b/source/mircoders/media/MediaHandlerRealVideo.java
@@ -52,7 +52,7 @@ import mir.storage.*;
  * @see mir.media.MediaHandlerGeneric
  * @see mir.media.MirMedia
  * @author john <john@manifestor.org>, mh <heckmann@hbe.ca>
- * @version 11.10.2001
+ * @version $Id: MediaHandlerRealVideo.java,v 1.9.2.3 2002/11/27 06:52:47 mh Exp $
  */
 
 
@@ -118,7 +118,7 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements
 
   public String getPublishHost()
   {
-    return MirConfig.getProp("Producer.RealMedia.Host");
+    return StringUtil.removeSlash(MirConfig.getProp("Producer.RealMedia.Host"));
   }
 
 }