removed the CompositeProducerFactory

[mir.git] / source / mirlocal / euskalherria.indymedia.org / EHProducerLocalizer.java

diff --git a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
index 3424e87..8d36b16 100755 (executable)
--- a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
+++ b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
@@ -11,8 +11,9 @@ import mircoders.entity.adapter.*;
 
 public class EHProducerLocalizer extends MirBasicProducerLocalizer {
 
-  protected void setupContentFactory(CompositeProducerFactory aContentFactory) {
+  protected void setupContentFactory(CompositeProducerNode aProducerNode) {
     EntityEnumeratingProducerNode contentNode = null;
+    aProducerNode.clear();
 
     try {
       contentNode =
@@ -42,15 +43,14 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
     contentNode.addVerb( "all", "is_published='1'", "" );
     contentNode.addVerb( "new", "is_published='1' and is_produced='f'", "" );
 
-    aContentFactory.addFactory( new NodedProducerFactory( contentNode ) );
+    aProducerNode.addSubNode( contentNode );
 
   }
 
-  protected void setupStartPageFactory(CompositeProducerFactory aStartPageFactory) {
-    ProducerNode startPageNode = null;
-
+  protected void setupStartPageFactory(CompositeProducerNode aProducerNode) {
+    aProducerNode.clear();
     try {
-      startPageNode =
+      aProducerNode.addSubNode(
             new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
                     "is_published='1' and to_article_type = ${articletype.newswire}", "date desc, webdb_create desc", 40, 0,
               new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
@@ -73,31 +73,18 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
                   )
                 )
               )
-            );
+            )
+      );
     }
     catch (Throwable t) {
     }
-
-    aStartPageFactory.addFactory( new NodedProducerFactory( startPageNode ) );
-  }
-
-  protected void setupSynchronizationFactory(CompositeProducerFactory aSynchronizationFactory) {
-/*    if(MirGlobal.getConfigBooleanProperty("Rsync")){
-      aSynchronizationFactory.addFactory(
-        new ScriptCallProducerFactory(MirGlobal.getConfigProperty("Rsync.Script.Path")));
-    }
-    else {
-*/      NullProducerFactory nullFactory = new NullProducerFactory();
-      nullFactory.addVerb("run");
-      aSynchronizationFactory.addFactory(nullFactory);
-/*    }*/
   }
 
-  protected void setupStaticFactory(CompositeProducerFactory aStaticFactory) {
-    ProducerNode staticNode = null;
+  protected void setupStaticFactory(CompositeProducerNode aProducerNode) {
+    aProducerNode.clear();
 
     try {
-      staticNode =
+      aProducerNode.addSubNode(
           new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
                   "", "code", 10, 0,
             new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
@@ -108,18 +95,17 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
                 )
               )
             )
-          );
+          )
+      );
     }
     catch (Throwable t) {
     }
-
-    aStaticFactory.addFactory( new NodedProducerFactory( staticNode ) );
   }
 
-  protected void setupFactories(Map aFactoriesMap ) {
-    EntityBatchingProducerNode topicPageNode = null;
+  protected void setupTopicsFactory(CompositeProducerNode aProducerNode) {
+    aProducerNode.clear();
 
-    super.setupFactories(aFactoriesMap);
+    EntityBatchingProducerNode topicPageNode = null;
 
     try {
       topicPageNode =
@@ -151,8 +137,7 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
       topicPageNode.addVerb("all", -1);
       topicPageNode.addVerb("new", 3);
 
-      aFactoriesMap.put("topics",
-        new NodedProducerFactory(
+      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,
@@ -162,11 +147,14 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
           )
-        )
       );
     }
     catch (Throwable t) {
     }
 
   }
+
+  protected void setupFactories(Map aFactoriesMap ) {
+    super.setupFactories(aFactoriesMap);
+  }
 }