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

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

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()