script test for indy.nl

[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..597f2cc 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[] {
@@ -55,7 +59,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                     } )
                 )
               ),
-              new ContentMarkingProducerNode( "content" )
+              new ContentMarkingProducerNode( "content" ),
+              new ScriptCallingProducerNode("/home/www-data/bin/addarticle \"http://prod.indymedia.nl/nl/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml\"")
             } )
           );
 
@@ -63,6 +68,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       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 );
+      aProducerNode.addSubNode( new ScriptCallingProducerNode("/home/www-data/bin/postproduce") );
+
 
       // openly trashed articles
       contentNode =
@@ -72,7 +79,11 @@ 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 EntityEnumeratingProducerNode( "language", model, "language", "code = 'nl'", "",
+              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 in ('nl', 'en')", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                     new CompositeProducerNode( new ProducerNode[] {
                       new GeneratingProducerNode(
@@ -103,19 +114,23 @@ 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 EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
+                new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                  new GeneratingProducerNode(
+                      "/producer/indymedia.nl/removed.template",
+                      "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
+                  )
+                )
+              ),
               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}/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" )
@@ -154,7 +169,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                         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,
+                                  "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 CompositeProducerNode( new ProducerNode[] {
@@ -176,7 +191,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                                       new EvaluatedAssignmentProducerNode( "featuresinclude", "/producer/indymedia.nl/features.template",
                                         new GeneratingProducerNode(
                                             "/producer/indymedia.nl/start.template",
-                                            "${config.storageRoot}/index.shtml"
+                                            "${config.storageRoot}/index.html"
                                         )
                                       )))))
                                     )
@@ -292,7 +307,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 +321,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                         )
                       )))))
                     )
+*/
                   } )
                 )
               )
@@ -356,7 +373,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       node =
           new EntityListProducerNode("features", model, "content",
-                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 15, 0,
+                  "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 20, 0,
             new EntityListProducerNode("breaking", model, "breakingNews",
                       "", "webdb_create desc", 5, 0,
               new EntityListProducerNode("languages", model, "language", "code in ('nl', 'en')", "code", 10, 0,
@@ -377,7 +394,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
 */
-
+/*
     try {
       batchingNode =
           new EntityBatchingProducerNode( "comments", "batch", model, "comments",
@@ -413,17 +430,22 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
     }
 
+*/
+
     try {
       enumeratingNode =
               new EntityEnumeratingProducerNode( "content", model, "content",
+                new CompositeProducerNode( new ProducerNode[] {
                   new GeneratingProducerNode(
                       "/producer/indymedia.nl/static.template",
                       "${config.storageRoot}/${language.code}/static/${content.edittitle}.shtml"
-                  )
-                );
+                  ),
+                  new ContentMarkingProducerNode( "content" )
+                })
+              );
 
-      enumeratingNode.addVerb( "all", "is_published='1' and to_article_type=${articletype.static} and to_language=${language.id} and edittitle<>'' and not edittitle is null", "" );
-      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", "" );
+      enumeratingNode.addVerb( "all", "is_published='1' and to_article_type=${articletype.static} and to_language in (${language.id}, 0) and edittitle<>'' and not edittitle is null", "" );
+      enumeratingNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type=${articletype.static} and to_language in (${language.id}, 0) and edittitle<>'' and not edittitle is null", "" );
 
       aFactoriesMap.put("staticarticles", new NodedProducerFactory(
           new EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",