it's a bad thing w/ our persistance layer to override getValues, for keys that exist...

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index 90a2f3d..fd4864d 100755 (executable)
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -49,7 +49,7 @@ import java.util.HashMap;
  * Diese Klasse enthält die Daten eines MetaObjekts
  *
  * @author mh, mir-coders group
- * @version $Id: EntityUploadedMedia.java,v 1.9.2.5 2002/11/28 19:55:25 mh Exp $
+ * @version $Id: EntityUploadedMedia.java,v 1.9.2.6 2002/11/29 21:09:03 mh Exp $
  */
 
 
@@ -96,17 +96,17 @@ public class EntityUploadedMedia extends Entity {
     if (key != null) {
       if (key.equals("big_icon"))
         returnValue = getBigIconName();
-      else if (key.equals("descr") || key.equals("description"))
+      else if (key.equals("descr") || key.equals("media_descr"))
         returnValue = getDescr();
       else if (key.equals("mediatype"))
         returnValue = getMediaTypeString();
       else if (key.equals("mimetype"))
         returnValue = getMimeType();
-      /*else if (key.equals("size")) {
-        String size = super.getValue(key);
+      else if (key.equals("human_readable_size")) {
+        String size = super.getValue("size");
         if (size != null)
           returnValue = NumberUtils.humanReadableSize(Double.parseDouble(size));
-      }*/
+      }
       else
         returnValue = super.getValue(key);
     }

