newswire archive / topic startpages for bolivia

[mir.git] / source / mirlocal / bolivia.indymedia.org / BoliviaProducerLocalizer.java

diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
index 7e478ec..02cf672 100755 (executable)
--- a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
+++ b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
@@ -19,17 +19,15 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
       contentNode =
           new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
             new CompositeProducerNode( new ProducerNode[] {
-              new EntityEnumeratingProducerNode( "city", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "main_url='c' and exists(select * from content_x_topic where content_id=${content.id} and topic_id=id)", "",
-                new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
-                  new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
-                      new CompositeProducerNode( new ProducerNode[] {
-                        new GeneratingProducerNode(
-                            "/producer/bolivia.indymedia.org/${city.filename}/article.template",
-                            "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
-                        ),
-                        new ContentMarkingProducerNode( "content" )
-                      } )
-                  )
+              new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+                new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                    new CompositeProducerNode( new ProducerNode[] {
+                      new GeneratingProducerNode(
+                          "/producer/bolivia.indymedia.org/article.template",
+                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
+                      ),
+                      new ContentMarkingProducerNode( "content" )
+                    } )
                 )
               ),
               new ContentMarkingProducerNode( "content")
@@ -57,7 +55,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
                 new EntityListProducerNode("startspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
                           "is_published='1' and to_article_type = ${articletype.startspecial}", "date desc, webdb_create desc", 1, 0,
                   new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                          "is_published='1' and to_article_type = ${articletype.feature} and id in (select max(content_id) from content_x_topic, topic t where topic_id=t.id and t.archiv_url='c' group by t.id)", "date desc, webdb_create desc", 10, 0,
+                          "is_published='1' and to_article_type = ${articletype.feature}", "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(), "", "",
@@ -74,35 +72,6 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
       );
-
-      aProducerNode.addSubNode(
-          new EntityEnumeratingProducerNode( "city", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "main_url='c'", "",
-            new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                    "is_published='1' and to_article_type = ${articletype.newswire} and exists(select * from content_x_topic where content_id=id and topic_id=${city.id})", "date desc, webdb_create desc", 40, 0,
-              new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                            "", "code", 10, 0,
-                new EntityListProducerNode("startspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                          "is_published='1' and to_article_type = ${articletype.startspecial} and "+
-                          "exists(select * from content_x_topic where content_id=id and topic_id=${city.id})", "date desc, webdb_create desc", 1, 0,
-                  new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                          "is_published='1' and to_article_type = ${articletype.feature} and exists(select * from content_x_topic where content_id=id and topic_id=${city.id})", "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(), "", "",
-                        new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
-                          new GeneratingProducerNode(
-                              "/producer/bolivia.indymedia.org/${city.filename}/startpage.template",
-                              "${config.storageRoot}/${city.filename}/${language.code}/index.shtml"
-                          )
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-      );
     }
     catch (Throwable t) {
       logger.printError("BoliviaProducerLocalizer.setupStartPageFactory: Exception "+t.getMessage());
@@ -126,21 +95,6 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
             )
           )
       );
-      aProducerNode.addSubNode(
-        new EntityEnumeratingProducerNode( "city", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "main_url='c'", "",
-          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
-                  "", "code", 10, 0,
-            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
-              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
-                new GeneratingProducerNode(
-                    "/producer/bolivia.indymedia.org/${city.filename}/navigation.template",
-                    "${config.storageRoot}/${city.filename}/${language.code}/navigation.inc"
-                )
-              )
-            )
-          )
-        )
-      );
     }
     catch (Throwable t) {
       logger.printError("BoliviaProducerLocalizer.setupStaticFactory: Exception "+t.getMessage());
@@ -150,13 +104,14 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
   protected void setupTopicsFactory(CompositeProducerNode aProducerNode) {
     aProducerNode.clear();
 
-    EntityBatchingProducerNode topicPageNode = null;
+    EntityBatchingProducerNode topicArchiveNode = null;
+    ProducerNode topicStartpageNode = null;
 
     try {
 // topic pages:
-      topicPageNode =
+      topicArchiveNode =
         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 = ${articletype.newswire} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date asc, webdb_create asc", 20, 10, 0,
           new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
                   "", "code", 10, 0,
             new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
@@ -180,31 +135,67 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
             )
           )
         );
-      topicPageNode.addVerb("new", 3);
-      topicPageNode.addVerb("all", -1);
+      topicArchiveNode.addVerb("new", 3);
+      topicArchiveNode.addVerb("all", -1);
 
       aProducerNode.addSubNode(
-          new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "((main_url is null) or main_url<>'c')", "",
+          new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "", "",
             new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
                   "is_published='1' and to_article_type = ${articletype.topicspecial} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date, webdb_create", 1, 0,
-              topicPageNode
+              topicArchiveNode
             )
           )
       );
 
