Author: allo
Date: 2006-03-13 17:33:47 +0100 (Mon, 13 Mar 2006)
New Revision: 1881
Modified:
trunk/htroot/js/WatchCrawler.js
trunk/htroot/xml/status_p.java
trunk/htroot/xml/status_p.xml
Log:
updated watchcrawler for the recent changes
Modified: trunk/htroot/js/WatchCrawler.js
===================================================================
--- trunk/htroot/js/WatchCrawler.js 2006-03-13 10:43:12 UTC (rev 1880)
+++ trunk/htroot/js/WatchCrawler.js 2006-03-13 16:33:47 UTC (rev 1881)
@@ -77,13 +77,8 @@
}
var wordCache=getValue(getFirstChild(statusTag, "wordCacheSize"));
- var wordCacheMaxLow=getValue(getFirstChild(statusTag,
"wordCacheMaxLow"));
- var wordCacheMaxHigh=getValue(getFirstChild(statusTag,
"wordCacheMaxHigh"));
- //use Low as default, but High if there are more wordcaches
- var wordCacheMax=wordCacheMaxLow;
- if(wordCache>wordCacheMax){
- wordCacheMax=wordCacheMaxHigh;
- }
+ 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 10:43:12 UTC (rev 1880)
+++ trunk/htroot/xml/status_p.java 2006-03-13 16:33:47 UTC (rev 1881)
@@ -65,8 +65,7 @@
yacyCore.peerActions.updateMySeed();
prop.put("ppm", yacyCore.seedDB.mySeed.get(yacySeed.ISPEED,
"unknown"));
prop.put("wordCacheSize", switchboard.wordIndex.wSize() +
switchboard.wordIndex.kSize());
- prop.put("wordCacheMaxLow", switchboard.getConfig("wordCacheMaxLow",
"10000"));
- prop.put("wordCacheMaxHigh", switchboard.getConfig("wordCacheMaxHigh",
"10000"));
+ prop.put("wordCacheMaxCount",
switchboard.getConfig("wordCacheMaxCount", "10000"));
// return rewrite properties
return prop;
Modified: trunk/htroot/xml/status_p.xml
===================================================================
--- trunk/htroot/xml/status_p.xml 2006-03-13 10:43:12 UTC (rev 1880)
+++ trunk/htroot/xml/status_p.xml 2006-03-13 16:33:47 UTC (rev 1881)
@@ -2,7 +2,6 @@
<status>
<ppm>#[ppm]#</ppm>
<wordCacheSize>#[wordCacheSize]#</wordCacheSize>
- <wordCacheMaxLow>#[wordCacheMaxLow]#</wordCacheMaxLow>
- <wordCacheMaxHigh>#[wordCacheMaxHigh]#</wordCacheMaxHigh>
+ <wordCacheMaxCount>#[wordCacheMaxCount]#</wordCacheMaxCount>
</status>
</xml>
_______________________________________________
YaCy-svn mailing list
[email protected]
http://lists.berlios.de/mailman/listinfo/yacy-svn
