X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fproducer%2FProducerNavigation.java;h=afbae4a6f5dc5a5452f4fa921ed69fe1981131ef;hb=95686b2525b7070e89a2bf7bd6781230f74a660e;hp=841e26e016bc291aad0aa99bfa3c62baee5e18d3;hpb=86b6f499b413c722acc895346ac5186405b0c44c;p=mir.git diff --git a/source/mircoders/producer/ProducerNavigation.java b/source/mircoders/producer/ProducerNavigation.java index 841e26e0..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,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"; @@ -64,4 +69,4 @@ public class ProducerNavigation extends Producer { } } -} \ No newline at end of file +}