--- projects/cms/source/server/uk/org/iscream/cms/server/client/AlerterSkeleton.java	2001/05/13 01:47:42	1.7
+++ projects/cms/source/server/uk/org/iscream/cms/server/client/AlerterSkeleton.java	2001/05/15 13:20:14	1.8
@@ -18,7 +18,7 @@ import java.util.*;
  * method to allow formatting of messages.
  *
  * @author  $Author: tdb $
- * @version $Id: AlerterSkeleton.java,v 1.7 2001/05/13 01:47:42 tdb Exp $
+ * @version $Id: AlerterSkeleton.java,v 1.8 2001/05/15 13:20:14 tdb Exp $
  */
 public abstract class AlerterSkeleton extends Thread implements PluginAlerter {
 
@@ -27,7 +27,7 @@ public abstract class AlerterSkeleton extends Thread i
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.7 $";
+    public final String REVISION = "$Revision: 1.8 $";
 
     /**
      * The default level to send alerts at
@@ -106,7 +106,7 @@ public abstract class AlerterSkeleton extends Thread i
         // get some values
         String alertType = Alert.alertLevels[alert.getLevel()];
         String thresholdType = Alert.thresholdLevels[alert.getThreshold()];
-        String timeFirstSince = DateUtils.formatTime((System.currentTimeMillis() - alert.getInitialAlertTime()), "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
+        String timeSinceFirst = DateUtils.formatTime((System.currentTimeMillis() - alert.getInitialAlertTime())/1000, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
         String timeFirstOccured = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.UK).format(new Date(alert.getInitialAlertTime()));
         
         // replace fields in message
@@ -117,7 +117,7 @@ public abstract class AlerterSkeleton extends Thread i
         message = StringUtils.replaceText(message, "%thresholdValue%", alert.getThresholdValue());
         message = StringUtils.replaceText(message, "%attributeName%", alert.getAttributeName());
         message = StringUtils.replaceText(message, "%timeTillNextAlert%",  DateUtils.getTimeString(Long.parseLong(alert.getTimeTillNextAlert())));
-        message = StringUtils.replaceText(message, "%timeSinceFirstAlert%", timeFirstSince);
+        message = StringUtils.replaceText(message, "%timeSinceFirstAlert%", timeSinceFirst);
         message = StringUtils.replaceText(message, "%timeOfFirstAlert%", timeFirstOccured);
         return message;
     }