Author: allo
Date: 2006-03-13 19:09:09 +0100 (Mon, 13 Mar 2006)
New Revision: 1882
Modified:
trunk/htroot/js/WatchCrawler.js
trunk/htroot/xml/status_p.java
trunk/htroot/xml/status_p.xml
Log:
right wordCachesize after orbiters commit.
Modified: trunk/htroot/js/WatchCrawler.js
===================================================================
--- trunk/htroot/js/WatchCrawler.js 2006-03-13 16:33:47 UTC (rev 1881)
+++ trunk/htroot/js/WatchCrawler.js 2006-03-13 18:09:09 UTC (rev 1882)
@@ -63,7 +63,7 @@
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 @@
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);
Modified: trunk/htroot/xml/status_p.java
===================================================================
--- trunk/htroot/xml/status_p.java 2006-03-13 16:33:47 UTC (rev 1881)
+++ trunk/htroot/xml/status_p.java 2006-03-13 18:09:09 UTC (rev 1882)
@@ -65,6 +65,8 @@
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
Modified: trunk/htroot/xml/status_p.xml
===================================================================
--- trunk/htroot/xml/status_p.xml 2006-03-13 16:33:47 UTC (rev 1881)
+++ trunk/htroot/xml/status_p.xml 2006-03-13 18:09:09 UTC (rev 1882)
@@ -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>
_______________________________________________
YaCy-svn mailing list
[email protected]
http://lists.berlios.de/mailman/listinfo/yacy-svn
