Changeset 465

Timestamp:

01/13/07 18:23:31 (6 years ago)

Author:

max

Message:

Minor bugfix for [463]

Files:

• util/server_daily_maint (modified) (3 diffs)

util/server_daily_maint

@@ -714 +714 @@
     foreach my $ch (keys %{$store->{missing_data}})
     {
-        for (my $i = $start; $i < $end; $i += $interval)
-        {
-            push @{$data->{$ch}}, strftime("%Y-%m-%d %H:%M:%S", localtime($i)), undef;
-        }
-
-        my $num_elements = scalar(@{$data->{$ch}});
-
         foreach my $slice (keys %{$store->{missing_data}->{$ch}})
         {
@@ -748 +741 @@
             for (my $i = $s; $i < $f; $i += $interval)
             {
+                next if ($i < $start or $i > $end);
                 my $n = ((($i - $start) / $interval) * 2) + 1;
-                next unless ($n > 0 and $n < $num_elements);
 
                 foreach my $csid (@csids)
@@ -766 +759 @@
 
     my @graphs;
-    # Now convert the unique CSIDs to raw numbers for the $data hash (missing by channel)
-    foreach my $ch (keys %$data)
+    &pad_missing_data_hash($data, $start, $end, $interval);
+    my $gname = ($component ? 'c_'.$component.'_' : '') . 'missing_by_channel';
+    push @graphs, { GRAPH => &graph_one_count_data($gname, 'Missing Data by Channel', "%a %H:%M", '12 hours', [ values %$data ], 1010, 0, [ keys %$data ]) };
+
+    unless ($component)
     {
-        for (my $i = 1; $i < @{$data->{$ch}}; $i += 2)
-        {
-            if (!defined $data->{$ch}->[$i])
+        &pad_missing_data_hash($gdata, $start, $end, $interval);
+        push @graphs, { GRAPH => &graph_one_count_data('missing_by_grabber', 'Missing Data by Grabber', "%a %H:%M", '12 hours', [ values %$gdata ], 1010, 0, [ keys %$gdata ]) };
+    }
+
+    $template->param($varname => \@graphs);
+}
+
+# Pad out the hash of 'missing data' with timestamps and 0s to make
+# a timeseries array suitable for graphing
+sub pad_missing_data_hash
+{
+    my ($h, $start, $end, $interval) = @_;
+
+    foreach my $key (keys %$h)
+    {
+        print "Key=$key\n";
+        for (my $n = 0; $n <= @{$h->{$key}}; $n += 2)
+        {
+            my $t = $start + ($n / 2 * $interval);
+             print "n=$n, t=$t\n";
+
+            last if ($t >= $end);
+            $h->{$key}->[$n] = strftime("%Y-%m-%d %H:%M:%S", localtime($t));
+            if (!defined $h->{$key}->[$n+1])
             {
-                $data->{$ch}->[$i] = 0;
+                $h->{$key}->[$n+1] = 0;
             }
             else
             {
-                $data->{$ch}->[$i] = scalar(@{$data->{$ch}->[$i]});
+                $h->{$key}->[$n+1] = scalar(@{$h->{$key}->[$n+1]});
             }
         }
     }
-    my $gname = 'missing_by_channel';
-    $gname .= ('_' . $component) if ($component);
-    push @graphs, { GRAPH => &graph_one_count_data($gname, 'Missing Data by Channel', "%a %H:%M", '12 hours', [ values %$data ], 1010, 0, [ keys %$data ]) };
-
-    # Do something similar for the $gdata hash (missing by component)
-    unless ($component)
-    {
-        foreach my $c (keys %$gdata)
-        {
-            for (my $n = 0; $n <= @{$gdata->{$c}}; $n += 2)
-            {
-                my $t = $start + ($n / 2 * $interval);
-                last if ($t >= $end);
-                $gdata->{$c}->[$n] = strftime("%Y-%m-%d %H:%M:%S", localtime($t));
-                if (!defined $gdata->{$c}->[$n+1])
-                {
-                    $gdata->{$c}->[$n+1] = 0;
-                }
-                else
-                {
-                    $gdata->{$c}->[$n+1] = scalar(@{$gdata->{$c}->[$n+1]});
-                }
-            }
-        }
-        push @graphs, { GRAPH => &graph_one_count_data('missing_by_grabber', 'Missing Data by Grabber', "%a %H:%M", '12 hours', [ values %$gdata ], 1010, 0, [ keys %$gdata ]) };
-    }
-
-    $template->param($varname => \@graphs);
 }