X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fmodule%2FModuleTopics.java;h=e52a7c6ce164a4f8ddad46681b6b69f4c443791a;hb=4451d4c8c25d46e9c405e966ff6bd016a1512f4f;hp=707ce616bfc8d3899771fbb2fdbc39ab6bb3dbb1;hpb=50d223072c642a8e12e0fa99d378426ce2667926;p=mir.git

diff --git a/source/mircoders/module/ModuleTopics.java b/source/mircoders/module/ModuleTopics.java
index 707ce616..e52a7c6c 100755
--- a/source/mircoders/module/ModuleTopics.java
+++ b/source/mircoders/module/ModuleTopics.java
@@ -1,95 +1,90 @@
-package mircoders.module;
-
-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.*;
-import mircoders.entity.*;
-
 /*
- *  ThemenModule -
+ * Copyright (C) 2001, 2002 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * @author RK
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * 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;
 
-public class ModuleTopics extends AbstractModule
-{
+import java.util.Map;
 
-    static Logfile theLog;
+import mir.entity.Entity;
+import mir.entity.EntityList;
+import mir.log.LoggerWrapper;
+import mir.module.AbstractModule;
+import mir.module.ModuleExc;
+import mir.module.ModuleFailure;
+import mir.storage.StorageObject;
 
-    public ModuleTopics(StorageObject theStorage) {
-	    this.theStorage = theStorage;
-	    if (theLog == null)
-	      theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Module.Themen.Logfile"));
-    }
+public class ModuleTopics extends AbstractModule {
 
-    public SimpleList getTopicsAsSimpleList() throws ModuleException {
-      try {
-	      return ((DatabaseTopics)theStorage).getPopupData();
-      } catch(StorageObjectException e) {
-        throw new ModuleException(e.toString());
-      }
+  static LoggerWrapper logger = new LoggerWrapper("Module.Topics");
+
+  public ModuleTopics(StorageObject theStorage) {
+    this.theStorage = theStorage;
+  }
+
+  /**
+   *  Method getTopicList
+   *
+   *  @return SimpleList of all Topics sorted by title
+   *
+   */
+  public EntityList getTopicsList() throws ModuleExc, ModuleFailure {
+    try {
+      return getByWhereClause("", "title", -1);
     }
+    catch (Throwable e) {
+      logger.error("ModuleTopics.getTopicsList: topics could not be fetched: " + e.getMessage());
 
+      throw new ModuleFailure("ModuleTopics.getTopicsList: topics could not be fetched: " + e.getMessage(), e);
+    }
+  }
 
-    /**
-     *  Method getTopicList
-     *
-     *  @return SimpleList of all Topics sorted by title
-     *
-     */
-    public EntityList getTopicsList()
-    {
-      EntityList returnList=null;
-      try {
-        returnList=getByWhereClause("","title",-1);
-      }
-      catch (Exception e)
-      {
-        theLog.printWarning("--getTopicsList: topics could not be fetched");
+  /**
+   * Overrides the AbstractModule.set(),
+   * All dependent ContentEntities are set unproduced.
+   * @param theValues Hash mit Spalte/Wert-Paaren
+   * @return Id des eingef?gten Objekts
+   * @exception ModuleException
+   */
+  public String set(Map theValues) throws ModuleExc, ModuleFailure {
+    try {
+      Entity theEntity = theStorage.selectById((String) theValues.get("id"));
+      if (theEntity == null) {
+        throw new ModuleExc("No topic with id  " + theValues.get("id") + " found");
       }
-      return returnList;
+      theEntity.setValues(theValues);
+      theEntity.update();
+
+      return theEntity.getId();
+    }
+    catch (Throwable e) {
+      throw new ModuleFailure(e);
     }
-	
-	/**
-	 * Overrides the AbstractModule.set(),
-	 * All dependent ContentEntities are set unproduced.
-	 * @param theValues Hash mit Spalte/Wert-Paaren
-	 * @return Id des eingefügten Objekts
-	 * @exception ModuleException
-	 */
-	public String set (HashMap theValues) throws ModuleException {
-		try {
-			Entity theEntity = theStorage.selectById((String)theValues.get("id"));
-			if (theEntity == null){
-				throw new ModuleException("Kein Objekt mit id in Datenbank id: " + theValues.get("id"));
-			}
-		 	theEntity.setValues(theValues);
-			DatabaseContentToTopics db = DatabaseContentToTopics.getInstance();
-    	DatabaseContent dbc = DatabaseContent.getInstance();
-			EntityList contentList = db.getContent((EntityTopics)theEntity);
-			for (int i = 0; i < contentList.size(); i++){
-				dbc.setUnproduced("id="+((EntityContent)contentList.elementAt(i)).getId());
-			}
-		 	theEntity.update();
-		 	return theEntity.getId();
-		} catch (StorageObjectException e){
-			e.printStackTrace(System.err);
-			throw new ModuleException(e.toString());
-		}
- }
+  }
 
 }