From e80dc6133f52bd2ca1bd9c65b9643b0990712422 Mon Sep 17 00:00:00 2001
From: rk <rk>
Date: Mon, 18 Feb 2002 11:29:55 +0000
Subject: [PATCH] producer timing finish to producer.java

---
 source/mircoders/producer/Producer.java        | 12 ++++++++++++
 source/mircoders/producer/ProducerContent.java | 12 ++++--------
 source/mircoders/producer/ProducerTopics.java  | 11 +++++++++--
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/source/mircoders/producer/Producer.java b/source/mircoders/producer/Producer.java
index ad27fee8..1c0f4338 100755
--- a/source/mircoders/producer/Producer.java
+++ b/source/mircoders/producer/Producer.java
@@ -151,6 +151,18 @@ abstract public class Producer {
 	/**
 	 * logging
 	 */
+
+  public void logHTMLFinish(PrintWriter htmlout,String moduleName, int pageCount, long startTime, long endTime) {
+    // timing and message to browser
+    long overall = endTime - startTime;
+    long pagesPerMinute=0; float perMinute = overall/60000;
+    if (perMinute >0) pagesPerMinute = (long) (pageCount / perMinute);
+
+    logHTML(htmlout, "Producer."+moduleName+" finished producing: " +
+            overall + " ms for "+ pageCount+" Pages = " +pagesPerMinute + " pages/min");
+    logHTML(htmlout, "Back to <a href=\""+actionRoot+"\">Admin-Startage</a>");
+  }
+
 	public void logHTML(PrintWriter out, String s) {
 		_print(out, s, true);
 	}
diff --git a/source/mircoders/producer/ProducerContent.java b/source/mircoders/producer/ProducerContent.java
index 0e3953ff..633de456 100755
--- a/source/mircoders/producer/ProducerContent.java
+++ b/source/mircoders/producer/ProducerContent.java
@@ -117,14 +117,10 @@ public class ProducerContent extends Producer {
         pageCount++;
       }//for
     }
-    // timing and message to browser
-    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>");
+
+
+
+    logHTMLFinish(htmlout, "Content", pageCount, startTime, System.currentTimeMillis());
 
     /** @todo why no syncing here? */
 
diff --git a/source/mircoders/producer/ProducerTopics.java b/source/mircoders/producer/ProducerTopics.java
index 6133a175..847ac08e 100755
--- a/source/mircoders/producer/ProducerTopics.java
+++ b/source/mircoders/producer/ProducerTopics.java
@@ -46,11 +46,16 @@ public class ProducerTopics extends ProducerList {
   }
 
   public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync)
-    throws StorageObjectException, ModuleException {
+    throws StorageObjectException, ModuleException
+  {
+    long startTime = System.currentTimeMillis();
+    int pageCount =0;
+    logHTML(htmlout, "Producer.List: started");
 
-    orderBy="date desc, webdb_create desc";
+    /** @todo should be done in static */
     listTemplate = MirConfig.getProp("Producer.TopicList.Template");
 
+    orderBy="date desc, webdb_create desc";
     EntityList topicsEntityList;
     if(where==null){
       topicsEntityList = topicsModule.getByWhereClause("","title", -1);
@@ -114,6 +119,7 @@ public class ProducerTopics extends ProducerList {
         setAdditional("topicslist",topicsEntityList);
 
         handleIt(htmlout,user,force);
+        pageCount++;
       }
       } catch (Exception e) {
         theLog.printError("ProducerTopics: problem with start special media: "
@@ -122,6 +128,7 @@ public class ProducerTopics extends ProducerList {
         +currentTopic.getId()+ "<font color=\"red\">skipping</font>");
       }
     }
+    logHTMLFinish(htmlout, "Topics", pageCount, startTime, System.currentTimeMillis());
   }
 
   public static void main(String argv[]){
-- 
2.11.0