bugfixes in producer localizers

diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
index 7e478ec..d44f0d7 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")
@@ -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());
@@ -191,51 +145,6 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
             )
           )
       );
-
-// topic pages per city:
-      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}) and " +
-              "id in (select content_id from content_x_topic where topic_id = ${city.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", "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"
-                )
-              )
-            )
-          ),
-          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}/topicnavigation.template",
-                    "${config.storageRoot}/${city.filename}/${language.code}/${topic.filename}/${topic.filename}navigation.inc"
-                )
-              )
-            )
-          )
-        );
-      topicPageNode.addVerb("new", 3);
-      topicPageNode.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
-              )
-            )
-          )
-      );
     }
     catch (Throwable t) {
       logger.printError("BoliviaProducerLocalizer.setupTopicsFactory: Exception "+t.getMessage());

diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerToolLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerToolLocalizer.java
index 554e3df..d84adfe 100755 (executable)
--- a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerToolLocalizer.java
+++ b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerToolLocalizer.java
@@ -12,25 +12,4 @@ import mircoders.localizer.basic.*;
 import mircoders.global.*;
 
 public class BoliviaProducerToolLocalizer extends MirBasicProducerToolLocalizer {
-
-  public void initializeGenerationValueSet(Map aValueSet) {
-    super.initializeGenerationValueSet(aValueSet);
-
-    EntityList topicList=null;
-    EntityList cityList=null;
-
-
-    try {
-      ModuleTopics topicsModule = new ModuleTopics(DatabaseTopics.getInstance());
-
-      cityList = topicsModule.getByWhereClause("main_url='c'", "title", -1);
-      topicList = topicsModule.getByWhereClause("main_url<>'c'", "title", -1);
-    }
-    catch (Throwable t) {
-      throw new RuntimeException("initializeGenerationValueSet: Exception "+t.getMessage());
-    }
-
-    aValueSet.put("topics", topicList);
-    aValueSet.put("cities", cityList);
-  }
 }

diff --git a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
index c538056..7839fdf 100755 (executable)
--- a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
+++ b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
@@ -118,7 +118,7 @@ public class EHProducerLocalizer 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/euskalherria.indymedia.org/topic.template",
                     "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}${batch.current.identifier}.shtml"
@@ -129,7 +129,7 @@ public class EHProducerLocalizer 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/euskalherria.indymedia.org/topicnavigation.template",
                     "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}navigation.inc"