Changeset 29865

Timestamp:

Nov 26, 2010, 3:25:30 PM (15 years ago)

Author:

rhenders

Message:

removed redundant 'log' option for rate plots; some improved error checking

File:

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

trunk/tools/czartool/CzarDb.pm

@@ -719 +719 @@
 SQL
 
-    $query->execute;
+    if (!$query->execute) {return 0;}
+
     (${$pending}, ${$faults}) = $query->fetchrow_array();    
 
     ${$processed} = $self->countProcessed($label, $stage, $fromTime, $toTime);
+
+    if (!${$pending}) {${$pending} = 0;}
+    if (!${$faults}) {${$faults} = 0;}
+    if (!${$processed}) {${$processed} = 0;}
 
     return 1;
@@ -822 +827 @@
 SQL
 
-
     if (!$query->execute) {return undef;}
 
     (${$maxY}, ${$minY}, ${$maxX}, ${$minX}, ${$timeDiff}) = $query->fetchrow_array();
 
+
+    if (!${$maxY} || !${$minY} || !${$maxX} || !${$minX} || !${$timeDiff}) {return 0;}
 
     $query = $self->{_db}->prepare(<<SQL);
@@ -846 +852 @@
 
     close(GNUDAT);
-}
-
-###########################################################################
-#
-# TODO implement isLog
+
+    return 1;
+}
+
+###########################################################################
+#
+# Creates data for processing rate plots
 #
 ###########################################################################
 sub createProcessingRateData {
-    my ($self, $stage, $label, $begin, $end, $interval, $dataFile, $isLog) = @_;
+    my ($self, $stage, $label, $begin, $end, $interval, $dataFile) = @_;
 
     my $startTime = $begin;
@@ -865 +873 @@
 
     my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_gnuplot_".$label."_".$stage."_r.XXXXX", DIR => '/tmp', SUFFIX => 'dat');
-    $tmpFile->unlink_on_destroy( 0 );
+    $tmpFile->unlink_on_destroy(0);
     ${$dataFile} = $tmpFile->filename;
 
@@ -873 +881 @@
     while(1) {
 
-
-        #print "NNN $startTime, $end\n";
         if (!$self->isBefore($startTime, $end)) {last;}
         $endTime = $self->addInterval($startTime, $interval);
-        $self->countProcessedPendingAndFaults($label, $stage, $startTime, $endTime, \$processed, \$pending, \$faults);
+        if (!$self->countProcessedPendingAndFaults($label, $stage, $startTime, $endTime, \$processed, \$pending, \$faults)) {}
         $timestamp = $self->getFormattedDate($endTime);
+        if (!$processed) {$processed = 0;}
         print GNUDAT "$timestamp $processed 0 0\n";
 
@@ -887 +894 @@
 
     close(GNUDAT) or print "* Problem closing gnuplot data file for rate plot for '$label' '$stage'\n";
-
-    #return $someData;
 }