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

diff --git a/etc/producer/article.template b/etc/producer/article.template
index 92a41a6..ede6f8a 100755 (executable)
--- a/etc/producer/article.template
+++ b/etc/producer/article.template
@@ -76,7 +76,7 @@
                                        <list article.to_media_audio as media>
                                        <p>
                                        <a href="${media["publish_server"]}${media["publish_path"]}">
-                                       ${media["title"]} - ${media["descr"]} ${media["size"]}
+                                       ${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}
                                        </a>
                                        </p>
                                        </list>
@@ -84,14 +84,14 @@
                                        <p>
                                        <img src="../../../img/${media["big_icon"]}" border="0" alt="">
                                        <a href="${media["publish_server"]}${media["publish_path"]}">
-                                       ${media["title"]} - ${media["descr"]} ${media["size"]}</a>
+                                       ${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
                                        </p>
                                        </list>
                                        <list article.to_media_other as media>
                                        <p>
                                        <img src="../../../img/${media["big_icon"]}" border="0" alt="">
                                        <a href="${media["publish_server"]}${media["publish_path"]}">
-                                       ${media["title"]} - ${media["descr"]} ${media["size"]}</a>
+                                       ${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
                                        </p>
                                        </list>
                                        

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index 2847d6a..278ba96 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.14 2002/11/28 20:08:34 mh Exp $
+ * @version $Id: EntityUploadedMedia.java,v 1.15 2002/11/29 21:11:57 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/admin/audio.template b/templates/admin/audio.template
index e02ec79..a062600 100755 (executable)
--- a/templates/admin/audio.template
+++ b/templates/admin/audio.template
@@ -33,8 +33,8 @@ 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}<br>
-               ${lang("media.size")}: ${data.size}<br>
+               ${lang("media.format")}: ${data.mimetype} / ${data.media_descr}<br>
+               ${lang("media.size")}: ${data.human_readable_size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates/admin/audiolist.template b/templates/admin/audiolist.template
index 22e21f6..960b6ad 100755 (executable)
--- a/templates/admin/audiolist.template
+++ b/templates/admin/audiolist.template
@@ -61,6 +61,8 @@
        <td><span class="witesmall">
        <b>${lang("media.title")}</b></span></td>
     <td><span class="witesmall">
+       <b>${lang("media.format")}</b></span></td>
+    <td><span class="witesmall">
        <b>${lang("media.size")}</b></span></td>
     <td><span class="witesmall">
        <b>${lang("media.mediafolder")}</b></span></td>
@@ -75,7 +77,8 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></span></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><span class="text">&nbsp;

diff --git a/templates/admin/image.template b/templates/admin/image.template
index 97cf45d..7287101 100755 (executable)
--- a/templates/admin/image.template
+++ b/templates/admin/image.template
@@ -48,8 +48,8 @@ function openWin(url) {
     <td valign="bottom"><span class="spezialtext">
                ${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.size")}: ${data.size}<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.size")}: ${data.human_readable_size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
                ${lang("media.type")}: <b>${data.imgtypeHashdata[to_img_type]["name"]}</b><br>
       </span>

diff --git a/templates/admin/imagelist.template b/templates/admin/imagelist.template
index aeb8e1d..bc874aa 100755 (executable)
--- a/templates/admin/imagelist.template
+++ b/templates/admin/imagelist.template
@@ -61,6 +61,8 @@
        <td><span class="witesmall">
        <b>${lang("media.title")}</b></span></td>
     <td><span class="witesmall">
+       <b>${lang("media.format")}</b></span></td>
+    <td><span class="witesmall">
        <b>${lang("media.size")}</b></span></td>
     <td><span class="witesmall">
        <b>${lang("media.mediafolder")}</b></span></td>
@@ -77,7 +79,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><span class="text">&nbsp;

diff --git a/templates/admin/media.template b/templates/admin/media.template
index a5ca0ea..75f3360 100755 (executable)
--- a/templates/admin/media.template
+++ b/templates/admin/media.template
@@ -33,8 +33,8 @@ 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}<br>
-               ${lang("media.size")}: ${data.size}<br>
+               ${lang("media.format")}: ${data.mimetype}<br>
+               ${lang("media.size")}: ${data.human_readable_size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates/admin/medialist.template b/templates/admin/medialist.template
index 6c04bce..05718b7 100755 (executable)
--- a/templates/admin/medialist.template
+++ b/templates/admin/medialist.template
@@ -61,6 +61,8 @@
        <td><span class="witesmall">
        <b>${lang("media.title")}</b></span></td>
     <td><span class="witesmall">
+       <b>${lang("media.format")}</b></span></td>
+    <td><span class="witesmall">
        <b>${lang("media.size")}</b></span></td>
     <td><span class="witesmall">
        <b>${lang("media.mediafolder")}</b></span></td>
@@ -75,7 +77,8 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></span></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><span class="text">&nbsp;

diff --git a/templates/admin/video.template b/templates/admin/video.template
index c613390..2ceeafe 100755 (executable)
--- a/templates/admin/video.template
+++ b/templates/admin/video.template
@@ -33,8 +33,8 @@ 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}<br>
-               ${lang("media.size")}: ${data.size}<br>
+               ${lang("media.format")}: ${data.mimetype} / ${data.media_descr}<br>
+               ${lang("media.size")}: ${data.human_readable_size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates/admin/videolist.template b/templates/admin/videolist.template
index 590a733..38ca8a0 100755 (executable)
--- a/templates/admin/videolist.template
+++ b/templates/admin/videolist.template
@@ -61,6 +61,8 @@
        <td><span class="witesmall">
        <b>${lang("media.title")}</b></span></td>
     <td><span class="witesmall">
+       <b>${lang("media.format")}</b></span></td>
+    <td><span class="witesmall">
        <b>${lang("media.size")}</b></span></td>
     <td><span class="witesmall">
        <b>${lang("media.mediafolder")}</b></span></td>
@@ -75,7 +77,8 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=1></a></span></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><span class="text">&nbsp;