hopefully the final indymedia.nl producer config
[mir.git] / source / mirlocal / indymedia.nl / IndyNLProducerLocalizer.java
index 4ca7e03..6e0b7aa 100755 (executable)
@@ -7,7 +7,6 @@ import mircoders.localizer.*;
 import mircoders.localizer.basic.*;
 import mircoders.producer.*;
 import mircoders.storage.*;
-import mircoders.entity.adapter.*;
 
 public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
 
@@ -15,14 +14,34 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     EntityEnumeratingProducerNode contentNode = null;
 
     try {
+      // trashed comments
       contentNode =
-          new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+          new EntityEnumeratingProducerNode( "content", model, "content",
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/trashedcomments.template",
+                    "${config.storageRoot}/trashbin/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.trashed.shtml"
+                )
+              )
+            )
+          );
+
+      contentNode.addVerb( "all", "is_published='1' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.opentrashed} and exists(select * from comment where comment.to_media=content.id and comment.is_published='f')", "" );
+      contentNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.opentrashed} and exists(select * from comment where comment.to_media=content.id and comment.is_published='f')", "" );
+
+      aProducerNode.addSubNode( contentNode );
+
+
+      // ordinary articles
+      contentNode =
+          new EntityEnumeratingProducerNode( "content", model, "content",
             new CompositeProducerNode( new ProducerNode[] {
               new GeneratingProducerNode(
                   "/producer/indymedia.nl/content.template",
                   "${config.storageRoot}/content/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.inc"
               ),
-              new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                     new CompositeProducerNode( new ProducerNode[] {
                       new GeneratingProducerNode(
@@ -35,32 +54,76 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                       )
                     } )
                 )
-              )
+              ),
+              new ContentMarkingProducerNode( "content" )
             } )
           );
 
-      contentNode.addVerb( "all", "is_published='1' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.static}", "" );
-      contentNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.static}", "" );
+      contentNode.addVerb( "all", "is_published='1' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.opentrashed} and to_article_type<>${articletype.static}", "webdb_create desc, date desc" );
+      contentNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.opentrashed} and to_article_type<>${articletype.static}", "webdb_create desc, date desc" );
 
       aProducerNode.addSubNode( contentNode );
 
+      // openly trashed articles
+      contentNode =
+          new EntityEnumeratingProducerNode( "content", model, "content",
+            new CompositeProducerNode( new ProducerNode[] {
+              new GeneratingProducerNode(
+                  "/producer/indymedia.nl/removed.template",
+                  "${config.storageRoot}/content/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.inc"
+              ),
+              new EntityEnumeratingProducerNode( "language", model, "language", "code = 'nl'", "",
+                new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                    new CompositeProducerNode( new ProducerNode[] {
+                      new GeneratingProducerNode(
+                          "/producer/indymedia.nl/trashed.template",
+                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
+                      ),
+                      new FileDateSettingProducerNode(
+                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
+                          "content.date.date"
+                      ),
+                      new ContentMarkingProducerNode( "content" )
+                    } )
+                )
+              ),
+              new ContentMarkingProducerNode( "content" )
+            })
+          );
+      contentNode.addVerb( "all", "is_published='1' and to_article_type=${articletype.opentrashed}", "" );
+      contentNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type=${articletype.opentrashed}", "" );
 
+      aProducerNode.addSubNode( contentNode );
+
+      // closedly trashed articles
       contentNode =
