From 1a13c8b78e460bccefc4fd15ba67ac2ee3f8c8c0 Mon Sep 17 00:00:00 2001 From: allo Date: Mon, 13 Mar 2006 18:09:09 +0000 Subject: [PATCH] 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 | 4 ++-- htroot/xml/status_p.java | 2 ++ htroot/xml/status_p.xml | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/htroot/js/WatchCrawler.js b/htroot/js/WatchCrawler.js index f0c5e07aa..8e9375dce 100644 --- a/htroot/js/WatchCrawler.js +++ b/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); diff --git a/htroot/xml/status_p.java b/htroot/xml/status_p.java index 069e446ee..617831dae 100644 --- a/htroot/xml/status_p.java +++ b/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 diff --git a/htroot/xml/status_p.xml b/htroot/xml/status_p.xml index 18037c794..8438493a1 100644 --- a/htroot/xml/status_p.xml +++ b/htroot/xml/status_p.xml @@ -1,7 +1,8 @@ - + #[ppm]# #[wordCacheSize]# + #[wordCacheWSize]# + #[wordCacheKSize]# #[wordCacheMaxCount]# -