--- projects/cms/source/host/java/DecodeCPU_TXT.java 2001/01/22 04:09:10 1.8 +++ projects/cms/source/host/java/DecodeCPU_TXT.java 2001/01/22 04:31:18 1.9 @@ -4,8 +4,6 @@ import java.util.*; class DecodeCPU_TXT { XMLFormatter packet; - - public static final String VERSION = "statgrab.pl $Revision: 1.8 $"; public DecodeCPU_TXT(){ HashMap data; @@ -27,11 +25,6 @@ class DecodeCPU_TXT { } catch (Exception e) {} - String version = (String) data.get("version"); - if(!version.equals(VERSION)) { - System.out.println("!!!!!! statgrab.pl has changed version, please check code is still up-to-date !!!!!!"); - } - String load1 = (String) data.get("packet.load.load1"); String load5 = (String) data.get("packet.load.load5"); String load15 = (String) data.get("packet.load.load15"); @@ -69,6 +62,7 @@ class DecodeCPU_TXT { packet.addElement("platform",osplatform); packet.addElement("sysname",ossysname); packet.addElement("version",osversion); + packet.closeNest(); packet.addNest("load"); packet.addElement("load1",load1); packet.addElement("load5",load5); @@ -94,9 +88,10 @@ class DecodeCPU_TXT { packet.addNest("swap"); packet.addElement("inuse",swapInUse); packet.addElement("free",swapFree); + packet.closeNest(); packet.addNest("users"); packet.addElement("count",usercount); - packet.addElement("list",userlist); + //packet.addElement("list",userlist); packet.closeNest(); in.close();