first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

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

diff --git a/source/mircoders/producer/ProducerNavigation.java b/source/mircoders/producer/ProducerNavigation.java
index aab7d08..afbae4a 100755 (executable)
--- a/source/mircoders/producer/ProducerNavigation.java
+++ b/source/mircoders/producer/ProducerNavigation.java
@@ -29,7 +29,7 @@ public class ProducerNavigation extends Producer {
   public void handle(PrintWriter htmlout, EntityUsers user, boolean forced, boolean sync)
     throws mir.module.ModuleException, mir.storage.StorageObjectException {
 
-    printHTML(htmlout, "Producer.Navigation: started");
+        printHTML(htmlout, "Producer.Navigation: started");
 
                long                sessionConnectTime = 0;
                long                startTime = (new java.util.Date()).getTime();
@@ -42,22 +42,18 @@ public class ProducerNavigation extends Producer {
                EntityList          entityList;
                SimpleHash          naviPageModel;
 
-               // get the topiclist
-               entityList = topicsModule.getByWhereClause("","title",-1);
-               SimpleList topicList = HTMLTemplateProcessor.makeSimpleList(entityList);
+        // get the imclinks
+        entityList = linksImcsModule.getByWhereClause("", "sortpriority, title", -1);
+        SimpleList imcList = HTMLTemplateProcessor.makeSimpleList(entityList);
 
-    // get the imclinks
-    entityList = linksImcsModule.getByWhereClause("", "sortpriority, title", -1);
-    SimpleList imcList = HTMLTemplateProcessor.makeSimpleList(entityList);
-
-    EntityList theParentList = linksImcsModule.getByWhereClause("to_parent_id=NULL", "sortpriority, title", -1);
-    SimpleList parentList = HTMLTemplateProcessor.makeSimpleList(theParentList);
+        EntityList theParentList = linksImcsModule.getByWhereClause("to_parent_id=NULL", "sortpriority, title", -1);
+        SimpleList parentList = HTMLTemplateProcessor.makeSimpleList(theParentList);
 
                // put the informations into the navipagemodel
                naviPageModel = new SimpleHash();
-               naviPageModel.put("topics", topicList);
-    naviPageModel.put("imclist", imcList);
-    naviPageModel.put("parentlist", parentList);
+               naviPageModel.put("topics", topicsModule.getTopicsList());
+        naviPageModel.put("imclist", imcList);
+        naviPageModel.put("parentlist", parentList);
 
                htmlFileName = producerDocRoot + "/navigation.inc";
 
@@ -73,4 +69,4 @@ public class ProducerNavigation extends Producer {
                }
        }
 
-}
\ No newline at end of file
+}