Index: /trunk/ippMonitor/raw/czartool_labels.php
===================================================================
--- /trunk/ippMonitor/raw/czartool_labels.php	(revision 28827)
+++ /trunk/ippMonitor/raw/czartool_labels.php	(revision 28828)
@@ -31,5 +31,4 @@
 $selectedLabel = $_GET[label];
 $selectedServer = $_GET[server];
-$selectedRevertServer = $_GET[revertserver];
 $selectedRevertStage = $_GET[revertstage];
 $selectedRevertMode = $_GET[revertmode];
@@ -39,10 +38,12 @@
 
 // deal with reverts: turn on or off if requested and pass current revert state for this stage onto labels table later
-$currentRevertMode;
-if ($selectedRevertStage != "" && $selectedRevertMode != "" && $selectedRevertServer != "" ) {
-
-    exec("czartool_revert.pl -s $selectedRevertServer -t $selectedRevertStage -o $selectedRevertMode", $response, $status);
+if ($selectedRevertStage != "" && $selectedRevertMode != "") {
+
+    exec("czartool_revert.pl -t $selectedRevertStage -o $selectedRevertMode", $response, $status);
+    $currentRevertMode;
     if ($response[0] == "off") $currentRevertMode = 0;
     else if ($response[0] == "on") $currentRevertMode = 1;
+
+    setRevertStatus($czardb, $selectedRevertStage, $currentRevertMode);
 }
 $debug = 0;
@@ -92,5 +93,5 @@
 
     echo "<td> \n";
-      createLabelsTable($pass, $proj, $czardb, $stdsLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage, $selectedRevertStage, $currentRevertMode);
+      createLabelsTable($pass, $proj, $czardb, $stdsLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage);
     echo "</td>\n";
 
@@ -203,5 +204,5 @@
 #
 ###########################################################################
-function createLabelsTable($pass, $proj, $db, $stdsLabels, $distLabels, $pubLabels, $stages, $states, $selectedState, $selectedLabel, $selectedStage, $selectedRevertStage, $currentRevertMode) {
+function createLabelsTable($pass, $proj, $db, $stdsLabels, $distLabels, $pubLabels, $stages, $states, $selectedState, $selectedLabel, $selectedStage) {
 
     // set up table columns
@@ -215,10 +216,6 @@
     foreach ($stages as &$stage) {
 
-        $revertOnOff=array();
-        if ($stage == "destreak" or $stage == "dist") $server = "distribution";
-        else $server = "stdscience";
-        if ($stage == $selectedRevertStage) $reverting = $currentRevertMode;
-        else $reverting = getRevertStatus($db, $stage);
-        $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertserver=" . $server . "&revertstage=" . $stage . "&revertmode=";
+        $reverting = getRevertStatus($db, $stage);
+        $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&revertmode=";
         if(!$reverting) {$label =  "Start";$link = $link . "on";}
         if($reverting) {$label = "Stop";$link = $link . "off";}
@@ -326,4 +323,18 @@
 ###########################################################################
 #
+# Sets reverts status 
+#
+###########################################################################
+function setRevertStatus($db, $stage, $reverting) {
+
+    $sql = "UPDATE reverts SET reverting = $reverting WHERE stage LIKE '$stage'";
+    if ($debug) {echo "$sql<br>";}
+
+    $qry = $db->query($sql);
+    if (dberror($qry)) {echo "<b>error with $sql </b><br>\n";}
+}
+
+###########################################################################
+#
 # Returns whether this stage is reverting or not
 #
@@ -332,5 +343,6 @@
 
     $anyFaults = false;
-    $sql = "SELECT reverting FROM $stage ORDER BY timestamp DESC LIMIT 1";
+
+    $sql = "SELECT reverting FROM reverts WHERE stage LIKE '$stage'";
     if ($debug) {echo "$sql<br>";}
 
Index: /trunk/ippMonitor/scripts/czartool_revert.pl
===================================================================
--- /trunk/ippMonitor/scripts/czartool_revert.pl	(revision 28827)
+++ /trunk/ippMonitor/scripts/czartool_revert.pl	(revision 28828)
@@ -5,19 +5,20 @@
 use Getopt::Long;
 
-my $server = undef;
 my $task = undef;
 my $onoff = undef;
 
 GetOptions (
-        "server|s=s" => \$server,
         "task|t=s" => \$task,
         "onoff|o=s" => \$onoff);
 
 my $prob = 0;
-if (!$server) {print "ERROR: need to define a server (-s)\n"; $prob=1;}
 if (!$task) {print "ERROR: need to define a task (-t)\n"; $prob=1;}
 if ($prob) {exit;}
 
 if ($task eq "cam") {$task = "camera";}
+
+my $server = undef;
+if ($task eq "destreak" or $task eq "dist") {$server = "distribution";}
+else {$server = "stdscience";}
 
 my $revert = undef;