updated watchcrawler for the recent changes

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

htroot/js/WatchCrawler.js

@@ -77,13 +77,8 @@ function handleStatus(){
 	}
 	
 	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);
 
 	

htroot/xml/status_p.java

@@ -65,8 +65,7 @@ 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("wordCacheMaxLow", switchboard.getConfig("wordCacheMaxLow", "10000"));
-        prop.put("wordCacheMaxHigh", switchboard.getConfig("wordCacheMaxHigh", "10000"));
+        prop.put("wordCacheMaxCount", switchboard.getConfig("wordCacheMaxCount", "10000"));
 
         // return rewrite properties
         return prop;

htroot/xml/status_p.xml

@@ -2,7 +2,6 @@
 <status>
   <ppm>#[ppm]#</ppm>
   <wordCacheSize>#[wordCacheSize]#</wordCacheSize>
-  <wordCacheMaxLow>#[wordCacheMaxLow]#</wordCacheMaxLow>
-  <wordCacheMaxHigh>#[wordCacheMaxHigh]#</wordCacheMaxHigh>
+  <wordCacheMaxCount>#[wordCacheMaxCount]#</wordCacheMaxCount>
 </status>
 </xml>