Index: /trunk/tools/czartool.pl
===================================================================
--- /trunk/tools/czartool.pl	(revision 28824)
+++ /trunk/tools/czartool.pl	(revision 28825)
@@ -65,5 +65,5 @@
         if ($key eq "s") {checkServers();}
         elsif ($key eq "l") {checkAllLabels("new");}
-        elsif ($key eq "u") {serverStatus("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";
-    }
 }
 
Index: /trunk/tools/czartool/Pantasks.pm
===================================================================
--- /trunk/tools/czartool/Pantasks.pm	(revision 28824)
+++ /trunk/tools/czartool/Pantasks.pm	(revision 28825)
@@ -113,5 +113,4 @@
         if ($line =~ m/Scheduler is running/) {${$running} = 1; ${$alive}=1;last;}
         if ($line =~ m/Task Status/) {last;}
-
     }
 }
@@ -125,13 +124,12 @@
     my ($self, $server) = @_;
 
-
     my @cmdOut = `echo "status;quit" | pantasks_client -c ~ipp/$server/ptolemy.rc 2>&1`;
     my $line;
     my $passedHeader=0;
+    print "\n";
     foreach $line (@cmdOut) {
 
-        chomp($line);
         if ($line =~ m/.*Task Status.*/) {$passedHeader=1;next;}
-        if ($passedHeader){print "$line<br>";}
+        if ($passedHeader){print "$line";}
     }
 }