producer topic debug

[mir.git] / source / mircoders / producer / ProducerContent.java

diff --git a/source/mircoders/producer/ProducerContent.java b/source/mircoders/producer/ProducerContent.java
index c430f21..0e3953f 100755 (executable)
--- a/source/mircoders/producer/ProducerContent.java
+++ b/source/mircoders/producer/ProducerContent.java
@@ -17,18 +17,27 @@ import mircoders.storage.*;
 
 public class ProducerContent extends Producer {
 
+  private String      contentTemplate = MirConfig.getProp("Producer.Content.Template");
+
   public static void main(String argv[]){
     /**
      * Why are we reloading the config here?
      * Can someone please explain this?
      * Hope I didn't break anything
      * -mh. <heckmann@hbe.ca>
+     *
+     * This is the entry point for standalone production. The code
+     * is then running in a new virtual machine, e.g. when called
+     * from cron-script. In that case the config has to be initliased.
+     * Don't know if is ok that way //rk
+     *
      */
     //Configuration.initConfig("config");
     System.out.println(MirConfig.getProp("Producer.DocRoot"));
 
     try {
-      new ProducerContent().handle(new PrintWriter(System.out), null, false,false);
+      new ProducerContent().handle(new PrintWriter(System.out), null,
+                                    false,false);
     } catch(Exception e) {
       System.err.println(e.toString());
     }
@@ -36,21 +45,20 @@ public class ProducerContent extends Producer {
 
 
 
-  public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync)
+  public void handle(PrintWriter htmlout, EntityUsers user, boolean force,
+                    boolean sync)
     throws StorageObjectException, ModuleException {
 
     handle(htmlout,user,force,sync,null);
   }
 
+  public void handle(PrintWriter htmlout, EntityUsers user, boolean force,
+                     boolean sync, String id) throws StorageObjectException, ModuleException
+  {
 
-  public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync, String id)
-    throws StorageObjectException, ModuleException {
-
-    String contentTemplate = MirConfig.getProp("Producer.Content.Template");
-    int contentBatchsize = Integer.parseInt(MirConfig.getProp("Producer.Content.Batchsize"));
+    long                startTime = System.currentTimeMillis();
+    int                 pageCount=0;
 
-    long                sessionConnectTime = 0;
-    long                startTime = (new java.util.Date()).getTime();
     String              whereClause = " ";
     String              orderBy = " ";
     String              htmlFileName = null;
@@ -58,8 +66,9 @@ public class ProducerContent extends Producer {
     EntityList          batchEntityList;
     EntityUsers         userEntity=null;
 
-
     // production of the content-pages
+
+    /** @todo this should be moved to ModuleContent */
     orderBy="date desc, webdb_lastchange desc";
     if(force==true){
       whereClause="is_published='1'";
@@ -67,47 +76,58 @@ public class ProducerContent extends Producer {
       if(id !=null){
         whereClause += " AND id="+id;
       }
-      batchEntityList = contentModule.getContent(whereClause, orderBy, 0, contentBatchsize, userEntity);
+      batchEntityList = contentModule.getContent(whereClause, orderBy, 0,
+                                                -1, userEntity);
     } else {
       whereClause="is_produced='0' AND is_published='1'";
       //if true produces a single contentitem
       if(id !=null){
         whereClause += " AND id="+id;
       }
-      batchEntityList = contentModule.getContent(whereClause, orderBy, 0, contentBatchsize, userEntity);
+      batchEntityList = contentModule.getContent(whereClause, orderBy, 0,
+                                                -1, userEntity);
     }
 
-    while (batchEntityList != null) {
+    if (batchEntityList!=null) {
       for(int i=0;i<batchEntityList.size();i++) {
         currentContent = (EntityContent)batchEntityList.elementAt(i);
+
         try {
-            String date = currentContent.getValue("date");
-            String year = date.substring(0,4);
-            String month = date.substring(4,6);
-            htmlFileName =  producerDocRoot
-              + "/" + year + "/" + month + "/" +  currentContent.getValue("id") + ".shtml";
-            //produce html
-            boolean retVal = produce(contentTemplate, htmlFileName, currentContent, htmlout);
-            sessionConnectTime = new java.util.Date().getTime() - startTime;
-            if (retVal == true && !"1".equals(currentContent.getValue("is_produced")))
-                currentContent.setProduced(true);
-        } catch(Exception e) {
-          logHTML(htmlout, "Producer.Content ERROR while producing content ID: " + currentContent.getId()+",skipping it :: "+e.toString());
-          theLog.printError("Producer.Content ERROR while producing content ID: " + currentContent.getId() +",skipping it :: "+e.toString());
-        }
 
-      }//for
+          SimpleHash mergeData=new SimpleHash();
+          mergeData.put("content", currentContent);
+          String date = currentContent.getValue("date");
+          String year = date.substring(0,4);
+          String month = date.substring(4,6);
+          htmlFileName =  producerDocRoot + "/" + year + "/" + month + "/" +
+                          currentContent.getValue("id") + ".shtml";
 
-      if (batchEntityList.hasNextBatch()){
-        batchEntityList = contentModule.getContent(whereClause, orderBy, batchEntityList.getNextBatch(),contentBatchsize, userEntity);
-      } else {
-        batchEntityList=null;
-      }
-    }
+          //produce html
+          boolean retVal = produce(contentTemplate, htmlFileName, mergeData, htmlout);
+          if ( retVal ) currentContent.setProduced(true);
 
+        }
+        catch(Exception e)
+        {
+          String errorText = "Producer.Content ERROR while producing content ID:"
+                    + currentContent.getId()+", skipping it :: "+e.toString();
+          logHTML(htmlout, errorText);
+          theLog.printError(errorText);
+        }
+        pageCount++;
+      }//for
+    }
     // timing and message to browser
-    sessionConnectTime = new java.util.Date().getTime() - startTime;
-    logHTML(htmlout, "Producer.Content finished: " + sessionConnectTime + " ms.");
+    long overall = System.currentTimeMillis() - startTime;
+    long pagesPerMinute=0; float perMinute = overall/60000;
+    if (perMinute >0) pagesPerMinute = (long) (pageCount / perMinute);
+
+    logHTML(htmlout, "Producer.Content finished producing: " +
+            overall + " ms for "+ pageCount+" Pages = " +pagesPerMinute + " pages/min");
+    logHTML(htmlout, "Back to <a href=\""+actionRoot+"\">Admin-Startage</a>");
+
+    /** @todo why no syncing here? */
+
   }
 
 }