From 6b056610e37247f4b2c497a66a30cf91d61dc5fd Mon Sep 17 00:00:00 2001
From: allo <allo@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 13 Mar 2006 16:33:47 +0000
Subject: [PATCH] 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 | 9 ++-------
 htroot/xml/status_p.java  | 3 +--
 htroot/xml/status_p.xml   | 3 +--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/htroot/js/WatchCrawler.js b/htroot/js/WatchCrawler.js
index 3de9e3922..f0c5e07aa 100644
--- a/htroot/js/WatchCrawler.js
+++ b/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);
 
 	
diff --git a/htroot/xml/status_p.java b/htroot/xml/status_p.java
index 3cd8c35e5..069e446ee 100644
--- a/htroot/xml/status_p.java
+++ b/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;
diff --git a/htroot/xml/status_p.xml b/htroot/xml/status_p.xml
index 0fb20f882..18037c794 100644
--- a/htroot/xml/status_p.xml
+++ b/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>