From: mh <mh>
Date: Tue, 26 Feb 2002 12:33:39 +0000 (+0000)
Subject: we now support all image types via the image/* content-type. if a type is
X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=f63d9796574e9dbe8846884eb13c5b08654bfa8b

we now support all image types via the image/* content-type. if a type is
unsupported by JAI, it throws an exception and continues. note: media_type
table must be updated. unused imageType var still needs to be removed.
---

diff --git a/dbscripts/populate_mediatyp.sql b/dbscripts/populate_mediatyp.sql
index 36178328..1bdd7e05 100755
--- a/dbscripts/populate_mediatyp.sql
+++ b/dbscripts/populate_mediatyp.sql
@@ -2,7 +2,7 @@
 -- Selected TOC Entries:
 --
 --
--- Data for TOC Entry ID 2 (OID 20000)
+-- Data for TOC Entry ID 2 (OID 46975)
 --
 -- Name: media_type Type: TABLE DATA Owner: postgres
 --
@@ -12,8 +12,6 @@
 -- Disable triggers
 UPDATE "pg_class" SET "reltriggers" = 0 WHERE "relname" = 'media_type';
 
-INSERT INTO "media_type" VALUES (3,'jpg','image/gif','ImagesGif','Images',NULL);
-INSERT INTO "media_type" VALUES (5,'jpg','image/jpeg','ImagesJpeg','Images',NULL);
 INSERT INTO "media_type" VALUES (4,'mp3','audio/mp3','Mp3','Audio',NULL);
 INSERT INTO "media_type" VALUES (13,'mp3','audio/x-mp3','Mp3','Audio',NULL);
 INSERT INTO "media_type" VALUES (14,'mp3','audio/x-mpeg','Mp3','Audio',NULL);
@@ -25,11 +23,14 @@ INSERT INTO "media_type" VALUES (7,'mpg','video/mpeg','Video','Video',NULL);
 INSERT INTO "media_type" VALUES (9,'avi','video/x-msvideo','Video','Video',NULL);
 INSERT INTO "media_type" VALUES (2,'unknown','application/octet-stream','Generic','Other',NULL);
 INSERT INTO "media_type" VALUES (6,'pdf','application/pdf','Generic','Other',NULL);
+INSERT INTO "media_type" VALUES (15,'png','image/*','Images','Images',NULL);
+INSERT INTO "media_type" VALUES (3,'jpg','- deprecated -','Images','Images',NULL);
+INSERT INTO "media_type" VALUES (5,'jpg','- deprecated -','Images','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 19948)
+-- TOC Entry ID 1 (OID 46923)
 --
 -- Name: media_type_id_seq Type: SEQUENCE SET Owner: 
 --
diff --git a/source/mir/media/MediaHandlerImages.java b/source/mir/media/MediaHandlerImages.java
index 0ee930a7..cd8c7c57 100755
--- a/source/mir/media/MediaHandlerImages.java
+++ b/source/mir/media/MediaHandlerImages.java
@@ -28,7 +28,7 @@ import mir.entity.*;
  */
 
 
-public class MediaHandlerImages
+public class MediaHandlerImages implements MirMedia
 {
     protected final String        WEBDB_JPG="0";
     protected final String        WEBDB_GIF="1";
@@ -58,7 +58,7 @@ public class MediaHandlerImages
         return image_data;
 	}
 
-	protected boolean set(byte[] uploadData, Entity ent, Entity mediaTypeEnt)
+	public boolean set(byte[] uploadData, Entity ent, Entity mediaTypeEnt)
 	    throws MirMediaException {
 
         try {
diff --git a/source/mir/media/MediaHandlerImagesGif.java b/source/mir/media/MediaHandlerImagesGif.java
deleted file mode 100755
index 5b940c4b..00000000
--- a/source/mir/media/MediaHandlerImagesGif.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package mir.media;
-
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.sql.*;
-
-import mir.entity.*;
-
-/**
- * This class handles saving, fetching creating representations
- * for gif images. it overrides MediaHandlerImages.
- *
- * @see mir.media.MediaHandlerImages
- * @see mir.media.MirMedia
- * @author mh
- * @version 24.09.2001
- */
-
-
-public class MediaHandlerImagesGif extends MediaHandlerImages implements MirMedia
-{
-
-	public boolean set(byte[] uploadData, Entity ent, Entity mediaTypeEnt)
-	    throws MirMediaException {
-
-        imageType = WEBDB_GIF;
-        try {
-            return super.set(uploadData, ent, mediaTypeEnt);
-        } catch (Exception e) {
-            throw new MirMediaException(e.toString());
-        }
-    }
-}
diff --git a/source/mir/media/MediaHandlerImagesJpeg.java b/source/mir/media/MediaHandlerImagesJpeg.java
deleted file mode 100755
index 39faaf0c..00000000
--- a/source/mir/media/MediaHandlerImagesJpeg.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package mir.media;
-
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.sql.*;
-
-import mir.entity.*;
-
-/**
- * This class handles saving, fetching creating representations
- * for jpeg images. it overrides MediaHandlerImages.
- *
- * @see mir.media.MediaHandlerImages
- * @see mir.media.MirMedia
- * @author mh <heckmann@hbe.ca>
- * @version 24.09.2001
- */
-
-
-public class MediaHandlerImagesJpeg extends MediaHandlerImages implements MirMedia
-{
-	public boolean set(byte[] uploadData, Entity ent, Entity mediaTypeEnt)
-	    throws MirMediaException {
-
-        imageType = WEBDB_JPG;
-        try {
-            return super.set(uploadData, ent, mediaTypeEnt);
-        } catch (Exception e) {
-            throw new MirMediaException(e.toString());
-        }
-    }
-}