Changeset 29114 for trunk/tools/czartool/CzarDb.pm

Timestamp:

Sep 2, 2010, 3:09:56 PM (16 years ago)

Author:

rhenders

Message:

Added log plots for timeseries

File:

• trunk/tools/czartool/CzarDb.pm (modified) (4 diffs)

trunk/tools/czartool/CzarDb.pm

@@ -242 +242 @@
 ###########################################################################
 sub createTimeSeriesData {
-    my ($self, $label, $stage, $fromTime, $toTime, $minX, $maxX, $minY, $maxY, $timeDiff) = @_;
-
-    my $dataFile = "/tmp/czarplot_gnuplot_".$label."_".$stage."_t.dat";
-    open (GNUDAT, ">$dataFile");
+    my ($self, $label, $stage, $fromTime, $toTime, $minX, $maxX, $minY, $maxY, $timeDiff, $dataFileLin, $dataFileLog) = @_;
+
+    ${$dataFileLin} = "/tmp/czarplot_gnuplot_lin_".$label."_".$stage."_t.dat";
+    ${$dataFileLog} = "/tmp/czarplot_gnuplot_log_".$label."_".$stage."_t.dat";
+    open (GNUDATLIN, ">${$dataFileLin}");
+    open (GNUDATLOG, ">${$dataFileLog}");
 
     my $query = $self->{_db}->prepare(<<SQL);
@@ -259 +261 @@
 SQL
 
-    if (!$query->execute) {return undef;}
+    if (!$query->execute) {return 0;}
 
     my $minProcessed = undef;
@@ -265 +267 @@
     ($minProcessed, ${$maxY}, ${$minY}, ${$maxX}, ${$minX}, ${$timeDiff}) = $query->fetchrow_array();
 
-    if (!defined $minProcessed) {return undef;}
+    if (!defined $minProcessed) {return 0;}
 
     $query = $self->{_db}->prepare(<<SQL);
@@ -280 +282 @@
     # loop round results
     while (my @row = $query->fetchrow_array()) {
-
         my ($timestamp, $pending, $faults, $processed) = @row;
+
+        my $processedLog = log($processed + 1);
+        my $pendingLog = log($pending + 1);
+        my $faultsLog = log($faults + 1);
+
     #    print  "'$timestamp' '$pending' '$faults' '$processed'\n";
-        print GNUDAT "$timestamp $pending $faults $processed\n";
-    }
-    close(GNUDAT);
-
-    return $dataFile;
+        print GNUDATLIN "$timestamp $pending $faults $processed\n";
+        print GNUDATLOG "$timestamp $pendingLog $faultsLog $processedLog\n";
+    }
+
+    close(GNUDATLIN);
+    close(GNUDATLOG);
+
+    return 1;
 }