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 104c316..597f2cc 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
@@ -59,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\"")
             } )
           );
 
@@ -67,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 =
@@ -80,7 +83,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                   "/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 EntityEnumeratingProducerNode( "language", model, "language", "code in ('nl', 'en')", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                     new CompositeProducerNode( new ProducerNode[] {
                       new GeneratingProducerNode(
@@ -111,14 +114,18 @@ 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}/trashbin/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
                       ),
@@ -162,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[] {
@@ -366,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,
@@ -428,14 +435,17 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     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')", "",