- some refactoring for internal RSSFeed (protocol of all actions as seen on status page)

- added dht-out to internal RSSFeed (you can see now messages about distributed indexes on status page)

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

8 files changed, 17 insertions, 17 deletions

diff --git a/htroot/Network.html b/htroot/Network.html
index 929e9970e..67cb396bf 100644
--- a/htroot/Network.html
+++ b/htroot/Network.html
@@ -14,27 +14,27 @@
     imageanimindex = 0;

     imageloadindex = 0;

     imagecycles = 0;

-    imagearray = new Array(4);

+    imagearray = new Array(6);

     setTimeout("initanimation()", 100);

     setTimeout("doanimation()", 1000);

     function initanimation() {

       handle = new Date().getTime();

-      for (j = 0; j < 4; j++) initanimationphase(j, handle);

+      for (j = 0; j < 6; j++) initanimationphase(j, handle);

     }

     function initanimationphase(phase, handle) {

       imagearray[phase] = new Image(768, 576);

-      angle = phase * 90;

+      angle = phase * 60;

       imagearray[phase].src = imagestub + angle + "&handle=" + handle;

     }

     function doanimation() {

       document.getElementById("NetworkPicture").src = imagearray[imageanimindex].src;

       imageanimindex++;

-      if (imageanimindex == 4) { imageanimindex = 0; }

+      if (imageanimindex == 6) { imageanimindex = 0; }

       imagecycles++;

       if (imagecycles == 25) {

         initanimationphase(imageloadindex, new Date().getTime());

         imageloadindex++;

-        if (imageloadindex == 4) { imageloadindex = 0; }

+        if (imageloadindex == 6) { imageloadindex = 0; }

         imagecycles = 0;

       }

       setTimeout("doanimation()", 100);

diff --git a/htroot/Status.html b/htroot/Status.html
index f1f48e298..a1c5d80b2 100644
--- a/htroot/Status.html
+++ b/htroot/Status.html
@@ -42,7 +42,7 @@
     <div class="welcome">

     <div style="margin:auto;text-align:center;">

         <h2><img src="/env/grafics/kaskelix.png" width="128" height="64" alt="YaCy Websearch" style="margin-right:5px; vertical-align:middle;" />Welcome to YaCy!</h2>

-      <iframe src="rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,INDEXRECEIVE&amp;width=600px&amp;height=180px&amp;maxlines=20&amp;maxwidth=120"

+      <iframe src="rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,DHTRECEIVE,DHTSEND&amp;width=600px&amp;height=180px&amp;maxlines=20&amp;maxwidth=120"

               style="width:600px;height:180px;margin:0px;border:1px solid black;" scrolling="no" name="newsframe"></iframe><br />

       <img src="PerformanceGraph.png" id="graph" alt="PerformanceGraph" width="660" height="240"/><br />

       <img src="Banner.png?textcolor=000000&amp;bgcolor=e7effc&amp;bordercolor=5090d0" alt="banner" width="468" height="60"/>

diff --git a/htroot/api/feed.java b/htroot/api/feed.java
index 000301f9b..20883cd66 100755
--- a/htroot/api/feed.java
+++ b/htroot/api/feed.java
@@ -33,16 +33,16 @@ public class feed {
         int messageMaxCount = Math.min(post.getInt("count", 100), 1000);
 
         RSSFeed feed;
-        channelIteration: for (int channelIndex = 0; channelIndex < channels.length; channelIndex++) {
+        channelIteration: for (String channel: channels) {
             // prevent that unauthorized access to this servlet get results from private data
-            if ((!authorized) && (RSSFeed.privateChannels.contains(channels[channelIndex]))) continue channelIteration; // allow only public channels if not authorized
+            if ((!authorized) && (RSSFeed.privateChannels.contains(channel))) continue channelIteration; // allow only public channels if not authorized
 
-            if (channels[channelIndex].equals("TEST")) {
+            if (channel.equals("TEST")) {
                 // for interface testing return at least one single result
                 prop.putXML("channel_title", "YaCy News Testchannel");
                 prop.putXML("channel_description", "");
                 prop.put("channel_pubDate", (new Date()).toString());
-                prop.putXML("item_" + messageCount + "_title", channels[channelIndex] + ": " + "YaCy Test Entry " + (new Date()).toString());
+                prop.putXML("item_" + messageCount + "_title", channel + ": " + "YaCy Test Entry " + (new Date()).toString());
                 prop.putXML("item_" + messageCount + "_description", "abcdefg");
                 prop.putXML("item_" + messageCount + "_link", "http://yacy.net");
                 prop.put("item_" + messageCount + "_pubDate", (new Date()).toString());
@@ -53,7 +53,7 @@ public class feed {
             }
             
             // read the channel
-            feed = RSSFeed.channels(channels[channelIndex]);
+            feed = RSSFeed.channels(channel);
             if (feed == null || feed.isEmpty()) continue channelIteration;
 
             RSSMessage message = feed.getChannel();
@@ -67,7 +67,7 @@ public class feed {
                 if (message == null) continue;
 
                 // create RSS entry
-                prop.putXML("item_" + messageCount + "_title", channels[channelIndex] + ": " + message.getTitle());
+                prop.putXML("item_" + messageCount + "_title", channel + ": " + message.getTitle());
                 prop.putXML("item_" + messageCount + "_description", message.getDescription());
                 prop.putXML("item_" + messageCount + "_link", message.getLink());
                 prop.put("item_" + messageCount + "_pubDate", message.getPubDate());
diff --git a/htroot/terminal_p.html b/htroot/terminal_p.html
index 3441ef5c9..8c326ffb2 100755
--- a/htroot/terminal_p.html
+++ b/htroot/terminal_p.html
@@ -54,7 +54,7 @@ function init() {
 <div class="navouter">

 <div class="navheader">Event Terminal</div>

 <div class="navcontent">

-<iframe src="/rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,INDEXRECEIVE&amp;width=430px&amp;height=200px&amp;maxlines=22&amp;maxwidth=95&amp;color=fff&amp;background=000"

+<iframe src="/rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,DHTRECEIVE,DHTSEND&amp;width=430px&amp;height=200px&amp;maxlines=22&amp;maxwidth=95&amp;color=fff&amp;background=000"

               style="width:430px;height:200px;margin:0;border-width:0;" scrolling="no" name="newsframe"></iframe>

 </div>

 </div>

diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java
index 54667a061..5d4099596 100644
--- a/htroot/yacy/search.java
+++ b/htroot/yacy/search.java
@@ -277,7 +277,7 @@ public final class search {
                     rankingProfile

                     );

             yacyCore.log.logInfo("INIT HASH SEARCH (query-" + abstracts + "): " + QueryParams.anonymizedQueryHashes(theQuery.queryHashes) + " - " + theQuery.displayResults() + " links");

-            RSSFeed.channels(RSSFeed.REMOTESEARCH).addMessage(new RSSMessage("Remote Search Request from " + ((remoteSeed == null) ? "unknown" : remoteSeed.getName()), QueryParams.anonymizedQueryHashes(theQuery.queryHashes), ""));

+            RSSFeed.channels(RSSFeed.YaCyChannel.REMOTESEARCH).addMessage(new RSSMessage("Remote Search Request from " + ((remoteSeed == null) ? "unknown" : remoteSeed.getName()), QueryParams.anonymizedQueryHashes(theQuery.queryHashes), ""));

             

             // make event

             theSearch = SearchEventCache.getEvent(theQuery, sb.peers, sb.crawlResults, null, true, sb.loader);

diff --git a/htroot/yacy/transferRWI.java b/htroot/yacy/transferRWI.java
index 93d6fcb1a..14153b35e 100644
--- a/htroot/yacy/transferRWI.java
+++ b/htroot/yacy/transferRWI.java
@@ -219,7 +219,7 @@ public final class transferRWI {
                 String lastHash = wordhashes.get(wordhashes.size() - 1);

                 final long avdist = (FlatWordPartitionScheme.std.dhtDistance(firstHash.getBytes(), null, sb.peers.mySeed()) + FlatWordPartitionScheme.std.dhtDistance(lastHash.getBytes(), null, sb.peers.mySeed())) / 2;

                 sb.getLog().logInfo("Received " + received + " Entries " + wordc + " Words [" + firstHash + " .. " + lastHash + "]/" + avdist + " from " + otherPeerName + ", processed in " + (System.currentTimeMillis() - startProcess) + " milliseconds, requesting " + unknownURL.size() + "/" + receivedURL + " URLs, blocked " + blocked + " RWIs");

-                RSSFeed.channels(RSSFeed.INDEXRECEIVE).addMessage(new RSSMessage("Received " + received + " RWIs [" + firstHash + " .. " + lastHash + "]/" + avdist + " from " + otherPeerName + ", requesting " + unknownURL.size() + " URLs, blocked " + blocked, "", ""));

+                RSSFeed.channels(RSSFeed.YaCyChannel.DHTRECEIVE).addMessage(new RSSMessage("Received " + received + " RWIs [" + firstHash + " .. " + lastHash + "]/" + avdist + " from " + otherPeerName + ", requesting " + unknownURL.size() + " URLs, blocked " + blocked, "", ""));

             }

             result = "ok";

             

diff --git a/htroot/yacy/transferURL.java b/htroot/yacy/transferURL.java
index 8c8cab6a4..7b14f8e8d 100644
--- a/htroot/yacy/transferURL.java
+++ b/htroot/yacy/transferURL.java
@@ -157,7 +157,7 @@ public final class transferURL {
             final int more = sb.indexSegments.urlMetadata(Segments.Process.DHTIN).size() - sizeBefore;

             doublevalues = Integer.toString(received - more);

             yacyCore.log.logInfo("Received " + received + " URLs from peer " + otherPeerName + " in " + (System.currentTimeMillis() - start) + " ms, blocked " + blocked + " URLs");

-            RSSFeed.channels(RSSFeed.INDEXRECEIVE).addMessage(new RSSMessage("Received " + received + " URLs from peer " + otherPeerName + ", blocked " + blocked, "", ""));

+            RSSFeed.channels(RSSFeed.YaCyChannel.DHTRECEIVE).addMessage(new RSSMessage("Received " + received + " URLs from peer " + otherPeerName + ", blocked " + blocked, "", ""));

             if ((received - more) > 0) yacyCore.log.logSevere("Received " + doublevalues + " double URLs from peer " + otherPeerName);

             result = "ok";

         }

diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
index 2ce96b27f..4eb3309ac 100644
--- a/htroot/yacysearch.java
+++ b/htroot/yacysearch.java
@@ -498,7 +498,7 @@ public class yacysearch {
             

             // log

             Log.logInfo("LOCAL_SEARCH", "INIT WORD SEARCH: " + theQuery.queryString + ":" + QueryParams.hashSet2hashString(theQuery.queryHashes) + " - " + theQuery.neededResults() + " links to be computed, " + theQuery.displayResults() + " lines to be displayed");

-            RSSFeed.channels(RSSFeed.LOCALSEARCH).addMessage(new RSSMessage("Local Search Request", theQuery.queryString, ""));

+            RSSFeed.channels(RSSFeed.YaCyChannel.LOCALSEARCH).addMessage(new RSSMessage("Local Search Request", theQuery.queryString, ""));

             final long timestamp = System.currentTimeMillis();

 

             // create a new search event