prelim euskalherria localizer added + misc. work on producer nodes

[mir.git] / source / mircoders / localizer / basic / MirBasicProducerLocalizer.java

diff --git a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
index 00c1f0e..97e80b2 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
@@ -24,19 +24,18 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
       new ContentProducerFactory(
       MirGlobal.getConfigProperty("Producer.Content.Template"),
       "bundles.admin",
-      MirGlobal.getConfigProperty("Producer.StorageRoot"),
-      ".shtml",
+      MirGlobal.getConfigProperty("Producer.StorageRoot") + "/${contentyear}/${contentmonth}/${contentid}.shtml",
       Integer.parseInt(MirGlobal.getConfigProperty("Producer.Content.Batchsize"))));
   }
 
   protected void setupStartPageFactory(CompositeProducerFactory aStartPageFactory) {
     aStartPageFactory.addFactory(
       new StartPageProducerFactory(
-      MirGlobal.getConfigProperty("Producer.StartPage.Template"),
-      "bundles.admin",
-      MirGlobal.getConfigProperty("Producer.StorageRoot") + "/index.shtml",
-      MirGlobal.getConfigIntegerProperty("Producer.StartPage.Items"),
-      MirGlobal.getConfigIntegerProperty("Producer.StartPage.Newswire")));
+          MirGlobal.getConfigProperty("Producer.StartPage.Template"),
+          "bundles.admin",
+          MirGlobal.getConfigProperty("Producer.StorageRoot") + "/index.shtml",
+          MirGlobal.getConfigIntegerProperty("Producer.StartPage.Items"),
+          MirGlobal.getConfigIntegerProperty("Producer.StartPage.Newswire")));
   }
 
   protected void setupSynchronizationFactory(CompositeProducerFactory aSynchronizationFactory) {
@@ -51,6 +50,14 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
     }
   }
 
+  protected void setupStaticFactory(CompositeProducerFactory aStaticFactory) {
+    aStaticFactory.addFactory(
+      new StaticProducerFactory(
+          MirGlobal.getConfigProperty("Producer.Navigation.Template"),
+          "bundles.admin",
+          MirGlobal.getConfigProperty("Producer.StorageRoot") + "/navigation.inc"));
+  }
+
   protected void setupFactories(Map aFactoriesMap ) {
 
     CompositeProducerFactory factory;
@@ -67,11 +74,14 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
     setupSynchronizationFactory(factory);
     aFactoriesMap.put("synchronization", factory);
 
-    aFactoriesMap.put("oldstartpage", new OldProducerAdapterFactory(new ProducerStartPage()));
+    factory=new CompositeProducerFactory();
+    setupStaticFactory(factory);
+    aFactoriesMap.put("static", factory);
+
     aFactoriesMap.put("images", new OldProducerAdapterFactory(new ProducerImages()));
-    aFactoriesMap.put("navigation", new OldProducerAdapterFactory(new ProducerNavigation()));
+/*    aFactoriesMap.put("navigationold", new OldProducerAdapterFactory(new ProducerNavigation()));
     aFactoriesMap.put("openposting", new OldProducerAdapterFactory(new ProducerOpenPosting()));
     aFactoriesMap.put("topics", new OldProducerAdapterFactory(new ProducerTopics()));
-
+*/
   };
 }