From: mh <mh>
Date: Thu, 7 Feb 2002 10:07:18 +0000 (+0000)
Subject: use MediaHelper to get MediaHandler. A little bit of Coding Style cleanup.
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=4ce421ae0bd8201c9ee6be2e2567931eba37dd86;p=mir.git

use MediaHelper to get MediaHandler. A little bit of Coding Style cleanup.
---

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index 573cd3b8..31b99bff 100755
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -294,6 +294,7 @@ public class ServletModuleOpenIndy extends ServletModule
         
         if (contentType.equals("text/plain") ||
             contentType.equals("application/octet-stream")) {
+          System.err.println("IN HERE");
           throw new ServletModuleUserException("One or more files of unrecognized types");
         }
 
@@ -316,37 +317,44 @@ public class ServletModuleOpenIndy extends ServletModule
         //media Handler/Storage classes
         String wc = " mime_type='"+contentType+"'";
 
-        EntityList mediaTypesList = DatabaseMediaType.getInstance().selectByWhereClause(wc);
+        DatabaseMediaType mediaTypeStor = DatabaseMediaType.getInstance();
+        EntityList mediaTypesList = mediaTypeStor.selectByWhereClause(wc);
 
         String mediaTypeId = null;
-        String mediaStorageName = null;
-        String mediaHandlerName = null;
+        MirMedia mediaHandler;
+        Database mediaStorage;
  
         //if we found an entry matching the
         //content-type int the table.
         if (mediaTypesList.size() > 0) {
           //get the class names from the media_type table.
           mediaTypeId = mediaTypesList.elementAt(0).getId();
-          mediaStorageName = mediaTypesList.elementAt(0).getValue("tablename");
-          mediaHandlerName = mediaTypesList.elementAt(0).getValue("classname");
+          try {
+            // ############### TODO: merge these and the getURL call into one
+            // getURL helper call that just takes the Entity as a parameter
+            // along with media_type
+            mediaHandler = MediaHelper.getHandler(mediaTypesList.elementAt(0));
+            mediaStorage = MediaHelper.getStorage(mediaTypesList.elementAt(0),
+                                                "mircoders.storage.Database");
+          } catch (MirMediaException e) {
+            throw new ServletModuleException("getting media handler failed: "
+                                            +e.toString());
+          }
+
           mediaValues.put("to_media_type",mediaTypeId);
          
           //load the classes via reflection
           String MediaId;
           Entity mediaEnt = null;
           try {
-            Class mediaStorageClass = Class.forName("mircoders.storage.Database"+mediaStorageName);
-            Method m = mediaStorageClass.getMethod("getInstance", null);
-            Database mediaStorage = (Database)m.invoke(null, null);
             mediaEnt = (Entity)mediaStorage.getEntityClass().newInstance();
             mediaEnt.setStorage(mediaStorage);
             mediaEnt.setValues(mediaValues);
             mediaId = mediaEnt.insert();
 
-            Class mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName);
-            MirMedia mediaHandler = (MirMedia)mediaHandlerClass.newInstance();
             //save and store the media data/metadata
-            mediaHandler.set(mpReq.getMedia(), mediaEnt,mediaTypesList.elementAt(0));
+            mediaHandler.set(mpReq.getMedia(), mediaEnt,
+                            mediaTypesList.elementAt(0));
 
             //were done with mpReq at this point, dereference it.
             //as it contains mucho mem. -mh 01.10.2001