*** empty log message ***

[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 4bc33ad..df74e2d 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
@@ -40,10 +40,11 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
           );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupContentFactory: Exception "+t.getMessage());
     }
 
-    contentNode.addVerb( "all", "is_published='1'", "" );
-    contentNode.addVerb( "new", "is_published='1' and is_produced='f'", "" );
+    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}", "" );
 
     aProducerNode.addSubNode( contentNode );
   }
@@ -52,7 +53,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       aProducerNode.addSubNode(
             new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                    "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 40, 0,
+                    "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 CompositeProducerNode( new ProducerNode[] {
@@ -65,10 +66,11 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                           )
                         ),
                         new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                                "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
+                                "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",
@@ -81,6 +83,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                                     )
                                   )))))
                                 )
+                              )
                             )
                           )
                         )
@@ -90,6 +93,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupStartPageFactory: Exception "+t.getMessage());
     }
   }
 
@@ -99,11 +103,11 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       topicPageNode =
         new EntityBatchingProducerNode( "articles", "batch", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-              "is_published='1' and to_article_type = ${articletype.newswire} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date asc, webdb_create asc", 6, 5, 0,
+              "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 ResourceBundleProducerNode("lang", "producer_${language.code}",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
                     "/producer/indymedia.nl/topic.template",
                     "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}${batch.current.identifier}.shtml"
@@ -114,7 +118,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
           new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
                   "", "code", 10, 0,
             new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
-              new ResourceBundleProducerNode("lang", "producer_${language.code}",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
                     "/producer/indymedia.nl/topicnavigation.template",
                     "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}navigation.inc"
@@ -136,6 +140,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupTopicsFactory Exception "+t.getMessage());
     }
   }
 
@@ -207,6 +212,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupStaticFactory Exception "+t.getMessage());
     }
   }
 
@@ -214,6 +220,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     super.setupFactories(aFactoriesMap);
 
     ProducerNode node = null;
+    EntityBatchingProducerNode batchingNode = null;
+    EntityEnumeratingProducerNode enumeratingNode = null;
 
     try {
       node =
@@ -234,11 +242,12 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
           );
+      aFactoriesMap.put("features", new NodedProducerFactory( node ) );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
 
-    aFactoriesMap.put("features", new NodedProducerFactory( node ) );
 
     try {
       node =
@@ -259,9 +268,70 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
           );
+      aFactoriesMap.put("featurestest", new NodedProducerFactory( node ) );
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
+    }
+
+    try {
+      batchingNode =
+          new EntityBatchingProducerNode( "comments", "batch", DatabaseComment.getInstance(), CommentAdapterDefinition.getInstance(),
+                "", "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 ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                  new GeneratingProducerNode(
+                      "/producer/indymedia.nl/commentsindex.template",
+                      "${config.storageRoot}/${language.code}/comments/comments${batch.current.identifier}.shtml"
+                  )
+                )
+              )
+            ),
+            new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+                    "", "code", 10, 0,
+              new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "",
+                new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                  new GeneratingProducerNode(
+                      "/producer/indymedia.nl/commentsindexnavigation.template",
+                      "${config.storageRoot}/${language.code}/comments/commentsnavigation.inc"
+                  )
+                )
+              )
+            )
+          );
+      batchingNode.addVerb("new", 3);
+      batchingNode.addVerb("all", -1);
+
+      aFactoriesMap.put("commentsindex", new NodedProducerFactory( batchingNode ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
+
+    try {
+      enumeratingNode =
+              new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+                  new GeneratingProducerNode(
+                      "/producer/indymedia.nl/static.template",
+                      "${config.storageRoot}/${language.code}/static/${content.edittitle}.shtml"
+                  )
+                );
+
+      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", "" );
+
+      aFactoriesMap.put("staticarticles", new NodedProducerFactory(
+          new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+            new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+              enumeratingNode
+            )
+          )
+      ));
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
     }
-    aFactoriesMap.put("featurestest", new NodedProducerFactory( node ) );
   }
 }