From: rk Date: Fri, 28 Sep 2001 20:02:55 +0000 (+0000) Subject: wiped away classes related to GRUPPEN X-Git-Tag: prexmlproducerconfig~395 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=991a8eeb9f18ef922985d79bf2c4ac300fbee4a3;p=mir.git wiped away classes related to GRUPPEN --- diff --git a/source/mircoders/entity/EntityGruppen.java b/source/mircoders/entity/EntityGruppen.java deleted file mode 100755 index 4cc289dd..00000000 --- a/source/mircoders/entity/EntityGruppen.java +++ /dev/null @@ -1,47 +0,0 @@ -package mircoders.entity; - -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; - -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; - -import mircoders.storage.*; - -/** - * Diese Klasse enthält die Daten eines MetaObjekts - * - * @author RK - * @version 29.6.1999 - */ - - -public class EntityGruppen extends AbstractEntity implements Entity -{ - private static int instances; - - public EntityGruppen() - { - super(); - instances++; - } - - public EntityGruppen(StorageObject theStorage) { - this(); - setStorage(theStorage); - } - - public void update() throws StorageObjectException{ - super.update(); - DatabaseContent dbContent = DatabaseContent.getInstance(); - dbContent.setUnproduced("urheber_id="+getId()); - } - - public void finalize() { - instances--; - super.finalize(); - } -} diff --git a/source/mircoders/module/ModuleContent.java b/source/mircoders/module/ModuleContent.java index 4840a606..79b84fcb 100755 --- a/source/mircoders/module/ModuleContent.java +++ b/source/mircoders/module/ModuleContent.java @@ -104,13 +104,12 @@ public class ModuleContent extends AbstractModule return getContent(whereClause, orderBy, offset, user); } - public EntityList getContent(String whereClause, String orderBy, int offset, int limit, EntityGruppen user) - throws ModuleException { + public EntityList getContent(String whereClause, String orderBy, int offset, + int limit, EntityUsers user) throws ModuleException { try { if (user!=null){ - //theLog.printInfo("user!=null admin: "+ user.getValue("admin")); - if (user.getValue("is_admin").equals("0")) + if (!user.isAdmin()) whereClause += " and to_publisher='" + user.getId()+"'"; } return theStorage.selectByWhereClause(whereClause, orderBy, offset, limit); diff --git a/source/mircoders/module/ModuleGruppen.java b/source/mircoders/module/ModuleGruppen.java deleted file mode 100755 index f7bb24cd..00000000 --- a/source/mircoders/module/ModuleGruppen.java +++ /dev/null @@ -1,63 +0,0 @@ -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.*; - - -/* - * ContentObjekt - - * - * - * @author RK - */ - -public class ModuleGruppen extends AbstractModule -{ - static Logfile theLog; - - // Kontruktor - - public ModuleGruppen(StorageObject theStorage) - { - - if (theLog == null) theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Module.Gruppen.Logfile")); - if (theStorage == null) theLog.printWarning("StorageObject was null!"); - - this.theStorage = theStorage; - - } - - // Methoden - - public EntityList getGruppen(String whereClause, int offset, int limit) - throws ModuleException - { - //theLog.printDebugInfo("Module.get (wc,offset, limit)" + - // whereClause + " offset: " + offset + " limit: " + limit); - try { - return theStorage.selectByWhereClause(whereClause, null, offset, limit); - } - catch (StorageObjectException e){ - throw new ModuleException(e.toString()); - } - } - - - public SimpleList getGruppenAsSimpleList() { - return ((DatabaseGroups)theStorage).getPopupData(); - } -} diff --git a/source/mircoders/producer/Producer.java b/source/mircoders/producer/Producer.java index 46bcc026..93862aa1 100755 --- a/source/mircoders/producer/Producer.java +++ b/source/mircoders/producer/Producer.java @@ -22,7 +22,6 @@ abstract public class Producer { protected static ModuleTopics topicsModule; protected static ModuleSchwerpunkt schwerpunktModule; protected static ModuleFeature featureModule; - protected static ModuleGruppen gruppenModule; protected static ModuleContent contentModule; protected static ModuleImages imageModule; protected static ModuleUploadedMedia uploadedMediaModule; @@ -31,7 +30,6 @@ abstract public class Producer { // init try { contentModule = new ModuleContent(DatabaseContent.getInstance()); - gruppenModule = new ModuleGruppen(DatabaseGroups.getInstance()); topicsModule = new ModuleTopics(DatabaseTopics.getInstance()); schwerpunktModule = new ModuleSchwerpunkt(DatabaseFeature.getInstance()); featureModule = new ModuleFeature(DatabaseFeature.getInstance()); diff --git a/source/mircoders/producer/ProducerContent.java b/source/mircoders/producer/ProducerContent.java index bf4df631..bee57b8f 100755 --- a/source/mircoders/producer/ProducerContent.java +++ b/source/mircoders/producer/ProducerContent.java @@ -66,7 +66,7 @@ public class ProducerContent extends Producer { EntityList batchEntityList; HashMap currentContentValues; SimpleHash imageHash = new SimpleHash(); - EntityGruppen userEntity=null; + EntityUsers userEntity=null; @@ -167,5 +167,5 @@ public class ProducerContent extends Producer { sessionConnectTime = new java.util.Date().getTime() - startTime; logHTML(htmlout, "Producer.Content finished: " + sessionConnectTime + " ms."); } - + } diff --git a/source/mircoders/producer/ProducerList.java b/source/mircoders/producer/ProducerList.java index 150cf4ee..c7043ca4 100755 --- a/source/mircoders/producer/ProducerList.java +++ b/source/mircoders/producer/ProducerList.java @@ -42,7 +42,7 @@ abstract public class ProducerList extends Producer { String currentMediaId; EntityContent currentContent; EntityList list; - EntityGruppen userEntity=null; + EntityUsers userEntity=null; SimpleHash imageHash = new SimpleHash(); int size = 0; int listSize = 0; @@ -84,7 +84,7 @@ abstract public class ProducerList extends Producer { if (list!=null || force==true) { SimpleHash mergeData = HTMLTemplateProcessor.makeSimpleHashWithEntitylistInfos(list); //first we try to get the images - + if(list!=null){ for (int k=0; k < list.size();k++) { currentContent = (EntityContent)list.elementAt(k); @@ -97,7 +97,7 @@ abstract public class ProducerList extends Producer { SimpleHash contentHash = (SimpleHash)contentList.get(k); contentHash.put("to_media", mediaList); } catch (Exception e){} - + } //content to html if(currentContent.getValue("is_html").equals("0")){ diff --git a/source/mircoders/producer/ProducerOverview.java b/source/mircoders/producer/ProducerOverview.java deleted file mode 100755 index c6f94e1a..00000000 --- a/source/mircoders/producer/ProducerOverview.java +++ /dev/null @@ -1,177 +0,0 @@ -package mircoders.producer; - -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; - -import freemarker.template.*; - -import mir.misc.*; -import mir.storage.*; -import mir.module.*; -import mir.entity.*; - -import mircoders.module.*; -import mircoders.entity.*; -import mircoders.storage.*; - - - -public class ProducerOverview extends Producer { - - static String monthTemplate; - static String yearTemplate; - static int numberOfTermine; - - static { - // Initialierung - monthTemplate = MirConfig.getProp("Producer.Overview.MonthTemplate"); - yearTemplate = MirConfig.getProp("Producer.Overview.YearTemplate"); - numberOfTermine = Integer.parseInt(MirConfig.getProp("Producer.Startseite.Termine")); - } - - public static void main(String argv[]){ - try { - new ProducerOverview().handle(new PrintWriter(System.out), null, false, false); - } - catch(Exception e) { - System.err.println(e.toString()); - } - } - - public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync) - throws StorageObjectException, ModuleException - { - logHTML(htmlout, "Producer.Overview: started"); - - long sessionConnectTime = 0; - long startTime = (new java.util.Date()).getTime(); - String nowWebdbDate = StringUtil.date2webdbDate(new GregorianCalendar()); - String whereClause; - String orderBy="date"; - String fileName; - EntityContent currentContent; - EntityList monatsListe; - EntityList batchEntityList; - EntityGruppen userEntity=null; - - SimpleHash gruppenPopupData = gruppenModule.getHashData(); - SimpleHash themenPopupData = topicsModule.getHashData(); - SimpleHash schwerpunktPopupData = schwerpunktModule.getHashData(); - ArrayList yearArrayList = new ArrayList(); - HashMap yearHash = new HashMap(); - - // Datenstrukturen fuer Themen/Schwerpunkt aufbauen - batchEntityList = schwerpunktModule.getByWhereClause("is_published!=0", 0); - SimpleList schwerpunktList = HTMLTemplateProcessor.makeSimpleList(batchEntityList); - batchEntityList = contentModule.getContent("(date_from<="+ nowWebdbDate +" and date_to>=" + nowWebdbDate+ ")", "", 0, numberOfTermine, null); - SimpleList terminList = HTMLTemplateProcessor.makeSimpleList(batchEntityList); - batchEntityList = topicsModule.getByWhereClause("","title",-1); - SimpleList themenList = HTMLTemplateProcessor.makeSimpleList(batchEntityList); - - Connection con=null; - Statement stmt=null; - ResultSet rs=null; - DatabaseContent dbContent=DatabaseContent.getInstance(); - - String sql = "select distinct LEFT(date,6) as date from content order by date desc"; - try { - con = dbContent.getPooledCon(); - stmt = con.createStatement(); - rs = dbContent.executeSql(stmt,sql); - - //jetzt übersetzen wir month in text - SimpleHash monatslookup = new SimpleHash(); - monatslookup.put("01","Januar"); - monatslookup.put("02","Februar"); - monatslookup.put("03","März"); - monatslookup.put("04","April"); - monatslookup.put("05","Mai"); - monatslookup.put("06","Juni"); - monatslookup.put("07","Juli"); - monatslookup.put("08","August"); - monatslookup.put("09","September"); - monatslookup.put("10","Oktober"); - monatslookup.put("11","November"); - monatslookup.put("12","Dezember"); - - - // fuer alle yyyy/mm - while(rs.next()){ - // select * from content_objekt where datum like yyyymm% - String currentDate = rs.getString(1); - whereClause="date like '"+ currentDate + "%' and is_published!=0 and islink=0"; - monatsListe = contentModule.getContent(whereClause, orderBy, 0, -1, userEntity); - - // baue uebersichtsseite aus erbenis - if (monatsListe!=null) { - SimpleList items = new SimpleList(); - for(int i=0;i1) { SimpleHash modelRoot = HTMLTemplateProcessor.makeSimpleHashWithEntitylistInfos(theList); modelRoot.put("articletypeHash", DatabaseArticleType.getInstance().getHashData()); - modelRoot.put("gruppenHashData", gruppenModule.getHashData()); deliver(req, res, modelRoot, templateListString); } else { // count = 1 _showObject(theList.elementAt(0).getId(), req, res); diff --git a/source/mircoders/servlet/ServletModuleGroups.java b/source/mircoders/servlet/ServletModuleGroups.java deleted file mode 100755 index b164d209..00000000 --- a/source/mircoders/servlet/ServletModuleGroups.java +++ /dev/null @@ -1,48 +0,0 @@ -package mircoders.servlet; - -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; - -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; - -/* - * ServletModuleGruppen - - * liefert HTML fuer Gruppen - * - * - * @author RK - */ - -public class ServletModuleGroups extends ServletModule -{ - - // Singelton / Kontruktor - - private static ServletModuleGroups instance = new ServletModuleGroups(); - public static ServletModule getInstance() { return instance; } - - private ServletModuleGroups() { - theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Gruppen.Logfile")); - templateListString = MirConfig.getProp("ServletModule.Gruppen.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Gruppen.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Gruppen.ConfirmTemplate"); - try { - mainModule = new ModuleGruppen(DatabaseGroups.getInstance()); - } - catch (StorageObjectException e) { - theLog.printDebugInfo("servletmodulegruppen konnte nicht initialisiert werden"); - } - } - -} diff --git a/source/mircoders/storage/DatabaseContentToTopics.java b/source/mircoders/storage/DatabaseContentToTopics.java index 3a6bdd83..7201f947 100755 --- a/source/mircoders/storage/DatabaseContentToTopics.java +++ b/source/mircoders/storage/DatabaseContentToTopics.java @@ -38,13 +38,6 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ super(); this.hasTimestamp = false; this.theTable="content_x_topic"; - /** - try { - this.theEntityClass = Class.forName("mircoders.entity.EntityGruppen"); - } catch (Exception e) { - throw new StorageObjectException(e.toString()); - } - */ } @@ -74,7 +67,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ } //first delete all row with content_id=contentId String sql = "delete from "+ theTable +" where content_id=" + contentId; - + Connection con=null;Statement stmt=null; try { con = getPooledCon(); @@ -86,7 +79,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ } finally { freeConnection(con,stmt); } - + //now insert //first delete all row with content_id=contentId for (int i=0;iDiese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle - * - * - */ - -public class DatabaseGroups extends Database implements StorageObject{ - - private static DatabaseGroups instance; - - public static DatabaseGroups getInstance() throws StorageObjectException { - if (instance == null) { - instance = new DatabaseGroups(); - instance.myselfDatabase = instance; - } - return instance; - } - - private DatabaseGroups() throws StorageObjectException - { - super(); - this.hasTimestamp = false; - this.cache = new HashMap(); - this.theTable="creator"; - try { - this.theEntityClass = Class.forName("mircoders.entity.EntityGruppen"); - } - catch (Exception e) { throw new StorageObjectException(e.toString()); } - } - - public SimpleList getPopupData() { return getPopupData("name",true); } - -}