forgot to add the Jpeg entry to the media_type table..

make "size" of media be more readable.

diff --git a/dbscripts/populate_mediatyp.sql b/dbscripts/populate_mediatyp.sql
index 79a0bb6..abd152e 100755 (executable)
--- a/dbscripts/populate_mediatyp.sql
+++ b/dbscripts/populate_mediatyp.sql
@@ -2,7 +2,7 @@
 -- Selected TOC Entries:
 --
 --
--- Data for TOC Entry ID 2 (OID 54758)
+-- Data for TOC Entry ID 2 (OID 88609)
 --
 -- Name: media_type Type: TABLE DATA Owner: postgres
 --
@@ -15,11 +15,12 @@ UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" = 'media_type';
 INSERT INTO "media_type" ("id","name","mime_type","classname","tablename","dcname") VALUES (2,'unknown','application/octet-stream','--','UploadedMedia',NULL);
 INSERT INTO "media_type" ("id","name","mime_type","classname","tablename","dcname") VALUES (3,'jpg','image/gif','ImagesGif','Images',NULL);
 INSERT INTO "media_type" ("id","name","mime_type","classname","tablename","dcname") VALUES (4,'mp3','audio/mp3','Audio','UploadedMedia',NULL);
+INSERT INTO "media_type" ("id","name","mime_type","classname","tablename","dcname") VALUES (5,'jpg','image/jpeg','ImagesJpeg','Images',NULL);
 -- Enable triggers
 UPDATE pg_class SET reltriggers = (SELECT count(*) FROM pg_trigger where pg_class.oid = tgrelid) WHERE relname = 'media_type';
 
 --
--- TOC Entry ID 1 (OID 54706)
+-- TOC Entry ID 1 (OID 88557)
 --
 -- Name: media_type_id_seq Type: SEQUENCE SET Owner: 
 --

diff --git a/source/mir/media/MediaHandlerGeneric.java b/source/mir/media/MediaHandlerGeneric.java
index 1710c95..b8a60a3 100755 (executable)
--- a/source/mir/media/MediaHandlerGeneric.java
+++ b/source/mir/media/MediaHandlerGeneric.java
@@ -129,9 +129,10 @@ public class MediaHandlerGeneric implements MirMedia
 
     public String getURL(Entity ent, Entity mediaTypeEnt)
     {
+      int size = Integer.parseInt(ent.getValue("size"), 10)/1024;
       String title = ent.getValue("title")+
         " - "+mediaTypeEnt.getValue("name")+" "+
-        ent.getValue("size")+" Bytes";
+        size+" KB";
       return StringUtil.createURLLinks(ent.getValue("publish_server")+"/"+
         ent.getValue("publish_path"), title, imageRoot, getBigIcon());
     }