From 1bbd9fe1c1d49848254b7114c66bd6ee306e9093 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 29 Nov 2002 21:09:03 +0000 Subject: [PATCH] it's a bad thing w/ our persistance layer to override getValues, for keys that exist in the DB.. overriden key size becomes human_readable_size and description becomes media_descr --- source/mircoders/entity/EntityUploadedMedia.java | 10 +++++----- templates-dist/admin/audio.template | 2 +- templates-dist/admin/audiolist.template | 5 ++++- templates-dist/admin/image.template | 4 ++-- templates-dist/admin/imagelist.template | 5 ++++- templates-dist/admin/media.template | 2 +- templates-dist/admin/medialist.template | 5 ++++- templates-dist/admin/video.template | 2 +- templates-dist/admin/videolist.template | 5 ++++- templates-dist/producer/content.template | 6 +++--- 10 files changed, 29 insertions(+), 17 deletions(-) diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java index 90a2f3d8..fd4864dd 100755 --- 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 8e942c8b..39dafb63 100755 --- 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} / ${lang("media.changed")} ${data.webdb_lastchange}
${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 - ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}
+ ${lang("media.format")}: ${data.mimetype} / ${data.media_descr} / ${data.human_readable_size}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
diff --git a/templates-dist/admin/audiolist.template b/templates-dist/admin/audiolist.template index f0ea98f8..fe0c7dc0 100755 --- a/templates-dist/admin/audiolist.template +++ b/templates-dist/admin/audiolist.template @@ -59,6 +59,8 @@ ${lang("media.title")} + ${lang("media.format")} + ${lang("media.size")} ${lang("media.mediafolder")} @@ -73,7 +75,8 @@ ${entry.title} 
${entry.description} - ${entry.size}  + ${entry.media_descr}  + ${entry.human_readable_size}  ${data.mediafolderHashdata[entry.to_media_folder]["name"]}  ${entry.creator}    diff --git a/templates-dist/admin/image.template b/templates-dist/admin/image.template index 4da4c442..95c89b4c 100755 --- a/templates-dist/admin/image.template +++ b/templates-dist/admin/image.template @@ -47,7 +47,7 @@ function openWin(url) { ${lang("media.created")}: ${data.webdb_create} / ${lang("media.changed")} ${data.webdb_lastchange}
${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 - ${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"]}
+ ${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"]}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
${lang("media.type")}: ${data.imgtypeHashdata[to_img_type]["name"]}
@@ -98,7 +98,7 @@ function openWin(url) { ${lang("media.description")}: - + diff --git a/templates-dist/admin/imagelist.template b/templates-dist/admin/imagelist.template index 748a494b..70067f0b 100755 --- a/templates-dist/admin/imagelist.template +++ b/templates-dist/admin/imagelist.template @@ -59,6 +59,8 @@ ${lang("media.title")} + ${lang("media.format")} + ${lang("media.size")} ${lang("media.mediafolder")} @@ -75,7 +77,8 @@ ${entry.title} 
${entry.description} - ${entry.size}  + ${entry.media_descr}  + ${entry.human_readable_size}  ${data.mediafolderHashdata[entry.to_media_folder]["name"]}  ${entry.creator}    diff --git a/templates-dist/admin/media.template b/templates-dist/admin/media.template index 9a86246d..620239c5 100755 --- 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} / ${lang("media.changed")} ${data.webdb_lastchange}
${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 - ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}
+ ${lang("media.format")}: ${data.mimetype} / ${data.human_readable_size}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
diff --git a/templates-dist/admin/medialist.template b/templates-dist/admin/medialist.template index 539bde2c..04204e8a 100755 --- a/templates-dist/admin/medialist.template +++ b/templates-dist/admin/medialist.template @@ -59,6 +59,8 @@ ${lang("media.title")} + ${lang("media.format")} + ${lang("media.size")} ${lang("media.mediafolder")} @@ -73,7 +75,8 @@ ${entry.title} 
${entry.description} - ${entry.size}  + ${entry.media_descr}  + ${entry.human_readable_size}  ${data.mediafolderHashdata[entry.to_media_folder]["name"]}  ${entry.creator}    diff --git a/templates-dist/admin/video.template b/templates-dist/admin/video.template index 86ee08e3..ebc0eee9 100755 --- 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} / ${lang("media.changed")} ${data.webdb_lastchange}
${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 - ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}
+ ${lang("media.format")}: ${data.mimetype} / ${data.media_descr} / ${data.human_readable_size}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
diff --git a/templates-dist/admin/videolist.template b/templates-dist/admin/videolist.template index 59345365..fbf9432e 100755 --- a/templates-dist/admin/videolist.template +++ b/templates-dist/admin/videolist.template @@ -59,6 +59,8 @@ ${lang("media.title")} + ${lang("media.format")} + ${lang("media.size")} ${lang("media.mediafolder")} @@ -73,7 +75,8 @@ ${entry.title} 
${entry.description} - ${entry.size}  + ${entry.media_descr}  + ${entry.human_readable_size}  ${data.mediafolderHashdata[entry.to_media_folder]["name"]}  ${entry.creator}    diff --git a/templates-dist/producer/content.template b/templates-dist/producer/content.template index b55cb03f..b63fc819 100755 --- a/templates-dist/producer/content.template +++ b/templates-dist/producer/content.template @@ -83,7 +83,7 @@

- ${audio["title"]} - ${media["descr"]} ${media["size"]} + ${audio["title"]} - ${media["media_descr"]} - ${media["human_readable_size"]}

@@ -92,7 +92,7 @@

- ${video["title"]} - ${media["descr"]} ${media["size"]} + ${video["title"]} - ${media["media_descr"]} - ${media["human_readable_size"]}

@@ -101,7 +101,7 @@

- ${other["title"]} - ${media["descr"]} ${media["size"]} + ${other["title"]} - ${media["media_descr"]} - ${media["human_readable_size"]}

-- 2.11.0