-          new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
-              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
-                  new CompositeProducerNode( new ProducerNode[] {
-                    new GeneratingProducerNode(
-                        "/producer/indymedia.nl/trashed.template",
-                        "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
-                    ),
-                    new FileDateSettingProducerNode(
-                        "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
-                        "content.date.date"
-                    )
-                  } )
-              )
-            )
+          new EntityEnumeratingProducerNode( "content", model, "content",
+            new CompositeProducerNode( new ProducerNode[] {
+              new GeneratingProducerNode(
+                  "/producer/indymedia.nl/removed.template",
+                  "${config.storageRoot}/content/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.inc"
+              ),
+              new EntityEnumeratingProducerNode( "language", model, "language", "code = 'nl'", "",
+                new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                    new CompositeProducerNode( new ProducerNode[] {
+                      new GeneratingProducerNode(
+                          "/producer/indymedia.nl/removed.template",
+                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
+                      ),
+                      new GeneratingProducerNode(
+                          "/producer/indymedia.nl/trashed.template",
+                          "${config.storageRoot}/trashbin/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
+                      ),
+                      new FileDateSettingProducerNode(
+                          "${config.storageRoot}/trashbin/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
+                          "content.date.date"
+                      ),
+                      new ContentMarkingProducerNode( "content" )
+                    } )
+                )
+              ),
+              new ContentMarkingProducerNode( "content" )
+            })
           );
       contentNode.addVerb( "all", "is_published='1' and to_article_type=${articletype.trashed}", "" );
       contentNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type=${articletype.trashed}", "" );
