get url

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

diff --git a/source/mircoders/producer/ProducerNavigation.java b/source/mircoders/producer/ProducerNavigation.java
index a26bbe7..afbae4a 100755 (executable)
--- a/source/mircoders/producer/ProducerNavigation.java
+++ b/source/mircoders/producer/ProducerNavigation.java
@@ -6,15 +6,13 @@ import java.util.*;
 
 import freemarker.template.*;
 
-import webdb.misc.*;
-import webdb.storage.*;
-import webdb.module.*;
-import webdb.entity.*;
-
-import mir.module.*;
+import mir.misc.*;
 import mir.storage.*;
+import mir.module.*;
 import mir.entity.*;
 
+import mircoders.entity.*;
+
 /**
  * Title:        mir - another content management system
  * Description:
@@ -26,12 +24,12 @@ import mir.entity.*;
 
 public class ProducerNavigation extends Producer {
 
-  private static String naviPageTemplate = Configuration.getProperty("Producer.Navigation.Template");
+  private static String naviPageTemplate = MirConfig.getProp("Producer.Navigation.Template");
 
   public void handle(PrintWriter htmlout, EntityUsers user, boolean forced, boolean sync)
-    throws webdb.module.ModuleException, webdb.storage.StorageObjectException {
+    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();
@@ -44,13 +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);
+
+        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("topics", topicsModule.getTopicsList());
+        naviPageModel.put("imclist", imcList);
+        naviPageModel.put("parentlist", parentList);
 
                htmlFileName = producerDocRoot + "/navigation.inc";
 
@@ -66,4 +69,4 @@ public class ProducerNavigation extends Producer {
                }
        }
 
-}
\ No newline at end of file
+}