--- 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 17:50:28	1.10
@@ -3,12 +3,10 @@ import java.util.*;
 
 class DecodeCPU_TXT {
 
-	XMLFormatter packet;
-	
-	public static final String VERSION = "statgrab.pl $Revision: 1.8 $";
+    XMLFormatter packet;
 
-	public DecodeCPU_TXT(){
-	    HashMap data;
+    public DecodeCPU_TXT(){
+        HashMap data;
         try {
             String[] cmd = {"statgrab.pl"};
             Process proc = Runtime.getRuntime().exec(cmd);
@@ -27,32 +25,27 @@ 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");
-			
-			String totalProcesses = (String) data.get("packet.processes.total");
-			String sleeping = (String) data.get("packet.processes.sleeping");
-			String zombie = (String) data.get("packet.processes.zombie");
-			String stopped = (String) data.get("packet.processes.stopped");
-			String onCPU = (String) data.get("packet.processes.cpu");
-			
-			String idle = (String) data.get("packet.cpu.idle");
-			String user = (String) data.get("packet.cpu.user");
-			String kernel = (String) data.get("packet.cpu.kernel");
-			String iowait = (String) data.get("packet.cpu.iowait");
-			String swap = (String) data.get("packet.cpu.swap");
-			
-			String real = (String) data.get("packet.memory.real");
-			String free = (String) data.get("packet.memory.free");
-			String swapInUse = (String) data.get("packet.memory.swap_in_use");
-			String swapFree = (String) data.get("packet.memory.swap_free");
+            String load5 = (String) data.get("packet.load.load5");
+            String load15 = (String) data.get("packet.load.load15");
             
+            String totalProcesses = (String) data.get("packet.processes.total");
+            String sleeping = (String) data.get("packet.processes.sleeping");
+            String zombie = (String) data.get("packet.processes.zombie");
+            String stopped = (String) data.get("packet.processes.stopped");
+            String onCPU = (String) data.get("packet.processes.cpu");
+            
+            String idle = (String) data.get("packet.cpu.idle");
+            String user = (String) data.get("packet.cpu.user");
+            String kernel = (String) data.get("packet.cpu.kernel");
+            String iowait = (String) data.get("packet.cpu.iowait");
+            String swap = (String) data.get("packet.cpu.swap");
+            
+            String real = (String) data.get("packet.memory.real");
+            String free = (String) data.get("packet.memory.free");
+            String swapTotal = (String) data.get("packet.memory.swap_total");
+            String swapFree = (String) data.get("packet.memory.swap_free");
+            
             String osname = (String) data.get("packet.os.name");
             String osrelease = (String) data.get("packet.os.release");
             String osplatform = (String) data.get("packet.os.platform");
@@ -69,37 +62,55 @@ class DecodeCPU_TXT {
                 packet.addElement("platform",osplatform);
                 packet.addElement("sysname",ossysname);
                 packet.addElement("version",osversion);
-			packet.addNest("load");
-				packet.addElement("load1",load1);
-				packet.addElement("load5",load5);
-				packet.addElement("load15",load15);
-			packet.closeNest();	
-			packet.addNest("processes");
-				packet.addElement("total",totalProcesses);
-				packet.addElement("sleeping",sleeping);
-				packet.addElement("zombie",zombie);
-				packet.addElement("stopped",stopped);
-			packet.closeNest();
-			packet.addNest("cpu");
-				packet.addElement("idle",idle);
-				packet.addElement("user",user);
-				packet.addElement("kernel",kernel);
-				packet.addElement("iowait",iowait);
-				packet.addElement("swap",swap);
-			packet.closeNest();
-			packet.addNest("memory");
-				packet.addElement("total",real);
-				packet.addElement("free",free);
-			packet.closeNest();
-			packet.addNest("swap");
-				packet.addElement("inuse",swapInUse);
-				packet.addElement("free",swapFree);
+            packet.closeNest(); 
+            packet.addNest("load");
+                packet.addElement("load1",load1);
+                packet.addElement("load5",load5);
+                packet.addElement("load15",load15);
+            packet.closeNest(); 
+            packet.addNest("processes");
+                packet.addElement("total",totalProcesses);
+                packet.addElement("sleeping",sleeping);
+                packet.addElement("zombie",zombie);
+                packet.addElement("stopped",stopped);
+            packet.closeNest();
+            packet.addNest("cpu");
+                packet.addElement("idle",idle);
+                packet.addElement("user",user);
+                packet.addElement("kernel",kernel);
+                packet.addElement("iowait",iowait);
+                packet.addElement("swap",swap);
+            packet.closeNest();
+            packet.addNest("memory");
+                packet.addElement("total",real);
+                packet.addElement("free",free);
+            packet.closeNest();
+            packet.addNest("swap");
+                packet.addElement("total",swapTotal);
+                packet.addElement("free",swapFree);
+            packet.closeNest(); 
             packet.addNest("users");
                 packet.addElement("count",usercount);
                 packet.addElement("list",userlist);
-			packet.closeNest();
-			
-			in.close();
+            packet.closeNest();
+            packet.addNest("disk");
+                int i=0;
+                while(true) {
+                    String check = (String) data.get("packet.disk.p"+i+".attributes.name");
+                    if(check == null) {
+                        break;
+                    }
+                    packet.addNest("p"+i);
+                        packet.addElement("name",check);
+                        packet.addElement("kbytes",(String) data.get("packet.disk.p"+i+".attributes.kbytes"));
+                        packet.addElement("used",(String) data.get("packet.disk.p"+i+".attributes.used"));
+                        packet.addElement("avail",(String) data.get("packet.disk.p"+i+".attributes.avail"));
+                        packet.addElement("mount",(String) data.get("packet.disk.p"+i+".attributes.mount"));
+                    packet.closeNest();
+                    i++;
+                }
+            packet.closeNest();
+            in.close();
             
         }
         catch(Exception e) {
@@ -107,12 +118,12 @@ class DecodeCPU_TXT {
             e.printStackTrace();
         }
 
-	}
+    }
 
-	public String getItems(){
-		// return the xml
-		return packet.returnXML();
-	}
-	
+    public String getItems(){
+        // return the xml
+        return packet.returnXML();
+    }
+    
 
 } // class