X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleProducer.java;h=c5b02dc3a712ce7fad611bdb28c3f6bf5e187005;hb=e44404fac09c8da04b5ef7874160cb91f8fc98a9;hp=fab7cbdf9025f83aa6c7567ec62497f716c6ea87;hpb=0c61d449cb5d88e9284f936784f4c0db18b3f559;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleProducer.java b/source/mircoders/servlet/ServletModuleProducer.java
index fab7cbdf..c5b02dc3 100755
--- a/source/mircoders/servlet/ServletModuleProducer.java
+++ b/source/mircoders/servlet/ServletModuleProducer.java
@@ -29,13 +29,14 @@
  */
 package mircoders.servlet;
 
+import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Vector;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,33 +46,17 @@ import mir.log.LoggerWrapper;
 import mir.producer.ProducerFactory;
 import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleFailure;
-import mir.util.ResourceBundleGeneratorFunction;
+import mir.util.HTTPRequestParser;
 import mircoders.global.MirGlobal;
 
-import org.apache.struts.util.MessageResources;
-
 public class ServletModuleProducer extends ServletModule
 {
   private static ServletModuleProducer instance = new ServletModuleProducer();
   public static ServletModule getInstance() { return instance; }
 
   Object comments;
-  Map generationData;
-  Generator generator;
   int totalNrComments;
-  List producersData;
 
-  void generateResponse(String aGeneratorIdentifier, PrintWriter aWriter, Map aResponseData, Locale aLocale) {
-    try {
-      generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGeneratorIdentifier);
-      MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(aResponseData);
-      aResponseData.put( "lang", new ResourceBundleGeneratorFunction( aLocale, MessageResources.getMessageResources("bundles.admin")));
-      generator.generate(aWriter, aResponseData, logger);
-    }
-    catch (Throwable t) {
-      throw new ServletModuleFailure(t);
-    }
-  }
 
   private ServletModuleProducer() {
     super();
@@ -79,41 +64,30 @@ public class ServletModuleProducer extends ServletModule
     defaultAction="showProducerQueueStatus";
   }
 
-  public void showMessage(PrintWriter aWriter, Locale aLocale, String aMessage, String anArgument1, String anArgument2) {
-    Map responseData;
-    try {
-      responseData = new HashMap();
-      responseData.put("message", aMessage);
-      responseData.put("argument1", anArgument1);
-      responseData.put("argument2", anArgument2);
-      generateResponse("infomessage.template", aWriter, responseData, aLocale);
-    }
-    catch (Throwable t) {
-      throw new ServletModuleFailure(t);
-    }
-  }
-
-
+  /**
+   *
+   * @param aRequest
+   * @param aResponse
+   */
   public void showProducerQueueStatus(HttpServletRequest aRequest, HttpServletResponse aResponse) {
-    Object comments;
     Map generationData;
     Generator generator;
-    int totalNrComments;
     List producersData;
 
     try {
+      // TODO: use ServletHelper
       generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator("producerqueue.template");
 
       generationData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)});
       generationData.put( "thisurl", "module=Producer&do=showProducerQueueStatus");
 
-      producersData = new Vector();
-      Iterator i = MirGlobal.localizer().producers().factories().iterator();
+      producersData = new ArrayList();
+      Iterator i = MirGlobal.getProducerEngine().getFactories().iterator();
       while (i.hasNext()) {
         ProducerFactory factory = (ProducerFactory) i.next();
 
-        List producerVerbs = new Vector();
-        Iterator j = factory.verbs();
+        List producerVerbs = new ArrayList();
+        Iterator j = factory.verbs().iterator();
         while (j.hasNext()) {
           Map verbData = new HashMap();
           ProducerFactory.ProducerVerb verb = (ProducerFactory.ProducerVerb) j.next();
@@ -131,7 +105,7 @@ public class ServletModuleProducer extends ServletModule
       }
       generationData.put("producers", producersData);
 
-      generationData.put("queue", MirGlobal.producerEngine().getQueueStatus());
+      generationData.put("queue", MirGlobal.getProducerEngine().getQueueStatus());
       generator.generate(aResponse.getWriter(), generationData, logger);
     }
     catch (Throwable t) {
@@ -139,46 +113,60 @@ public class ServletModuleProducer extends ServletModule
     }
   }
 
