some indy.nl related updates

diff --git a/source/Mir.java b/source/Mir.java
index c70f42a..dd8f373 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -75,6 +75,10 @@ public class Mir extends AbstractServlet {
         /** @todo for cleanup and readability this should be moved to
          *  method loginIfNecessary() */
 
+        if (moduleName!=null && moduleName.equals("direct")) {
+          //...
+        }
+
         // Authentifizierung
         if (moduleName != null && moduleName.equals("login")) {
             String user = req.getParameter("login");

diff --git a/source/mir/producer/EntityBatchingProducerNode.java b/source/mir/producer/EntityBatchingProducerNode.java
index a57a751..19df0f1 100755 (executable)
--- a/source/mir/producer/EntityBatchingProducerNode.java
+++ b/source/mir/producer/EntityBatchingProducerNode.java
@@ -126,6 +126,7 @@ public class EntityBatchingProducerNode implements ProducerNode {
       batchData.put("all", batchesData);
       batchData.put("first", batchesData.get(0));
       batchData.put("last", batchesData.get(batchesData.size()-1));
+      batchData.put("count", Integer.toString(batchesData.size()));
 
       if (batchListSubNode!=null) {
         batchListSubNode.produce(aValueMap, aVerb, aLogger);

diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java
index ddc4d7e..7f5cb12 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleContent.java
+++ b/source/mircoders/servlet/ServletModuleContent.java
@@ -188,8 +188,12 @@ public class ServletModuleContent extends ServletModule
         withValues.put("is_published","0");
       if (!withValues.containsKey("is_html"))
         withValues.put("is_html","0");
-      if (withValues.get("creator").toString().equals(""))
-        withValues.put("creator","Anonym");
+
+//      ML: this is not multi-language friendly and this can be done in a template
+//      if (withValues.get("creator").toString().equals(""))
+//        withValues.put("creator","Anonym");
+
+
       String id = mainModule.add(withValues);
       DatabaseContentToTopics.getInstance().setTopics(id,req.getParameterValues("to_topic"));
       //theLog.printDebugInfo(":: content :: inserted");
@@ -339,8 +343,11 @@ public class ServletModuleContent extends ServletModule
         withValues.put("is_published","0");
       if (!withValues.containsKey("is_html"))
         withValues.put("is_html","0");
-      if (withValues.get("creator").toString().equals(""))
-        withValues.put("creator","Anonym");
+
+//      ML: this is not multi-language friendly and this can be done in a template
+//      if (withValues.get("creator").toString().equals(""))
+//        withValues.put("creator","Anonym");
+
       //theLog.printDebugInfo("updating. ");
       String id = mainModule.set(withValues);
       DatabaseContentToTopics.getInstance().setTopics(req.getParameter("id"),topic_id);

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index e967f89..1c7ed36 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -286,10 +286,12 @@ public class ServletModuleOpenIndy extends ServletModule
       // if op direct article-type == newswire
       if (directOp.equals("yes")) withValues.put("to_article_type","1");
 
-      // owner is openposting user
       withValues.put("to_publisher","1");
-      if (withValues.get("creator").toString().equals(""))
-        withValues.put("creator","Anonym");
+
+      // owner is openposting user
+//      ML: this is not multi-language friendly and this can be done in a template
+//      if (withValues.get("creator").toString().equals(""))
+//        withValues.put("creator","Anonym");
 
       // inserting  content into database
       String cid = contentModule.add(withValues);

diff --git a/source/mirlocal/indymedia.nl/IndyNLLocalizer.java b/source/mirlocal/indymedia.nl/IndyNLLocalizer.java
index 464e4ed..56286b8 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLLocalizer.java
@@ -15,7 +15,7 @@ public class IndyNLLocalizer extends MirBasicLocalizer {
   }
 
   public MirProducerToolLocalizer producerTool() {
-    return new MirBasicProducerToolLocalizer();
+    return new IndyNLProducerAssistantLocalizer();
   }
 
 }
\ No newline at end of file

diff --git a/source/mirlocal/indymedia.nl/IndyNLProducerAssistantLocalizer.java b/source/mirlocal/indymedia.nl/IndyNLProducerAssistantLocalizer.java
new file mode 100755 (executable)
index 0000000..4812af5
--- /dev/null
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerAssistantLocalizer.java
@@ -0,0 +1,15 @@
+package mircoders.localizer.basic;
+
+import java.util.*;
+import mircoders.localizer.basic.*;
+
+public class IndyNLProducerAssistantLocalizer extends MirBasicProducerToolLocalizer {
+  public void initializeGenerationValueSet(Map aValueSet) {
+    super.initializeGenerationValueSet(aValueSet);
+
+    Map articleTypeMap = (Map) aValueSet.get("articletype");
+    articleTypeMap.put("static", "5");
+    articleTypeMap.put("promotednewswire", "6");
+    articleTypeMap.put("trashed", "7");
+  };
+}

diff --git a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
index 80f6d0f..5ce5355 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
@@ -43,8 +43,8 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       logger.printError("IndyNLProducerLocalizer.setupContentFactory: Exception "+t.getMessage());
     }
 
-    contentNode.addVerb( "all", "is_published='1'", "" );
-    contentNode.addVerb( "new", "is_published='1' and is_produced='f'", "" );
+    contentNode.addVerb( "all", "is_published='1' and article_type<>${articletype.trashed} and article_type<>${articletype.static}", "" );
+    contentNode.addVerb( "new", "is_published='1' and is_produced='f' and article_type<>${articletype.trashed} and article_type<>${articletype.static}", "" );
 
     aProducerNode.addSubNode( contentNode );
   }
@@ -53,7 +53,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       aProducerNode.addSubNode(
             new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                    "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 40, 0,
+                    "is_published='1' and to_article_type in (${articletype.newswire, articletype.promotednewswire})", "date desc, webdb_create desc", 40, 0,
               new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
                             "", "code", 10, 0,
                     new CompositeProducerNode( new ProducerNode[] {
@@ -66,7 +66,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                           )
                         ),
                         new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
-                                "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
+                                "is_published='1' and to_article_type in ( ${articletype.feature}, ${articletype.promotednewswire})", "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(), "code='nl'", "",
@@ -103,7 +103,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     try {
       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})", "date asc, webdb_create asc", 6, 5, 0,
+              "is_published='1' and to_article_type in (${articletype.newswire, articletype.promotednewswire}) and id in (select content_id from content_x_topic where topic_id = ${topic.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(), "", "",
@@ -221,6 +221,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
 
     ProducerNode node = null;
     EntityBatchingProducerNode batchingNode = null;
+    EntityEnumeratingProducerNode enumeratingNode = null;
 
     try {
       node =
@@ -241,12 +242,12 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
           );
+      aFactoriesMap.put("features", new NodedProducerFactory( node ) );
     }
     catch (Throwable t) {
       logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
 
-    aFactoriesMap.put("features", new NodedProducerFactory( node ) );
 
     try {
       node =
@@ -267,12 +268,12 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
           );
+      aFactoriesMap.put("featurestest", new NodedProducerFactory( node ) );
     }
     catch (Throwable t) {
       logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
 
-    aFactoriesMap.put("featurestest", new NodedProducerFactory( node ) );
     try {
       batchingNode =
           new EntityBatchingProducerNode( "comments", "batch", DatabaseComment.getInstance(), CommentAdapterDefinition.getInstance(),
@@ -309,5 +310,28 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
     }
 
+    try {
+      enumeratingNode =
+              new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+                  new GeneratingProducerNode(
+                      "/producer/indymedia.nl/static.template",
+                      "${config.storageRoot}/${language.code}/static/${content.edittitle}.shtml"
+                  )
+                );
+
+      enumeratingNode.addVerb( "all", "is_published='1' and to_article_type=${articletype.static} and to_language=${language.id} and edittitle<>'' and not edittitle is null", "" );
+      enumeratingNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type=${articletype.static} and to_language=${language.id} and edittitle<>'' and not edittitle is null", "" );
+
+      aFactoriesMap.put("staticarticles", new NodedProducerFactory(
+          new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+            new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+              enumeratingNode
+            )
+          )
+      ));
+    }
+    catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories: Exception "+t.getMessage());
+    }
   }
 }