diff --git a/templates-dist/admin/audio.template b/templates-dist/admin/audio.template
index 8e942c8..39dafb6 100755 (executable)
--- a/templates-dist/admin/audio.template
+++ b/templates-dist/admin/audio.template
@@ -32,7 +32,7 @@ function openWin(url) {
                ${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
                <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-               ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}<br>
+               ${lang("media.format")}: ${data.mimetype} / ${data.media_descr} / ${data.human_readable_size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates-dist/admin/audiolist.template b/templates-dist/admin/audiolist.template
index f0ea98f..fe0c7dc 100755 (executable)
--- a/templates-dist/admin/audiolist.template
+++ b/templates-dist/admin/audiolist.template
@@ -59,6 +59,8 @@
        <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.title")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+       <b>${lang("media.format")}</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.size")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.mediafolder")}</b></font></td>
@@ -73,7 +75,8 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
          <if entry.description><br>${entry.description}</if></td>
-  <td>${entry.size}&nbsp;</td>
+  <td>${entry.media_descr}&nbsp;</td>
+  <td>${entry.human_readable_size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;

diff --git a/templates-dist/admin/image.template b/templates-dist/admin/image.template
index 4da4c44..95c89b4 100755 (executable)
--- a/templates-dist/admin/image.template
+++ b/templates-dist/admin/image.template
@@ -47,7 +47,7 @@ function openWin(url) {
     <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
                ${lang("media.created")}: ${data.webdb_create} <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
                <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-               ${lang("media.format")}: ${data.img_width}x${data.img_height} / ${data.imgformatHashdata[to_img_format]["name"]} / ${data.imglayoutHashdata[to_img_layout]["name"]} /  ${data.imgcolorHashdata[to_img_color]["name"]}<br>
+               ${lang("media.format")}: ${data.media_descr} / ${data.img_width}x${data.img_height} / ${data.imgformatHashdata[to_img_format]["name"]} / ${data.imglayoutHashdata[to_img_layout]["name"]} /  ${data.imgcolorHashdata[to_img_color]["name"]}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
                ${lang("media.type")}: <b>${data.imgtypeHashdata[to_img_type]["name"]}</b><br>
        </td>
@@ -98,7 +98,7 @@ function openWin(url) {
        <tr>
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>${lang("media.description")}:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="description" value="${data.description} ${data.size}"></td>
+    <td><input type="text" size="40" maxlength="255" name="description" value="${data.description} ${data.human_readable_size}"></td>
        </tr>
 
        <tr>

diff --git a/templates-dist/admin/imagelist.template b/templates-dist/admin/imagelist.template
index 748a494..70067f0 100755 (executable)
--- a/templates-dist/admin/imagelist.template
+++ b/templates-dist/admin/imagelist.template
@@ -59,6 +59,8 @@
        <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.title")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+       <b>${lang("media.format")}</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.size")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.mediafolder")}</b></font></td>
@@ -75,7 +77,8 @@
        </if>
   <td>${entry.title}&nbsp;
          <if entry.description><br>${entry.description}</if></td>
-  <td>${entry.size}&nbsp;</td>
+  <td>${entry.media_descr}&nbsp;</td>
+  <td>${entry.human_readable_size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;

diff --git a/templates-dist/admin/media.template b/templates-dist/admin/media.template
index 9a86246..620239c 100755 (executable)
--- a/templates-dist/admin/media.template
+++ b/templates-dist/admin/media.template
@@ -32,7 +32,7 @@ function openWin(url) {
                ${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
                <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-               ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}<br>
+               ${lang("media.format")}: ${data.mimetype} / ${data.human_readable_size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates-dist/admin/medialist.template b/templates-dist/admin/medialist.template
index 539bde2..04204e8 100755 (executable)
--- a/templates-dist/admin/medialist.template
+++ b/templates-dist/admin/medialist.template
@@ -59,6 +59,8 @@
        <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.title")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+       <b>${lang("media.format")}</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.size")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.mediafolder")}</b></font></td>
@@ -73,7 +75,8 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
          <if entry.description><br>${entry.description}</if></td>
-  <td>${entry.size}&nbsp;</td>
+  <td>${entry.media_descr}&nbsp;</td>
+  <td>${entry.human_readable_size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;

diff --git a/templates-dist/admin/video.template b/templates-dist/admin/video.template
index 86ee08e..ebc0eee 100755 (executable)
--- a/templates-dist/admin/video.template
+++ b/templates-dist/admin/video.template
@@ -32,7 +32,7 @@ function openWin(url) {
                ${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
                <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-               ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}<br>
+               ${lang("media.format")}: ${data.mimetype} / ${data.media_descr} / ${data.human_readable_size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates-dist/admin/videolist.template b/templates-dist/admin/videolist.template
index 5934536..fbf9432 100755 (executable)
--- a/templates-dist/admin/videolist.template
+++ b/templates-dist/admin/videolist.template
@@ -59,6 +59,8 @@
        <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.title")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+       <b>${lang("media.format")}</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.size")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.mediafolder")}</b></font></td>
@@ -73,7 +75,8 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
          <if entry.description><br>${entry.description}</if></td>
-  <td>${entry.size}&nbsp;</td>
+  <td>${entry.media_descr}&nbsp;</td>
+  <td>${entry.human_readable_size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;

diff --git a/templates-dist/producer/content.template b/templates-dist/producer/content.template
index b55cb03..b63fc81 100755 (executable)
--- a/templates-dist/producer/content.template
+++ b/templates-dist/producer/content.template
@@ -83,7 +83,7 @@
               <p>
                 <img src="/img/${media["big_icon"]}" border="0" alt="">
                 <a href="${audio["publish_server"]}${audio["publish_path"]}">
-                ${audio["title"]} - ${media["descr"]} ${media["size"]} </a>
+                ${audio["title"]} - ${media["media_descr"]} - ${media["human_readable_size"]} </a>
               </p>
             </list>
           </list>
@@ -92,7 +92,7 @@
               <p>
                 <img src="/img/${media["big_icon"]}" border="0" alt="">
                 <a href="${video["publish_server"]}${video["publish_path"]}">
-                ${video["title"]} - ${media["descr"]}  ${media["size"]} </a>
+                ${video["title"]} - ${media["media_descr"]} - ${media["human_readable_size"]} </a>
               </p>
             </list>
           </list>
@@ -101,7 +101,7 @@
               <p>
                 <img src="/img/${media["big_icon"]}" border="0" alt="">
                 <a href="${other["publish_server"]}${other["publish_path"]}">
-                ${other["title"]} - ${media["descr"]}  ${media["size"]}</a>
+                ${other["title"]} - ${media["media_descr"]} - ${media["human_readable_size"]}</a>
               </p>
             </list>
           </list>