-  public void produce(HttpServletRequest req, HttpServletResponse res) {
-    /*
-     * This method will only be called by external scripts (e.g. from cron jobs).
-     * The output therefore is very simple.
-     *
-     */
-
+  /**
+   * This method will only be called by external scripts (e.g. from cron jobs).
+   * The output therefore is very simple.
+   */
+  public void produce(HttpServletRequest aRequest, HttpServletResponse aResponse) {
     try {
-      PrintWriter out = res.getWriter();
+      PrintWriter out = aResponse.getWriter();
 
-      if (req.getParameter("producer")!=null) {
-        String producerParam = req.getParameter("producer");
-        String verbParam = req.getParameter("verb");
+      if (aRequest.getParameter("producer")!=null) {
+        String producerParam = aRequest.getParameter("producer");
+        String verbParam = aRequest.getParameter("verb");
 
-        MirGlobal.producerEngine().addJob(producerParam, verbParam);
-        out.println("job added");
+        try {
+          MirGlobal.getProducerEngine().addJob(producerParam, verbParam);
+          out.println("job added");
+        }
+        catch (Throwable t) {
+          out.println("Can't add job: " + t.getMessage());
+        }
       }
     }
-    catch (Throwable t) {
-      throw new ServletModuleFailure(t);
+    catch (IOException e) {
+      throw new ServletModuleFailure(e);
     }
   }
 
-  public void produceAllNew(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+  /**
+   * Servlet action to propduce a preconfigured combination of producers
+   * (e.g. "generate all new")
+   */
+  public void producerecipe(HttpServletRequest aRequest, HttpServletResponse aResponse) {
     try {
-      MirGlobal.localizer().producers().produceAllNew();
-      showMessage(aResponse.getWriter(), getLocale(aRequest), "produceAllNewAddedToQueue", "", "");
+      String recipe = aRequest.getParameter("recipe");
+      MirGlobal.localizer().producers().produceRecipe(recipe);
+
+      ServletHelper.generateInfoMessage(aRequest, aResponse,
+          new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)},
+           "bundles/admin", "etc/bundles/adminlocal", "recipeAddedToQueue", recipe, "");
     }
     catch (Throwable t) {
       throw new ServletModuleFailure(t);
     }
   }
 
+  /**
+   * Servlet action to enqueue a producer job
+   */
   public void enqueue(HttpServletRequest aRequest, HttpServletResponse aResponse) {
     try {
       if (aRequest.getParameter("producer")!=null) {
         String producerParam = aRequest.getParameter("producer");
         String verbParam = aRequest.getParameter("verb");
 
-        MirGlobal.producerEngine().addJob(producerParam, verbParam);
+        MirGlobal.getProducerEngine().addJob(producerParam, verbParam);
 
         ServletHelper.redirect(aResponse, "Producer", "showProducerQueueStatus");
       }
@@ -188,7 +176,22 @@ public class ServletModuleProducer extends ServletModule
     }
   }
 
-  public void cancelAbortJob(HttpServletRequest aRequest, HttpServletResponse aResponse)  {
-    // ML: to be coded
+  public void cancel(HttpServletRequest aRequest, HttpServletResponse aResponse)  {
+    try {
+      HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+
+      if (requestParser.getParameter("cancelall") != null) {
+        MirGlobal.getProducerEngine().cancelAllJobs();
+      }
+      else {
+        List jobs = new ArrayList(requestParser.getParameterList("jobid"));
+
+        MirGlobal.getProducerEngine().cancelJobs(jobs);
+      }
+      ServletHelper.redirect(aResponse, "Producer", "showProducerQueueStatus");
+    }
+    catch (Throwable t) {
+      throw new ServletModuleFailure(t);
+    }
   }
 }