@@ -76,12 +139,11 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
   protected void setupStartPageFactory(CompositeProducerNode aProducerNode) {
     try {
       aProducerNode.addSubNode(
-            new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+            new EntityListProducerNode("newswire", model, "content",
                     "is_published='1' and to_article_type in (${articletype.newswire}, ${articletype.promotednewswire})", "date desc, webdb_create desc", 40, 0,
-              new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                            "", "code", 10, 0,
+              new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
                     new CompositeProducerNode( new ProducerNode[] {
-                        new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+                        new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
                           new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                               new GeneratingProducerNode(
                                   "/producer/indymedia.nl/newswire.template",
@@ -89,25 +151,38 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                               )
                           )
                         ),
-                        new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                                "is_published='1' and to_article_type in ( ${articletype.feature}, ${articletype.promotednewswire})", "date desc, webdb_create desc", 10, 0,
-                          new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
-                                    "", "webdb_create desc", 5, 0,
-                            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "",
-                              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
-                                new AssignmentProducerNode( "staticinclude", "1",
-                                  new EvaluatedAssignmentProducerNode( "topinclude", "/producer/indymedia.nl/top.template",
-                                  new EvaluatedAssignmentProducerNode( "bottominclude", "/producer/indymedia.nl/bottom.template",
-                                  new EvaluatedAssignmentProducerNode( "navinclude", "/producer/indymedia.nl/nav.template",
-                                  new EvaluatedAssignmentProducerNode( "newswireinclude", "/producer/indymedia.nl/newswire.template",
-                                  new EvaluatedAssignmentProducerNode( "featuresinclude", "/producer/indymedia.nl/features.template",
+                        new EntityListProducerNode("startspecials", model, "content",
+                                "is_published='1' and to_article_type = ${articletype.startspecial}", "date desc, webdb_create desc", 10, 0,
+                          new EntityListProducerNode("features", model, "content",
+                                  "is_published='1' and to_article_type in ( ${articletype.feature}, ${articletype.promotednewswire})", "date desc, webdb_create desc", 15, 0,
+                            new EntityListProducerNode("breaking", model, "breakingNews",
+                                      "", "webdb_create desc", 5, 0,
+                              new CompositeProducerNode( new ProducerNode[] {
+                                new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+                                  new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                                     new GeneratingProducerNode(
-                                        "/producer/indymedia.nl/start.template",
-                                        "${config.storageRoot}/index.shtml"
+                                        "/producer/indymedia.nl/features.template",
+                                        "${config.storageRoot}/${language.code}/features.inc"
                                     )
-                                  )))))
+                                  )
+                                ),
+                                new EntityEnumeratingProducerNode( "language", model, "language", "code='nl'", "",
+                                  new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                                    new AssignmentProducerNode( "staticinclude", "1",
+                                      new EvaluatedAssignmentProducerNode( "topinclude", "/producer/indymedia.nl/top.template",
+                                      new EvaluatedAssignmentProducerNode( "bottominclude", "/producer/indymedia.nl/bottom.template",
+                                      new EvaluatedAssignmentProducerNode( "navinclude", "/producer/indymedia.nl/nav.template",
+                                      new EvaluatedAssignmentProducerNode( "newswireinclude", "/producer/indymedia.nl/newswire.template",
+                                      new EvaluatedAssignmentProducerNode( "featuresinclude", "/producer/indymedia.nl/features.template",
+                                        new GeneratingProducerNode(
+                                            "/producer/indymedia.nl/start.template",
+                                            "${config.storageRoot}/index.shtml"
+                                        )
+                                      )))))
+                                    )
+                                  )
                                 )
-                              )
+                              )
                             )
                           )
                         )
@@ -126,11 +201,10 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
 
     try {
       topicPageNode =
-        new EntityBatchingProducerNode( "articles", "batch", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-              "is_published='1' and to_article_type in (${articletype.newswire}, ${articletype.promotednewswire}) and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date asc, webdb_create asc", 6, 5, 0,
-          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                  "", "code", 10, 0,
-            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+        new EntityBatchingProducerNode( "articles", "batch", model, "content",
+              "is_published='1' and to_article_type in (${articletype.newswire}, ${articletype.promotednewswire}) and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "webdb_create asc, date asc", 20, 10, 0,
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
               new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
                     "/producer/indymedia.nl/topic.template",
@@ -139,9 +213,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
           ),
-          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                  "", "code", 10, 0,
-            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
               new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
                     "/producer/indymedia.nl/topicnavigation.template",
@@ -155,8 +228,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       topicPageNode.addVerb("new", 3);
 
       aProducerNode.addSubNode(
-          new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "", "",
-            new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+          new EntityEnumeratingProducerNode( "topic", model, "topic","", "",
+            new EntityListProducerNode("topicspecial", model, "content",
                   "is_published='1' and to_article_type = ${articletype.topicspecial} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date, webdb_create", 1, 0,
               topicPageNode
             )
@@ -172,9 +245,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
   protected void setupStaticFactory(CompositeProducerNode aProducerNode) {
     try {
       aProducerNode.addSubNode(
-          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                  "", "code", 10, 0,
-              new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+              new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                   new CompositeProducerNode( new ProducerNode[] {
                     new GeneratingProducerNode(
@@ -198,8 +270,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                         "${config.storageRoot}/${language.code}/style2.css"
                     ),
                     new GeneratingProducerNode(
-                        "/producer/indymedia.nl/top.template",
-                        "${config.storageRoot}/${language.code}/top.inc"
+                        "/producer/indymedia.nl/trashtop.template",
+                        "${config.storageRoot}/${language.code}/trashtop.inc"
                     ),
                     new GeneratingProducerNode(
                         "/producer/indymedia.nl/articlepre.template",
@@ -220,7 +292,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                             "${config.storageRoot}/${language.code}/start.shtml"
                         )
                       )))))
-                    ),
+                    )
+/*                    ,
                     new AssignmentProducerNode( "staticinclude", "0",
                       new EvaluatedAssignmentProducerNode( "topinclude", "/${language.code}/top.inc",
                       new EvaluatedAssignmentProducerNode( "bottominclude", "/${language.code}/bottom.inc",
@@ -233,6 +306,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                         )
                       )))))
                     )
+*/
                   } )
                 )
               )
@@ -251,15 +325,17 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     EntityBatchingProducerNode batchingNode = null;
     EntityEnumeratingProducerNode enumeratingNode = null;
 
+/*
     try {
       node =
-          new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
-            new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
+        new EntityListProducerNode("startspecials", model, "content",
+                "is_published='1' and to_article_type = ${articletype.startspecial}", "date desc, webdb_create desc", 10, 0,
+          new EntityListProducerNode("features", model, "content",
+                  "is_published='1' and to_article_type in ( ${articletype.feature}, ${articletype.promotednewswire})", "date desc, webdb_create desc", 20, 0,
+            new EntityListProducerNode("breaking", model, "breakingNews",
                       "", "webdb_create desc", 5, 0,
-              new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                        "", "code", 10, 0,
-                new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+                new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
                   new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                       new GeneratingProducerNode(
                           "/producer/indymedia.nl/features.template",
@@ -269,23 +345,24 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                 )
               )
             )
-          );
+          )
+        );
       aFactoriesMap.put("features", new NodedProducerFactory( node ) );
     }
     catch (Throwable t) {
       logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
+*/
 
