don't sort by the "date" field, use webdb_create instead

[mir.git] / source / mircoders / producer / ProducerTopics.java

diff --git a/source/mircoders/producer/ProducerTopics.java b/source/mircoders/producer/ProducerTopics.java
index f26ab69..56cc503 100755 (executable)
--- a/source/mircoders/producer/ProducerTopics.java
+++ b/source/mircoders/producer/ProducerTopics.java
@@ -1,3 +1,34 @@
+/*
+ * 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
+ *
+ * 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.
+ */
+
 package mircoders.producer;
 
 import java.io.*;
@@ -51,7 +82,7 @@ public class ProducerTopics extends ProducerList {
     /** @todo should be done in static */
     listTemplate = MirConfig.getProp("Producer.TopicList.Template");
 
-    orderBy="date desc, webdb_create desc";
+    orderBy="webdb_create desc";
     EntityList topicsEntityList;
     if(where==null){
       topicsEntityList = topicsModule.getByWhereClause("","title", -1);
@@ -70,7 +101,7 @@ public class ProducerTopics extends ProducerList {
       if (contentEntityList!=null || force==true) {
         if (contentEntityList!=null){
           boolean first=true;
-          whereClause="is_published='1' AND to_article_type >= 1 AND to_article_type <=2 AND id IN (";
+          whereClause="is_published='1' AND to_article_type >= 0 AND to_article_type <=2 AND id IN (";
           whereClauseSpecial="is_published='1' AND to_article_type=3 AND id IN (";
           for(int j=0; j < contentEntityList.size(); j++){
             if(first==false) {
@@ -91,13 +122,13 @@ public class ProducerTopics extends ProducerList {
 
         if(contentEntityList==null && force==true){
           //hihi, das ist eigentlich boese
-          whereClause="is_published='1' AND to_article_type>=1 AND id IN (0)";
+          whereClause="is_published='1' AND to_article_type>=0 AND id IN (0)";
         }
 
         fileDesc = currentTopic.getValue("filename");
 
         // get the startarticle
-        EntityList entityList = contentModule.getContent(whereClauseSpecial,"date desc, webdb_create desc",0,1);
+        EntityList entityList = contentModule.getContent(whereClauseSpecial,"webdb_create desc",0,1);
         String currentMediaId = null;
         SimpleHash imageHash = new SimpleHash();
         EntityContent currentContent;