got rid of stallman compatibility hack.. stallman is broken the way it is anyway

diff --git a/source/mir/media/MediaHandlerGeneric.java b/source/mir/media/MediaHandlerGeneric.java
index b8a60a3..52ff97b 100755 (executable)
--- a/source/mir/media/MediaHandlerGeneric.java
+++ b/source/mir/media/MediaHandlerGeneric.java
@@ -46,20 +46,16 @@ public class MediaHandlerGeneric implements MirMedia
         String date = ent.getValue("date");
         String datePath = StringUtil.webdbDate2path(date);
         Integer size = new Integer(uploadedData.length);
-        //hack: make it a config option to use "dated" dirs
-        //we can't cause of stallman -mh
-        //if(FileUtil.write(dir+"/"+datePath+"/"+mediaFname, uploadedData)) {
-        if(FileUtil.write(dir+"/"+mediaFname, uploadedData)) {
+        if(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");
-                //hack: make it a config option to use "dated" dirs
-                //we can't cause of stallman -mh
-                //ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
-                ent.setValueForProperty("publish_path", mediaFname);
+                ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
+                //ent.setValueForProperty("publish_path", mediaFname);
                 ent.setValueForProperty("publish_server", mediaHost);
                 ent.setValueForProperty("size", size.toString());
                 ent.update();

diff --git a/source/mir/media/MediaHandlerRealAudio.java b/source/mir/media/MediaHandlerRealAudio.java
index b818b34..a7b4c52 100755 (executable)
--- a/source/mir/media/MediaHandlerRealAudio.java
+++ b/source/mir/media/MediaHandlerRealAudio.java
@@ -42,10 +42,8 @@ public class MediaHandlerRealAudio extends MediaHandlerGeneric implements MirMed
         String date = ent.getValue("date");
         String datePath = StringUtil.webdbDate2path(date);
         Integer size = new Integer(uploadedData.length);
-        //hack: make it a config option to use "dated" dirs
-        //we can't cause of stallman -mh
-        //if(FileUtil.write(dir+"/"+datePath+"/"+mediaFname, uploadedData)) {
-        if(FileUtil.write(rtspDir+"/"+mediaFname, uploadedData)) {
+        if(FileUtil.write(dir+"/"+datePath+"/"+mediaFname, uploadedData)) {
+        //if(FileUtil.write(rtspDir+"/"+mediaFname, uploadedData)) {
             //were done with the data, dereference.
             uploadedData=null;
             
@@ -55,10 +53,8 @@ FileUtil.write(dir+"/"+RealMediaFile,RealMediaPointer.getBytes());
 
                 ent.setValueForProperty("is_produced", "1");
                 ent.setValueForProperty("icon_is_produced", "1");
-                //hack: make it a config option to use "dated" dirs
-                //we can't cause of stallman -mh
-                //ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
-                ent.setValueForProperty("publish_path", RealMediaFile);
+                ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
+                //ent.setValueForProperty("publish_path", RealMediaFile);
                 ent.setValueForProperty("publish_server", mediaHost);
                 ent.setValueForProperty("size", size.toString());
                 ent.update();

diff --git a/source/mir/media/MediaHandlerRealVideo.java b/source/mir/media/MediaHandlerRealVideo.java
index bd9363e..264d1bd 100755 (executable)
--- a/source/mir/media/MediaHandlerRealVideo.java
+++ b/source/mir/media/MediaHandlerRealVideo.java
@@ -42,10 +42,8 @@ public class MediaHandlerRealVideo extends MediaHandlerGeneric implements MirMed
         String date = ent.getValue("date");
         String datePath = StringUtil.webdbDate2path(date);
         Integer size = new Integer(uploadedData.length);
-        //hack: make it a config option to use "dated" dirs
-        //we can't cause of stallman -mh
-        //if(FileUtil.write(dir+"/"+datePath+"/"+mediaFname, uploadedData)) {
-        if(FileUtil.write(rtspDir+"/"+mediaFname, uploadedData)) {
+        if(FileUtil.write(dir+"/"+datePath+"/"+mediaFname, uploadedData)) {
+        //if(FileUtil.write(rtspDir+"/"+mediaFname, uploadedData)) {
             //were done with the data, dereference.
             uploadedData=null;
             
@@ -55,10 +53,8 @@ FileUtil.write(dir+"/"+RealMediaFile,RealMediaPointer.getBytes());
 
                 ent.setValueForProperty("is_produced", "1");
                 ent.setValueForProperty("icon_is_produced", "1");
-                //hack: make it a config option to use "dated" dirs
-                //we can't cause of stallman -mh
-                //ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
-                ent.setValueForProperty("publish_path", RealMediaFile);
+                ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
+                //ent.setValueForProperty("publish_path", RealMediaFile);
                 ent.setValueForProperty("publish_server", mediaHost);
                 ent.setValueForProperty("size", size.toString());
                 ent.update();