dead wood cleaned up

[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 23f64bb..1cfe809 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
@@ -24,10 +24,16 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
               ),
               new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
-                    new GeneratingProducerNode(
-                        "/producer/indymedia.nl/article.template",
-                        "${config.storageRoot}/${language.code}/${content.date.year}/${content.date.month}/${content.id}.shtml"
-                    )
+                    new CompositeProducerNode( new ProducerNode[] {
+                      new GeneratingProducerNode(
+                          "/producer/indymedia.nl/article.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"
+                      )
+                    } )
                 )
               )
             } )
@@ -65,9 +71,9 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       startPageNode =
             new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                    "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 40,
+                    "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 40, 0,
               new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                            "", "code", 10,
+                            "", "code", 10, 0,
                     new CompositeProducerNode( new ProducerNode[] {
                         new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
                           new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
@@ -77,20 +83,26 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                               )
                           )
                         ),
-                        new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "",
-                            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"
+                        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(),
+                                    "", "webdb_create desc", 5, 0,
+                            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "",
+                                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"
+                                    )
+                                  )))))
                                 )
-                              )))))
                             )
-                         )
+                          )
+                        )
                     })
               )
             );
@@ -119,15 +131,18 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
   }
 
   protected void setupSynchronizationFactory(CompositeProducerFactory aSynchronizationFactory) {
-    if(MirGlobal.getConfigBooleanProperty("Rsync")){
+/*    if(MirGlobal.getConfigBooleanProperty("Rsync")){
       aSynchronizationFactory.addFactory(
         new ScriptCallProducerFactory(MirGlobal.getConfigProperty("Rsync.Script.Path")));
     }
     else {
+*/
       NullProducerFactory nullFactory = new NullProducerFactory();
       nullFactory.addVerb("run");
       aSynchronizationFactory.addFactory(nullFactory);
+/*
     }
+ */
   }
 
   protected void setupStaticFactory(CompositeProducerFactory aStaticFactory) {
@@ -136,7 +151,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       staticNode =
           new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                  "", "code", 10,
+                  "", "code", 10, 0,
               new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                   new CompositeProducerNode( new ProducerNode[] {
@@ -185,7 +200,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                       new EvaluatedAssignmentProducerNode( "bottominclude", "/${language.code}/bottom.inc",
                       new EvaluatedAssignmentProducerNode( "navinclude", "/${language.code}/nav.inc",
                       new EvaluatedAssignmentProducerNode( "newswireinclude", "/${language.code}/newswire.inc",
-                      new EvaluatedAssignmentProducerNode( "featuresinclude", "/${language.code}/try/features.inc",
+                      new EvaluatedAssignmentProducerNode( "featuresinclude", "/try/${language.code}/features.inc",
                         new GeneratingProducerNode(
                             "/producer/indymedia.nl/start.template",
                             "${config.storageRoot}/try/${language.code}/start.shtml"
@@ -211,11 +226,11 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       node =
           new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10,
+                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
             new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
-                      "", "webdb_create desc", 5,
+                      "", "webdb_create desc", 5, 0,
               new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                        "", "code", 10,
+                        "", "code", 10, 0,
                 new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
                   new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                       new GeneratingProducerNode(
@@ -236,16 +251,16 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       node =
           new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10,
+                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
             new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
-                      "", "webdb_create desc", 5,
+                      "", "webdb_create desc", 5, 0,
               new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                        "", "code", 10,
+                        "", "code", 10, 0,
                 new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
                   new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                       new GeneratingProducerNode(
                           "/producer/indymedia.nl/features.template",
-                          "${config.storageRoot}/${language.code}/try/features.inc"
+                          "${config.storageRoot}/try/${language.code}/features.inc"
                       )
                   )
                 )