Changeset 28719 for trunk/tools/czartool

Timestamp:

Jul 27, 2010, 2:42:17 PM (16 years ago)

Author:

rhenders

Message:

Loads of stuff

Location:

trunk/tools/czartool

Files:

• CzarDb.pm (modified) (6 diffs)
• Czarplot.pm (added)
• Gnuplot.pm (deleted)
• Gpc1Db.pm (modified) (1 diff)

trunk/tools/czartool/CzarDb.pm

@@ -72 +72 @@
        $query->execute;
 }
+
+###########################################################################
+#
+# Sets priority for this label
+#
+###########################################################################
+sub setLabelPriority {
+    my ($self, $label, $priority) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+     UPDATE current_labels 
+         SET priority = $priority 
+         WHERE label LIKE '$label' 
+         AND server LIKE 'stdscience';
+SQL
+
+    $query->execute;
+}
+
 ###########################################################################
 #
@@ -79 +98 @@
 sub updateCurrentLabels {
     my ($self, $server, $labels) = @_;
+
+    my $size = scalar @{$labels};
+    if ($size < 1) {return;}
 
     my $query = $self->{_db}->prepare(<<SQL);
@@ -181 +203 @@
 
         my ($timestamp, $pending, $faults, $processed) = @row;
+    #    print  "'$timestamp' '$pending' '$faults' '$processed'\n";
         print $tempFile "$timestamp $pending $faults $processed\n";
     }
@@ -298 +321 @@
 
     my $currentRevision = -1;
-    my $latestRevision = 6;
+    my $latestRevision = 7;
 
     while ($currentRevision != $latestRevision) {
@@ -311 +334 @@
         elsif ($currentRevision == 4) {$self->createRevision_5();}
         elsif ($currentRevision == 5) {$self->createRevision_6();}
+        elsif ($currentRevision == 6) {$self->createRevision_7();}
     }
 }
@@ -476 +500 @@
 #######################################################################################
 # 
+# Create revision 7 of the database 
+#
+#######################################################################################
+sub createRevision_7 {
+    my ($self) = @_;
+
+    print "* Creating revision 7 of '$self->{_dbName}'\n";
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    ALTER TABLE current_labels 
+        ADD COLUMN priority INT NOT NULL DEFAULT 0;
+SQL
+
+    $query->execute;
+
+    $self->setRevision(7);
+}
+
+#######################################################################################
+# 
 # Sets current revision of ippToPsps database
 #

trunk/tools/czartool/Gpc1Db.pm

@@ -73 +73 @@
 ###########################################################################
 #
+# Returns priority for this label
+#
+###########################################################################
+sub getPriority {
+    my ($self, $label) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT priority 
+        FROM Label 
+        WHERE label LIKE '$label' 
+SQL
+
+        $query->execute;
+    my $priority = scalar $query->fetchrow_array();
+    if (!$priority) {return 50000;} # assume labels not given priority in gpc1 Db have highest priority
+    return $priority;
+}
+
+###########################################################################
+#
 # Returns count of exposures with this state for this label
 #