introduced AdapterEntityModel

[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 7839fdf..f4e53e8 100755 (executable)
--- a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
+++ b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
@@ -8,7 +8,6 @@ import mircoders.localizer.*;
 import mircoders.localizer.basic.*;
 import mircoders.producer.*;
 import mircoders.storage.*;
-import mircoders.entity.adapter.*;
 
 public class EHProducerLocalizer extends MirBasicProducerLocalizer {
 
@@ -18,9 +17,9 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
 
     try {
       contentNode =
-          new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+          new EntityEnumeratingProducerNode( "content", model, "content",
             new CompositeProducerNode( new ProducerNode[] {
-              new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new EntityEnumeratingProducerNode( "language", model, "language", "", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                     new CompositeProducerNode( new ProducerNode[] {
                       new GeneratingProducerNode(
@@ -53,17 +52,17 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
     aProducerNode.clear();
     try {
       aProducerNode.addSubNode(
-            new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+            new EntityListProducerNode("newswire", model, "content",
                     "is_published='1' and to_article_type = ${articletype.newswire}", "date desc, webdb_create desc", 40, 0,
-              new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+              new EntityListProducerNode("languages", model, "language",
                             "", "code", 10, 0,
-                new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+                new EntityEnumeratingProducerNode( "language", model, "language", "", "",
                   new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
-                    new EntityListProducerNode("startspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+                    new EntityListProducerNode("startspecial", model, "content",
                               "is_published='1' and to_article_type = ${articletype.startspecial}", "date desc, webdb_create desc", 1, 0,
-                      new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+                      new EntityListProducerNode("features", model, "content",
                               "is_published='1' and to_article_type = ${articletype.feature}", "date desc, webdb_create desc", 10, 0,
-                        new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
+                        new EntityListProducerNode("breaking", model, "breakingNews",
                                   "", "webdb_create desc", 5, 0,
                           new GeneratingProducerNode(
                               "/producer/euskalherria.indymedia.org/startpage.template",
@@ -88,9 +87,9 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
 
     try {
       aProducerNode.addSubNode(
-          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+          new EntityListProducerNode("languages", model, "language",
                   "", "code", 10, 0,
-            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+            new EntityEnumeratingProducerNode( "language", model, "language", "", "",
               new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
                     "/producer/euskalherria.indymedia.org/navigation.template",
@@ -113,11 +112,11 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
 
     try {
       topicPageNode =
-        new EntityBatchingProducerNode( "articles", "batch", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+        new EntityBatchingProducerNode( "articles", "batch", model, "content",
               "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, 5, 0,
-          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+          new EntityListProducerNode("languages", model, "language",
                   "", "code", 10, 0,
-            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+            new EntityEnumeratingProducerNode( "language", model, "language", "", "",
               new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
                     "/producer/euskalherria.indymedia.org/topic.template",
@@ -126,9 +125,9 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
           ),
-          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+          new EntityListProducerNode("languages", model, "language",
                   "", "code", 10, 0,
-            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+            new EntityEnumeratingProducerNode( "language", model, "language", "", "",
               new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                 new GeneratingProducerNode(
                     "/producer/euskalherria.indymedia.org/topicnavigation.template",
@@ -142,10 +141,10 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
       topicPageNode.addVerb("new", 3);
 
       aProducerNode.addSubNode(
-          new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "", "",
-            new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+          new EntityEnumeratingProducerNode( "topic", model, "topic","", "",
+            new EntityListProducerNode("topicspecial", model, "content",
                   "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("topicfeatures", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+              new EntityListProducerNode("topicfeatures", model, "content",
                     "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, webdb_create", 10, 0,
                 topicPageNode
               )