X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fmodule%2FModuleContent.java;h=e3cb48f1a9f1ece4338aadc8dc1e5189d256235f;hb=cd3cb65d029bc2a38497f56b0544d01aa94065c6;hp=9cff5b0f1abc2e478702fdcf201c76fce488be8c;hpb=97a33333e6920e0b2578e506475f04c6d1d45a38;p=mir.git

diff --git a/source/mircoders/module/ModuleContent.java b/source/mircoders/module/ModuleContent.java
index 9cff5b0f..e3cb48f1 100755
--- a/source/mircoders/module/ModuleContent.java
+++ b/source/mircoders/module/ModuleContent.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,43 +18,33 @@
  * 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;
 
-import java.io.*;
-import java.util.*;
-import java.sql.*;
+import mir.entity.EntityList;
+import mir.log.LoggerWrapper;
+import mir.module.AbstractModule;
+import mir.module.ModuleExc;
+import mir.module.ModuleFailure;
+import mir.storage.StorageObject;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import mir.servlet.*;
-import mir.module.*;
-import mir.entity.*;
-import mir.misc.*;
-import mir.storage.*;
-import mir.log.*;
-
-import mircoders.entity.*;
-import mircoders.storage.*;
-
-/*
- *  ContentObjekt -
- *
- * @version $Id: ModuleContent.java,v 1.11 2002/11/29 13:43:42 zapata Exp $
- *
- * @author RK, mir-coders
+/**
  *
+ * <p>Title: ModuleContent</p>
+ * <p>Description: helper routines to manage articles</p>
+ * <p>Copyright: Copyright (c) 2003</p>
+ * <p>Company: </p>
+ * @author not attributable
+ * @version 1.0
  */
 
 public class ModuleContent extends AbstractModule
@@ -69,163 +59,13 @@ public class ModuleContent extends AbstractModule
     this.theStorage = theStorage;
   }
 
-//
-// various methods to retrieve content entities
-
-  public EntityList getFeatures(int offset, int limit) throws ModuleException
-  {
-    return getContent("is_published=true AND to_article_type=2", "webdb_create desc",
-                      offset, limit);
-  }
-
-  public EntityList getNewsWire(int offset, int limit) throws ModuleException
-  {
-    return getContent("is_published=true AND to_article_type = 1",
-                      "webdb_create desc",offset,limit);
-  }
-
-  public EntityList getStartArticle() throws ModuleException
-  {
-    EntityList returnList = getContent("is_published=true AND to_article_type=4",
-                                       "webdb_create desc",0,1);
-//if no startspecial exists
-    if (returnList==null || returnList.size()==0)
-      returnList = getContent("is_published=true AND to_article_type=3",
-                              "webdb_create desc",0,1);
-
-    return returnList;
-  }
-
-  public EntityList getContent(HashMap searchValues, boolean concat, int offset, EntityUsers user)
-      throws ModuleException {
-
-    try {
-
-      String whereClause ="", aField, aValue;
-      boolean first = true;
-
-      Set set = searchValues.keySet();
-      Iterator it = set.iterator();
-      for (int i=0;i<set.size();i++) {
-        aField = (String)it.next();
-        aValue = (String)searchValues.get(aField);
-
-        if (first == false)
-          whereClause +=  (concat) ? " and " : " or ";
-        else
-          first = false;
-
-        whereClause += "(";
-
-// default: hier splitten der eintraege und verknupfung mit AND OR NOT
-        StringTokenizer st = new StringTokenizer(aValue);
-        boolean firstToken = true;
-        while(st.hasMoreTokens()) {
-          String notString = "";
-          String tokenConcat = " OR ";
-          String nextToken = st.nextToken();
-
-          if (nextToken.startsWith("+")) {
-            nextToken = nextToken.substring(1);
-            tokenConcat = " AND ";
-          }
-          if (nextToken.startsWith("-")) {
-            nextToken = nextToken.substring(1);
-            tokenConcat = " AND ";
-            notString = " NOT ";
-          }
-          if (firstToken == true) {
-            tokenConcat = "";
-            firstToken = false;
-          }
-
-
-          whereClause += tokenConcat + aField + notString + " like '";
-          whereClause += nextToken + "%'";
-        }
-        whereClause += ") ";
-      }
-      return theStorage.selectByWhereClause(whereClause, offset);
-    }
-    catch (StorageObjectException e){
-      throw new ModuleException(e.toString());
-    }
-
-  }
-
-  public EntityList getContentByField(String aField, String aValue, String orderBy, int offset,
-                                      EntityUsers user) throws ModuleException
-  {
-    String whereClause = "lower("+aField + ") like lower('%" + StringUtil.quote(aValue) + "%')";
-    return getContent(whereClause, orderBy, offset, user);
-  }
-
-  public EntityList getContent(String whereClause, String orderBy, int offset,
-                               int limit, EntityUsers user) throws ModuleException {
-
-    try {
-      if (user!=null){
-        if (!user.isAdmin())
-          whereClause += " and to_publisher='" + user.getId()+"'";
-      }
-      return theStorage.selectByWhereClause(whereClause, orderBy, offset, limit);
-    }
-    catch (StorageObjectException e){	throw new ModuleException(e.toString()); }
-  }
-
-  public EntityList getContent(String whereClause, String orderBy,int offset, int limit)
-      throws ModuleException {
+  public EntityList getContent(String whereClause, String orderBy,int offset, int limit) throws ModuleExc, ModuleFailure {
     try {
       return theStorage.selectByWhereClause(whereClause, orderBy, offset, limit);
-    } catch (StorageObjectException e){
-      throw new ModuleException(e.toString());
     }
-  }
-
-  public EntityList getContent(String whereClause, String orderBy, int offset, EntityUsers user)
-      throws ModuleException
-  {
-    try {
-      if (whereClause !=null) {
-
-// for the different article_types
-        if(whereClause.equals("newswire")) {
-          whereClause="is_published='1' and to_article_type='1'";
-          orderBy = "webdb_create desc";
-        }
-        if(whereClause.equals("feature")) {
-          whereClause="is_published='1' and to_article_type='2'";
-          orderBy = "webdb_create desc";
-        }
-        if(whereClause.equals("themenspecial")) {
-          whereClause="is_published='1' and to_article_type='3'";
-          orderBy = "webdb_create desc";
-        }
-        if(whereClause.equals("special")) {
-          whereClause="is_published='1' and to_article_type='4'";
-          orderBy = "webdb_create desc";
-        }
-
-        if(whereClause.equals("comments")) {
-          whereClause="not (comment is null or comment like '')";
-          orderBy = "webdb_lastchange desc";
-        }
-
-        if(whereClause.equals("nfrei")) {
-          whereClause="is_published='0'"; orderBy="webdb_create desc";
-        }
-
-        if(whereClause.equals("lastchange")) {
-          whereClause=""; orderBy="webdb_lastchange desc";
-        }
-
-        if(whereClause.equals("media")) {
-          return DatabaseContentToMedia.getInstance().getContent();
-        }
-      }
-      return theStorage.selectByWhereClause(whereClause, orderBy, offset);
+    catch (Throwable e){
+      throw new ModuleFailure(e);
     }
-    catch (StorageObjectException e){	throw new ModuleException(e.toString()); }
   }
 }