More values displayed on WatchCrawler.html

status_p.xml: to be extended.

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

htroot/WatchCrawler.html

@@ -12,6 +12,11 @@
 <h2>Watch Crawler</h2>
 <p />
 Indexing Queue:<br />
+<div>
+Queue Size: <span id="indexingqueuesize">&nbsp;&nbsp;&nbsp;</span>
+Queue Max: <span id="indexingqueuemax">&nbsp;&nbsp;&nbsp;</span>
+PPM: <span id="ppm">&nbsp;&nbsp;&nbsp;</span>
+</div>
 <table border="0" cellpadding="2" cellspacing="1" id="indexingTable" width="100%">
 <tbody>
 <tr class="TableHeader">

htroot/env/style.css

@@ -160,6 +160,9 @@ background-color: #bbcccc;
 .TableCellLight {
 background-color: #ddeeee;
 }
+.TableCellActive {
+background-color: #ffbbaa;
+}
 .TableCellSummary {
 background-color: #ffbbaa;
 }

htroot/js/WatchCrawler.js

@@ -1,10 +1,42 @@
 DELETE_STRING="delete"
-function handleResponse(){
+
-    if(http.readyState == 4){
+var statusRPC;
-        var response = http.responseXML;
+function requestStatus(){
+	statusRPC=createRequestObject()
+	statusRPC.open('get', '/xml/status_p.xml');
+	statusRPC.onreadystatechange = handleStatus;
+	statusRPC.send(null)
+}
+function requestIndexingQueue(){
+	indexingQueueRPC=createRequestObject()
+	indexingQueueRPC.open('get', '/xml/queues/indexing_p.xml');
+	indexingQueueRPC.onreadystatechange = handleIndexingQueue;
+	indexingQueueRPC.send(null);
+
+}
+window.setInterval("requestStatus()", 5000);
+window.setInterval("requestIndexingQueue()", 5000);
+
+
+
+//window.setInterval("sndReq('/xml/queues/indexing_p.xml')", 5000);
+
+
+function handleStatus(){
+	var statusResponse = statusRPC.responseXML;
+	indexingqueue=statusResponse.getElementsByTagName("indexingqueue")[0];
+	indexingqueue_size=indexingqueue.firstChild.nextSibling;
+	indexingqueue_max=indexingqueue_size.nextSibling.nextSibling;
+	ppm=statusResponse.getElementsByTagName("ppm")[0];
+	document.getElementById("indexingqueuesize").firstChild.nodeValue=indexingqueue_size.firstChild.nodeValue;
+	document.getElementById("indexingqueuemax").firstChild.nodeValue=indexingqueue_max.firstChild.nodeValue;
+	document.getElementById("ppm").firstChild.nodeValue=ppm.firstChild.nodeValue;
+}
+function handleIndexingQueue(){
+	var indexingQueueResponse = indexingQueueRPC.responseXML;
     indexingTable=document.getElementById("indexingTable");
-		if(response != null){
+	if(indexingQueueResponse != null){
-	        entries=response.getElementsByTagName("entry");
+	    entries=indexingQueueResponse.getElementsByTagName("entry");
 	}
     
     //skip the Tableheade
@@ -26,8 +58,6 @@ function handleResponse(){
 		hash="";
 		inProcess=false;
            
-            //simply add all fields chronologically
-            //TODO: add them by Name
         field=entries[i].firstChild;
         while(field != null){
             if(field.nodeType == 1 && field.firstChild!=null){//Element
@@ -55,13 +85,8 @@ function handleResponse(){
         }
 		row=createRow(initiator, depth, modified, anchor, url, size, hash);
 		//create row
-            /*col=document.createElement("td");
-            text=document.createTextNode(initiator);
-            col.appendChild(text);
-            row.appendChild(col);*/
-
 		if(inProcess){
-                row.setAttribute("class", "TableCellSummary");
+            row.setAttribute("class", "TableCellActive");
         }else if(dark){
             row.setAttribute("class", "TableCellDark");
         }else{
@@ -71,8 +96,7 @@ function handleResponse(){
         dark=!dark;
     }
 }
-}
+
-window.setInterval("sndReq('/xml/queues/indexing_p.xml')", 5000);
 
 function createCol(content){
 	col=document.createElement("td");

htroot/xml/queues/indexing_p.xml

@@ -1,5 +1,5 @@
 <xml version="1.0">
-<indexingQueue>
+<indexingqueue>
 #{list}#
   <entry>
     <initiator>#[initiator]#</initiator>
@@ -12,5 +12,5 @@
     <inProcess>#(inProcess)#false::true#(/inProcess)#</inProcess>
   </entry>
 #{/list}#
-</indexingQueue>
+</indexingqueue>
 </xml>

htroot/xml/status_p.java

@@ -0,0 +1,77 @@
+// /xml.queues/status_p.java
+// -------------------------------
+// part of the AnomicHTTPD caching proxy
+// (C) by Michael Peter Christen; mc@anomic.de
+// first published on http://www.anomic.de
+// Frankfurt, Germany, 2004, 2005
+//
+// last major change: 06.02.2006
+// this file is contributed by Alexander Schier
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// Using this software in any meaning (reading, learning, copying, compiling,
+// running) means that you agree that the Author(s) is (are) not responsible
+// for cost, loss of data or any harm that may be caused directly or indirectly
+// by usage of this softare or this documentation. The usage of this software
+// is on your own risk. The installation and usage (starting/running) of this
+// software may allow other people or application to access your computer and
+// any attached devices and is highly dependent on the configuration of the
+// software which must be done by the user of the software; the author(s) is
+// (are) also not responsible for proper configuration and usage of the
+// software, even if provoked by documentation provided together with
+// the software.
+//
+// Any changes to this file according to the GPL as documented in the file
+// gpl.txt aside this file in the shipment you received can be done to the
+// lines that follows this copyright notice here, but changes must not be
+// done inside the copyright notive above. A re-distribution must contain
+// the intact and unchanged copyright notice.
+// Contributions and changes to the program code must be marked as such.
+
+// You must compile this file with
+// javac -classpath .:../classes IndexCreate_p.java
+// if the shell's current path is HTROOT
+
+//package xml.queues;
+package xml;
+import de.anomic.http.httpHeader;
+import de.anomic.plasma.plasmaSwitchboard;
+import de.anomic.server.serverObjects;
+import de.anomic.server.serverSwitch;
+import de.anomic.yacy.yacyCore;
+import de.anomic.yacy.yacySeed;
+
+public class status_p {
+    
+    
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+        // return variable that accumulates replacements
+        plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
+        serverObjects prop = new serverObjects();
+        prop.put("rejected", 0);
+        yacyCore.peerActions.updateMySeed();
+        prop.put("ppm", yacyCore.seedDB.mySeed.get(yacySeed.ISPEED, "unknown"));
+        prop.put("indexingQueueSize", Integer.toString(switchboard.getThread("80_indexing").getJobCount()+switchboard.indexingTasksInProcess.size()));
+        prop.put("indexingQueueMax", Integer.toString(plasmaSwitchboard.indexingSlots));
+
+        // return rewrite properties
+        return prop;
+    }
+    
+}
+
+
+

htroot/xml/status_p.xml

@@ -0,0 +1,9 @@
+<xml version="1.0">
+<status>
+  <ppm>#[ppm]#</ppm>
+  <indexingqueue>
+    <size>#[indexingQueueSize]#</size>
+    <max>#[indexingQueueMax]#</max>
+  </indexingqueue>
+</status>
+</xml>