indy.nl adjustments

[mir.git] / source / mirlocal / indymedia.nl / IndyNLProducerLocalizer.java

diff --git a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
index 1d27eec..7533e83 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
@@ -21,7 +21,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
               new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
                     "/producer/indymedia.nl/trashedcomments.template",
-                    "${config.storageRoot}/trashed/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.trashed.shtml"
+                    "${config.storageRoot}/trashbin/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.trashed.shtml"
                 )
               )
             )
@@ -41,6 +41,10 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                   "/producer/indymedia.nl/content.template",
                   "${config.storageRoot}/content/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.inc"
               ),
+              new GeneratingProducerNode(
+                  "/producer/indymedia.nl/comments.template",
+                  "${config.storageRoot}/content/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.comments.inc"
+              ),
               new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                     new CompositeProducerNode( new ProducerNode[] {
@@ -72,6 +76,10 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                   "/producer/indymedia.nl/removed.template",
                   "${config.storageRoot}/content/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.inc"
               ),
+              new GeneratingProducerNode(
+                  "/producer/indymedia.nl/removed.template",
+                  "${config.storageRoot}/content/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.comments.inc"
+              ),
               new EntityEnumeratingProducerNode( "language", model, "language", "code = 'nl'", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                     new CompositeProducerNode( new ProducerNode[] {
@@ -112,10 +120,10 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                       ),
                       new GeneratingProducerNode(
                           "/producer/indymedia.nl/trashed.template",
-                          "${config.storageRoot}/trashed/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
+                          "${config.storageRoot}/trashbin/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
                       ),
                       new FileDateSettingProducerNode(
-                          "${config.storageRoot}/trashed/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
+                          "${config.storageRoot}/trashbin/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
                           "content.date.date"
                       ),
                       new ContentMarkingProducerNode( "content" )
@@ -292,7 +300,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",
@@ -305,6 +314,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                         )
                       )))))
                     )
+*/
                   } )
                 )
               )
@@ -377,7 +387,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
 */
-
+/*
     try {
       batchingNode =
           new EntityBatchingProducerNode( "comments", "batch", model, "comments",
@@ -413,6 +423,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
     }
 
+*/
+
     try {
       enumeratingNode =
               new EntityEnumeratingProducerNode( "content", model, "content",