bugfixes / bolivian modifications

diff --git a/source/mircoders/entity/adapter/ContentAdapterDefinition.java b/source/mircoders/entity/adapter/ContentAdapterDefinition.java
index ee29929..7460aed 100755 (executable)
--- a/source/mircoders/entity/adapter/ContentAdapterDefinition.java
+++ b/source/mircoders/entity/adapter/ContentAdapterDefinition.java
@@ -76,7 +76,7 @@ public class ContentAdapterDefinition extends EntityAdapterDefinition {
         return getRelation(
                     DatabaseComment.getInstance(),
                     "to_media="+anEntityAdapter.get("id"),
-                    "title",
+                    "webdb_create",
                     CommentAdapterDefinition.getInstance());
       }
       catch (Throwable t) {

diff --git a/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java b/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
index d48a7e9..f5647d7 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
@@ -13,10 +13,11 @@ public class MirBasicOpenPostingLocalizer implements MirOpenPostingLocalizer {
   public void afterContentPosting() {
     MirGlobal.producerEngine().addJob("content", "new");
     MirGlobal.producerEngine().addJob("media", "new");
-    MirGlobal.producerEngine().addJob("openposting", "new");
-    MirGlobal.producerEngine().addJob("topics", "new");
     MirGlobal.producerEngine().addJob("startpage", "(default)");
+    MirGlobal.producerEngine().addJob("synchronization", "run");
 
+    MirGlobal.producerEngine().addJob("openposting", "new");
+    MirGlobal.producerEngine().addJob("topics", "new");
     MirGlobal.producerEngine().addJob("synchronization", "run");
   }
 

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index 73decca..e967f89 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -147,8 +147,11 @@ public class ServletModuleOpenIndy extends ServletModule
         if(id==null){
           deliver(req, res, new SimpleHash(), commentFormDupeTemplate);
         }
+        else {
+          DatabaseContent.getInstance().setUnproduced("id="+aid);
+          MirGlobal.localizer().openPostings().afterCommentPosting();
 
-        MirGlobal.localizer().openPostings().afterCommentPosting();
+        }
 
         // redirecting to url
         // should implement back to article

diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaOpenPostingLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaOpenPostingLocalizer.java
index f546193..12a7f96 100755 (executable)
--- a/source/mirlocal/bolivia.indymedia.org/BoliviaOpenPostingLocalizer.java
+++ b/source/mirlocal/bolivia.indymedia.org/BoliviaOpenPostingLocalizer.java
@@ -7,10 +7,18 @@ import mircoders.localizer.basic.*;
 public class BoliviaOpenPostingLocalizer extends MirBasicOpenPostingLocalizer {
 
   public void afterContentPosting() {
-    super.afterContentPosting();
+    MirGlobal.producerEngine().addJob("content", "new");
+    MirGlobal.producerEngine().addJob("media", "new");
+    MirGlobal.producerEngine().addJob("startpage", "(default)");
+    MirGlobal.producerEngine().addJob("synchronization", "run");
+
+    MirGlobal.producerEngine().addJob("newswirearchive", "new");
+    MirGlobal.producerEngine().addJob("topics", "new");
+    MirGlobal.producerEngine().addJob("synchronization", "run");
   }
 
   public void afterCommentPosting() {
-    super.afterCommentPosting();
+    MirGlobal.producerEngine().addJob("content", "new");
+    MirGlobal.producerEngine().addJob("synchronization", "run");
   }
 }

diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
index d44f0d7..eceec0d 100755 (executable)
--- a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
+++ b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
@@ -55,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(), "", "",
@@ -104,13 +104,13 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
   protected void setupTopicsFactory(CompositeProducerNode aProducerNode) {
     aProducerNode.clear();
 
-    EntityBatchingProducerNode topicPageNode = null;
+    EntityBatchingProducerNode newswireArchiveNode = null;
 
     try {
 // topic pages:
-      topicPageNode =
+      newswireArchiveNode =
         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(), "", "",
@@ -134,14 +134,14 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
             )
           )
         );
-      topicPageNode.addVerb("new", 3);
-      topicPageNode.addVerb("all", -1);
+      newswireArchiveNode.addVerb("new", 3);
+      newswireArchiveNode.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
+              newswireArchiveNode
             )
           )
       );
@@ -152,6 +152,45 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
   }
 
   protected void setupFactories(Map aFactoriesMap ) {
-    super.setupFactories(aFactoriesMap);
+    EntityBatchingProducerNode newswireArchiveNode = null;
+
+    try {
+      super.setupFactories(aFactoriesMap);
+
+// newswire archive:
+      newswireArchiveNode =
+        new EntityBatchingProducerNode( "articles", "batch", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+              "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/newswire.template",
+                    "${config.storageRoot}/${language.code}/newswire/newswire${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/newswirenavigation.template",
+                    "${config.storageRoot}/${language.code}/newswire/newswirenavigation.inc"
+                )
+              )
+            )
+          )
+        );
+      newswireArchiveNode.addVerb("new", 3);
+      newswireArchiveNode.addVerb("all", -1);
+
+      aFactoriesMap.put( "newswirearchive", new NodedProducerFactory( newswireArchiveNode ) );
+    }
+    catch (Throwable t) {
+      logger.printError("BoliviaProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
   }
 }