X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fproducer%2FProducerNavigation.java;h=afbae4a6f5dc5a5452f4fa921ed69fe1981131ef;hb=9065f22c307993d6dd19be86aafcef915f52f36d;hp=aab7d08f29dafa7f8378614b19a0b528dea91f78;hpb=3762757580e709f68a1b6bbc0e9a275a84f2ff79;p=mir.git

diff --git a/source/mircoders/producer/ProducerNavigation.java b/source/mircoders/producer/ProducerNavigation.java
index aab7d08f..afbae4a6 100755
--- 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
+}