-// topic pages per city:
-      topicPageNode =
+      aProducerNode.addSubNode(
+        new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "", "",
+          new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+                "is_published='1' and to_article_type = ${articletype.topicspecial} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date, webdb_create", 1, 0,
+            new EntityListProducerNode("newswire", 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 desc, webdb_create desc", 40, 0,
+              new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+                      "is_published='1' and to_article_type = ${articletype.feature} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date desc, webdb_create desc", 10, 0,
+                  new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+                                "", "code", 10, 0,
+                      new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+                        new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                          new GeneratingProducerNode(
+                              "/producer/bolivia.indymedia.org/topicstartpage.template",
+                              "${config.storageRoot}/${language.code}/${topic.filename}/index.shtml"
+                          )
+                        )
+                      )
+
+                  )
+              )
+            )
+          )
+        )
+      );
+
+    }
+    catch (Throwable t) {
+      logger.printError("BoliviaProducerLocalizer.setupTopicsFactory: Exception "+t.getMessage());
+    }
+  }
+
+  protected void setupFactories(Map aFactoriesMap ) {
+    EntityBatchingProducerNode archiveNode = null;
+
+    try {
+      super.setupFactories(aFactoriesMap);
+
+// newswire archive:
+      archiveNode =
         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}) and " +
-              "id in (select content_id from content_x_topic where topic_id = ${city.id})", "date asc, webdb_create asc", 6, 5, 0,
+              "is_published='1' and to_article_type = ${articletype.newswire}", "date asc, webdb_create asc", 20, 10, 0,
           new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
                   "", "code", 10, 0,
             new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
               new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
-                    "/producer/bolivia.indymedia.org/${city.filename}/topic.template",
-                    "${config.storageRoot}/${city.filename}/${language.code}/${topic.filename}/${topic.filename}${batch.current.identifier}.shtml"
+                    "/producer/bolivia.indymedia.org/newswire.template",
+                    "${config.storageRoot}/${language.code}/newswire/newswire${batch.current.identifier}.shtml"
                 )
               )
             )
@@ -214,35 +205,53 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
             new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
               new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
-                    "/producer/bolivia.indymedia.org/${city.filename}/topicnavigation.template",
-                    "${config.storageRoot}/${city.filename}/${language.code}/${topic.filename}/${topic.filename}navigation.inc"
+                    "/producer/bolivia.indymedia.org/newswirenavigation.template",
+                    "${config.storageRoot}/${language.code}/newswire/newswirenavigation.inc"
                 )
               )
             )
           )
         );
-      topicPageNode.addVerb("new", 3);
-      topicPageNode.addVerb("all", -1);
+      archiveNode.addVerb("new", 3);
+      archiveNode.addVerb("all", -1);
 
-      aProducerNode.addSubNode(
-          new EntityEnumeratingProducerNode( "city", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "main_url='c'", "",
-            new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "((main_url is null) or main_url<>'c')", "",
-              new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                    "is_published='1' and to_article_type = ${articletype.topicspecial} and "+
-                    "id in (select content_id from content_x_topic where topic_id = ${topic.id}) and "+
-                    "id in (select content_id from content_x_topic where topic_id = ${city.id})", "date, webdb_create", 1, 0,
-                topicPageNode
+      aFactoriesMap.put( "newswirearchive", new NodedProducerFactory( archiveNode ) );
+
+// feature archive:
+      archiveNode =
+        new EntityBatchingProducerNode( "articles", "batch", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+              "is_published='1' and to_article_type in (${articletype.feature}, ${articletype.startspecial})", "date asc, webdb_create asc", 20, 10, 0,
+          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+                  "", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/bolivia.indymedia.org/feature.template",
+                    "${config.storageRoot}/${language.code}/feature/feature${batch.current.identifier}.shtml"
+                )
+              )
+            )
+          ),
+          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+                  "", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/bolivia.indymedia.org/featurenavigation.template",
+                    "${config.storageRoot}/${language.code}/feature/featurenavigation.inc"
+                )
               )
             )
           )
-      );
+        );
+      archiveNode.addVerb("new", 3);
+      archiveNode.addVerb("all", -1);
+
+      aFactoriesMap.put( "featurearchive", new NodedProducerFactory( archiveNode ) );
+
     }
     catch (Throwable t) {
-      logger.printError("BoliviaProducerLocalizer.setupTopicsFactory: Exception "+t.getMessage());
+      logger.printError("BoliviaProducerLocalizer.setupFactories: Exception "+t.getMessage());
     }
   }
-
-  protected void setupFactories(Map aFactoriesMap ) {
-    super.setupFactories(aFactoriesMap);
-  }
 }