added size of rwi and urls to WatchCrawler

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3112 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
orbiter 2006-12-21 21:33:35 +00:00
parent 9659c004c3
commit 1d2d1854b9
4 changed files with 43 additions and 11 deletions

View File

@ -17,7 +17,7 @@
<p><table border="0" cellpadding="0" cellspacing="0"><tr>
<td valign="top"><table border="0" cellpadding="2" cellspacing="1">
<td valign="top" rowspan="2"><table border="0" cellpadding="2" cellspacing="1">
<tbody>
<tr class="TableHeader">
<th>Queue</th>
@ -47,7 +47,26 @@
</tbody>
</table></td>
<td width="10">&nbsp;</td>
<td width="6">&nbsp;</td>
<td valign="top"><table border="0" cellpadding="2" cellspacing="1">
<tbody>
<tr class="TableHeader">
<th>Database</th>
<th>Entries</th>
</tr>
<tr class="TableCellLight">
<td align="left">Pages (URLs)</td>
<td align="right"><span id="urldbsize">&nbsp;&nbsp;&nbsp;</span></td>
</tr>
<tr class="TableCellLight">
<td align="left">RWIs (Words)</td>
<td align="right"><span id="rwidbsize">&nbsp;&nbsp;&nbsp;</span></td>
</tr>
</tbody>
</table></td>
<td width="6">&nbsp;</td>
<td valign="top"><table border="0" cellpadding="2" cellspacing="1">
<tbody>
@ -56,19 +75,22 @@
<th colspan="2">Level</th>
</tr>
<tr class="TableCellLight">
<td align="left">PPM</td>
<td align="left">PPM (Pages Per Minute)</td>
<td align="left"><span id="ppmNum">&nbsp;&nbsp;&nbsp;</span></td>
<td align="left"><span id="ppmSpan">&nbsp;&nbsp;&nbsp;</span></td>
</tr>
<tr class="TableCellLight">
<td align="left">Word Caches</td>
<td align="left">RWI RAM (Word Cache)</td>
<td align="left"><span id="wordcacheNum">&nbsp;</span></td>
<td align="left"><span id="wordcacheSpan">&nbsp;</span></td>
</tr>
</tbody>
</table><br />
</table><td>
</tr><tr>
<p>
<td width="6">&nbsp;</td>
<td colspan="3"><p>
#(info)#<!-- 0 -->
::<!-- 1 -->
Error with profile management. Please stop YaCy, delete the file DATA/PLASMADB/crawlProfiles0.db and restart.
@ -89,9 +111,7 @@
<strong>Please wait some seconds, it may take some seconds until the first result appears there.</strong>
If you crawl any un-wanted pages, you can delete them <a href="IndexCreateWWWLocalQueue_p.html">here</a>.<br />
#(/info)#
</p>
</td>
</p></td>
</tr></table></p>

View File

@ -117,6 +117,12 @@ function handleQueues(){
document.getElementById("indexingqueuesize").firstChild.nodeValue=indexingqueue_size;
document.getElementById("indexingqueuemax").firstChild.nodeValue=indexingqueue_max;
dbsize=getFirstChild(xml, "dbsize");
urlpublictextSize=getValue(getFirstChild(dbsize, "urlpublictext"));
rwipublictextSize=getValue(getFirstChild(dbsize, "rwipublictext"));
document.getElementById("urldbsize").firstChild.nodeValue=urlpublictextSize;
document.getElementById("rwidbsize").firstChild.nodeValue=rwipublictextSize;
loaderqueue=getFirstChild(xml, "loaderqueue");
updateTable(loaderqueue, "loader");

View File

@ -83,8 +83,10 @@ public class queues_p {
yacySeed initiator;
//indexing queue
prop.put("indexingSize", Integer.toString(switchboard.getThread("80_indexing").getJobCount()+switchboard.indexingTasksInProcess.size()));
prop.put("indexingMax", Integer.toString(plasmaSwitchboard.indexingSlots));
prop.put("indexingSize", switchboard.getThread("80_indexing").getJobCount()+switchboard.indexingTasksInProcess.size());
prop.put("indexingMax", plasmaSwitchboard.indexingSlots);
prop.put("urlpublictextSize", switchboard.wordIndex.loadedURL.size());
prop.put("rwipublictextSize", switchboard.wordIndex.size());
if ((switchboard.sbQueue.size() == 0) && (switchboard.indexingTasksInProcess.size() == 0)) {
prop.put("list", 0); //is empty
} else {

View File

@ -1,4 +1,8 @@
<xml version="1.0">
<dbsize>
<urlpublictext>#[urlpublictextSize]#</urlpublictext>
<rwipublictext>#[rwipublictextSize]#</rwipublictext>
</dbsize>
<indexingqueue>
<size>#[indexingSize]#</size>
<max>#[indexingMax]#</max>