Changeset 30254

Timestamp:

Jan 12, 2011, 4:16:20 PM (15 years ago)

Author:

rhenders

Message:

Fixed time-range of plots to use value from config

File:

• trunk/tools/czarplot.pl (modified) (4 diffs)

trunk/tools/czarplot.pl

@@ -122 +122 @@
 my $czarDb = $config->getCzarDbInstance();
 
+my $newDayTime =  $config->getMetricsStartTime();
 
 my $plotter = undef; 
@@ -133 +134 @@
 }
 
-# sort out times
+# if a single day has been chosen 
 if($day) {
 
@@ -143 +144 @@
     else {
 
-        # day plots should run from about 6:30am until midnight
-        $begin = "$day 06:35";
-        $end = "$day 23:59";
+        # plots should span 24 housr from previous day
+        my $dayBefore = $czarDb->subtractInterval($day, "1 DAY");
+                
+        $begin = "$dayBefore $newDayTime";
+        $end = "$day $newDayTime";
     }
 }
@@ -153 +156 @@
     if (!$begin) {
 
+        my $today = strftime('%Y-%m-%d', localtime);
+        my $yesterday = $czarDb->subtractInterval($today, "1 DAY");
+
+        
         if ($timeinpast) {$begin = $czarDb->subtractInterval($end, $timeinpast);}
-        else {$begin =  strftime('%Y-%m-%d 06:35',localtime);}
+        elsif ($czarDb->isBefore($end, "$today $newDayTime")) {$begin = "$yesterday $newDayTime";}
+        else {$begin = "$today $newDayTime";}
     }
 }