first attempt at a rewrite of the media producer + some bugfixes here and there

[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 3d3774d..3031c9d 100755 (executable)
--- a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
+++ b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
@@ -19,18 +19,20 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
       contentNode =
           new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
             new CompositeProducerNode( new ProducerNode[] {
-              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 FileDateSettingProducerNode(
-                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
-                          "content.date.date"
-                      )
-                    } )
+              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/article.template",
+                            "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
+                        ),
+                        new FileDateSettingProducerNode(
+                            "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
+                            "content.webdb_create.raw"
+                        )
+                      } )
+                  )
                 )
               ),
               new ContentMarkingProducerNode( "content")
@@ -92,7 +94,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
                         new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                           new GeneratingProducerNode(
                               "/producer/bolivia.indymedia.org/startpage.template",
-                              "${config.storageRoot}/${language.code}/${city.filename}/index.shtml"
+                              "${config.storageRoot}/${city.filename}/${language.code}/index.shtml"
                           )
                         )
                       )