Index: branches/eam_branches/ipp-20100621/tools/czartool.pl
===================================================================
--- branches/eam_branches/ipp-20100621/tools/czartool.pl	(revision 28794)
+++ branches/eam_branches/ipp-20100621/tools/czartool.pl	(revision 28980)
@@ -64,6 +64,6 @@
 
         if ($key eq "s") {checkServers();}
-        elsif ($key eq "l") {checkAllLabels("new");}
-        elsif ($key eq "u") {serverStatus("stdscience");}
+        elsif ($key eq "l") {checkAllLabels("stdscience");}
+        elsif ($key eq "u") {$pantasks->getServerCurrentStatus("stdscience");}
         elsif ($key =~ m/[0-9]/) {my $key2=getc; checkOneLabel($stdscienceLabels[($key.$key2)-1]);}
         printInstructions();
@@ -99,22 +99,4 @@
 
     return \@diff;
-}
-
-###########################################################################
-#
-# Prints the status of a given pantasks server
-#
-###########################################################################
-sub serverStatus {
-    my ($server) = @_;
-
-    my @cmdOut = `echo "status;quit" | pantasks_client -c ~ipp/$server/ptolemy.rc 2>&1`;
-    my $line;
-    foreach $line (@cmdOut) {
-
-        chomp($line);
-
-        print "$line\n";
-    }
 }
 
@@ -263,7 +245,7 @@
     my $new = $gpc1Db->countExposures($label, $stage, $state);
 
-    if ($state ne "new") {return $new;}
-
-    my $faults = $gpc1Db->countFaults($label, $stage);
+    #if ($state ne "new") {return $new;}
+
+    my $faults = $gpc1Db->countFaults($label, $stage, $state);
 
     if ($faults < 1) {return $new;}