right wordCachesize after orbiters commit.

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1882 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/js/WatchCrawler.js

@@ -63,7 +63,7 @@ function handleStatus(){
 		return;
 	}
 	var statusResponse = statusRPC.responseXML;
-	statusTag=getFirstChild(getFirstChild(statusResponse, ""), "status")
+	statusTag=getFirstChild(statusResponse, "status")
 	
 	ppm=getValue(getFirstChild(statusTag, "ppm"))
 	var ppmSpan = document.getElementById("ppm");
@@ -76,7 +76,7 @@ function handleStatus(){
 		ppmSpan.appendChild(img);
 	}
 	
-	var wordCache=getValue(getFirstChild(statusTag, "wordCacheSize"));
+	var wordCache=getValue(getFirstChild(statusTag, "wordCacheWSize"));
 	var wordCacheMax=getValue(getFirstChild(statusTag, "wordCacheMaxCount"));
 
 	var percent=Math.round(wordCache/wordCacheMax*100);

htroot/xml/status_p.java

@@ -65,6 +65,8 @@ public class status_p {
         yacyCore.peerActions.updateMySeed();
         prop.put("ppm", yacyCore.seedDB.mySeed.get(yacySeed.ISPEED, "unknown"));
         prop.put("wordCacheSize", switchboard.wordIndex.wSize() + switchboard.wordIndex.kSize());
+        prop.put("wordCacheWSize", switchboard.wordIndex.wSize());
+        prop.put("wordCacheKSize", switchboard.wordIndex.kSize());
         prop.put("wordCacheMaxCount", switchboard.getConfig("wordCacheMaxCount", "10000"));
 
         // return rewrite properties

htroot/xml/status_p.xml

@@ -1,7 +1,8 @@
-<xml version="1.0">
+<?xml version="1.0"?>
 <status>
   <ppm>#[ppm]#</ppm>
   <wordCacheSize>#[wordCacheSize]#</wordCacheSize>
+  <wordCacheWSize>#[wordCacheWSize]#</wordCacheWSize>
+  <wordCacheKSize>#[wordCacheKSize]#</wordCacheKSize>
   <wordCacheMaxCount>#[wordCacheMaxCount]#</wordCacheMaxCount>
 </status>
-</xml>