-
+/*
     try {
       node =
-          new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
-            new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
+          new EntityListProducerNode("features", model, "content",
+                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 15, 0,
+            new EntityListProducerNode("breaking", model, "breakingNews",
                       "", "webdb_create desc", 5, 0,
-              new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                        "", "code", 10, 0,
-                new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+                new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
                   new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                       new GeneratingProducerNode(
                           "/producer/indymedia.nl/features.template",
@@ -301,14 +378,15 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     catch (Throwable t) {
       logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
-
+*/
+/*
     try {
       batchingNode =
-          new EntityBatchingProducerNode( "comments", "batch", DatabaseComment.getInstance(), CommentAdapterDefinition.getInstance(),
+          new EntityBatchingProducerNode( "comments", "batch", model, "comments",
+
                 "", "id asc", 25, 15, 0,
-            new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                    "", "code", 10, 0,
-              new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "",
+            new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+              new EntityEnumeratingProducerNode( "language", model, "language", "code='nl'", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                   new GeneratingProducerNode(
                       "/producer/indymedia.nl/commentsindex.template",
@@ -317,9 +395,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                 )
               )
             ),
-            new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                    "", "code", 10, 0,
-              new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "",
+            new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+              new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                   new GeneratingProducerNode(
                       "/producer/indymedia.nl/commentsindexnavigation.template",
@@ -338,9 +415,11 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
     }
 
+*/
+
     try {
       enumeratingNode =
-              new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+              new EntityEnumeratingProducerNode( "content", model, "content",
                   new GeneratingProducerNode(
                       "/producer/indymedia.nl/static.template",
                       "${config.storageRoot}/${language.code}/static/${content.edittitle}.shtml"
@@ -351,7 +430,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       enumeratingNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type=${articletype.static} and to_language=${language.id} and edittitle<>'' and not edittitle is null", "" );
 
       aFactoriesMap.put("staticarticles", new NodedProducerFactory(
-          new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+          new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
             new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
               enumeratingNode
             )
@@ -361,5 +440,225 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     catch (Throwable t) {
       logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
     }
+
+
+    try {
+      batchingNode =
+          new EntityBatchingProducerNode( "articles", "batch", model, "content",
+                "to_article_type=${articletype.trashed} or exists(select * from comment where comment.to_media=content.id and comment.is_published='f')", "webdb_create asc, date asc", 25, 15, 0,
+            new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+              new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+                new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                  new GeneratingProducerNode(
+                      "/producer/indymedia.nl/trashbin.template",
+                      "${config.storageRoot}/trashbin/${language.code}/trashbin${batch.current.identifier}.shtml"
+                  )
+                )
+              )
+            ),
+            new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+              new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+                new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                  new GeneratingProducerNode(
+                      "/producer/indymedia.nl/trashbinnavigation.template",
+                      "${config.storageRoot}/trashbin/${language.code}/trashbinnavigation.inc"
+                  )
+                )
+              )
+            )
+          );
+      batchingNode.addVerb("new", 3);
+      batchingNode.addVerb("all", -1);
+
+      aFactoriesMap.put("trashbin", new NodedProducerFactory( batchingNode ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
+
+// archives
+
+    try {
+      batchingNode =
+        new EntityBatchingProducerNode( "articles", "batch", model, "content",
+              "is_published='1' and to_article_type = ${articletype.feature}", "webdb_create asc, date asc", 20, 10, 0,
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/feature.archive.template",
+                    "${config.storageRoot}/${language.code}/feature/feature${batch.current.identifier}.shtml"
+                )
+              )
+            )
+          ),
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/feature.archive.navigation.template",
+                    "${config.storageRoot}/${language.code}/feature/featurenavigation.inc"
+                )
+              )
+            )
+          )
+        );
+      batchingNode.addVerb("all", -1);
+      batchingNode.addVerb("new", 3);
+
+      aFactoriesMap.put("featurearchive", new NodedProducerFactory( batchingNode ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
+
+    try {
+      batchingNode =
+        new EntityBatchingProducerNode( "articles", "batch", model, "content",
+              "is_published='1' and to_article_type in (${articletype.newswire}, ${articletype.promotednewswire})", "webdb_create asc, date asc", 20, 10, 0,
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/newswire.archive.template",
+                    "${config.storageRoot}/${language.code}/newswire/newswire${batch.current.identifier}.shtml"
+                )
+              )
+            )
+          ),
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/newswire.archive.navigation.template",
+                    "${config.storageRoot}/${language.code}/newswire/newswirenavigation.inc"
+                )
+              )
+            )
+          )
+        );
+      batchingNode.addVerb("all", -1);
+      batchingNode.addVerb("new", 3);
+
+      aFactoriesMap.put("newswirearchive", new NodedProducerFactory( batchingNode ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
+
+    try {
+      batchingNode =
+        new EntityBatchingProducerNode( "articles", "batch", model, "content",
+              "is_published='1' and to_article_type in (${articletype.openposting}, ${articletype.newswire}, ${articletype.promotednewswire})", "webdb_create asc, date asc", 20, 10, 0,
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/openposting.archive.template",
+                    "${config.storageRoot}/${language.code}/openposting/openposting${batch.current.identifier}.shtml"
+                )
+              )
+            )
+          ),
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/openposting.archive.navigation.template",
+                    "${config.storageRoot}/${language.code}/openposting/openpostingnavigation.inc"
+                )
+              )
+            )
+          )
+        );
+      batchingNode.addVerb("all", -1);
+      batchingNode.addVerb("new", 3);
+
+      aFactoriesMap.put("openpostingarchive", new NodedProducerFactory( batchingNode ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
+
+    try {
+      node =
+        new EntityListProducerNode( "articles", model, "content",
+              "is_published='1' and to_article_type in (${articletype.feature}, ${articletype.startspecial}, ${articletype.newswire}, ${articletype.promotednewswire})",
+              "(select max(webdb_create) from comment where to_media=content.id and is_published='t') desc", 30, 0,
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/commentedarticles.template",
+                    "${config.storageRoot}/${language.code}/commentedarticles.shtml"
+                )
+              )
+            )
+          )
+        );
+      aFactoriesMap.put("commentedarticles", new NodedProducerFactory( node ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
+
+    try {
+      node =
+        new EntityListProducerNode( "articles", model, "content",
+              "is_published='1' and to_article_type = ${articletype.opentrashed}", "webdb_create desc, date desc", 30, 0,
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/opentrashbin.template",
+                    "${config.storageRoot}/${language.code}/opentrashbin.shtml"
+                )
+              )
+            )
+          )
+        );
+      aFactoriesMap.put("opentrashbin", new NodedProducerFactory( node ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
+
+    try {
+      node =
+        new EntityListProducerNode( "articles", model, "content",
+              "is_published='1' and length(source)>10 and id>5000 and to_article_type in (${articletype.feature}, ${articletype.startspecial}, ${articletype.newswire}, ${articletype.promotednewswire})",
+              "webdb_create desc, date desc", 10, 0,
+          new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", model, "language", "code in ('en')", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/featuressyndication.template",
+                    "${config.storageRoot}/features.1-0.rdf",
+                    "UTF-8"
+                )
+              )
+            )
+          )
+        );
+      aFactoriesMap.put("syndication", new NodedProducerFactory( node ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
+
+    try {
+      node =
+          new EntityEnumeratingProducerNode( "content", model, "content", "to_article_type = ${articletype.opentrashed} and webdb_create<now()-interval '5 days'", "",
+            new ContentModifyingProducerNode(
+              "content",
+              "to_article_type",
+              "${articletype.trashed}"
+            )
+          );
+      aFactoriesMap.put("trashbinmover", new NodedProducerFactory( node ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
   }
 }