Explicitly mark perms.sh-dist as a bash script.

[mir.git] / source / mircoders / module / ModuleMediafolder.java

diff --git a/source/mircoders/module/ModuleMediafolder.java b/source/mircoders/module/ModuleMediafolder.java
index c85d1ab..d98e17d 100755 (executable)
--- a/source/mircoders/module/ModuleMediafolder.java
+++ b/source/mircoders/module/ModuleMediafolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,17 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mircoders.module;
 
 /**
@@ -40,46 +38,27 @@ package mircoders.module;
  * @version
  */
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
-import java.sql.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import freemarker.template.*;
-
-import mir.servlet.*;
-import mir.module.*;
-import mir.entity.*;
-import mir.misc.*;
-import mir.storage.*;
-
-import mircoders.storage.*;
-
-
-public class ModuleMediafolder extends AbstractModule
-{
-       static Logfile theLog;
-
-       // Kontruktor
-
-       public ModuleMediafolder(StorageObject theStorage)
-       {
-               if (theLog == null) theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Module.Mediafolder.Logfile"));
-               if (theStorage == null) theLog.printWarning("StorageObject was null!");
-               this.theStorage = theStorage;
-       }
+import mir.log.LoggerWrapper;
+import mir.module.AbstractModule;
+import mir.module.ModuleExc;
+import mir.module.ModuleFailure;
+import mir.util.JDBCStringRoutines;
+import mircoders.storage.DatabaseMediafolder;
 
-       // Methoden
+public class ModuleMediafolder extends AbstractModule {
+  static LoggerWrapper logger = new LoggerWrapper("Module.Mediafolder");
 
-               public SimpleList getPopupData() throws ModuleException {
-      try {
-                         return ((DatabaseMediafolder)theStorage).getPopupData();
-      } catch (Exception e) {
-        throw new ModuleException(e.toString());
-      }
-               }
+  public ModuleMediafolder() {
+    super(DatabaseMediafolder.getInstance());
+  }
 
+  public String mediaFolderIdForName(String aName) throws ModuleExc, ModuleFailure {
+    try {
+      return database.executeFreeSingleValueSql("select id from media_folder where name = '" + JDBCStringRoutines.escapeStringLiteral(aName) + "'");
+    }
+    catch (Throwable t) {
+      throw new ModuleFailure(t);
+    }
+  }
 
 }