diff --git a/htroot/Status.html b/htroot/Status.html index fed070126..112941e1c 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -45,7 +45,7 @@

YaCy WebsearchWelcome to YaCy!

-
PerformanceGraph
banner diff --git a/source/de/anomic/search/Switchboard.java b/source/de/anomic/search/Switchboard.java index 68d63a69f..91c6e8334 100644 --- a/source/de/anomic/search/Switchboard.java +++ b/source/de/anomic/search/Switchboard.java @@ -2092,7 +2092,8 @@ public final class Switchboard extends serverSwitch { condenser, searchEvent, sourceName); - yacyChannel.channels(Base64Order.enhancedCoder.equal(queueEntry.initiator(), ASCII.getBytes(this.peers.mySeed().hash)) ? yacyChannel.LOCALINDEXING : yacyChannel.REMOTEINDEXING).addMessage(new RSSMessage("Indexed web page", dc_title, queueEntry.url().toNormalform(true, false))); + final RSSFeed feed = yacyChannel.channels(queueEntry.initiator() == null ? yacyChannel.PROXY : Base64Order.enhancedCoder.equal(queueEntry.initiator(), ASCII.getBytes(this.peers.mySeed().hash)) ? yacyChannel.LOCALINDEXING : yacyChannel.REMOTEINDEXING); + feed.addMessage(new RSSMessage("Indexed web page", dc_title, queueEntry.url().toNormalform(true, false))); } catch (final IOException e) { //if (this.log.isFine()) log.logFine("Not Indexed Resource '" + queueEntry.url().toNormalform(false, true) + "': process case=" + processCase); addURLtoErrorDB(queueEntry.url(), (referrerURL == null) ? null : referrerURL.hash(), queueEntry.initiator(), dc_title, FailCategory.FINAL_LOAD_CONTEXT, "error storing url: " + queueEntry.url().toNormalform(false, true) + "': process case=" + processCase + ", error = " + e.getMessage()); diff --git a/source/de/anomic/yacy/yacyChannel.java b/source/de/anomic/yacy/yacyChannel.java index 636ba1b5f..3bf941f44 100644 --- a/source/de/anomic/yacy/yacyChannel.java +++ b/source/de/anomic/yacy/yacyChannel.java @@ -11,12 +11,12 @@ * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library 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 * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with this program in the file lgpl21.txt * If not, see . @@ -40,17 +40,18 @@ public enum yacyChannel { REMOTEINDEXING, LOCALINDEXING, DHTRECEIVE, - DHTSEND; - - + DHTSEND, + PROXY; + + // test: // http://localhost:8090/xml/feed.rss?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING - + /** * the following private channels are declared to prevent that an access to the feed servlet * gets results from news channels that are not for the public */ - public static final Set privateChannels = EnumSet.of(yacyChannel.LOCALSEARCH, yacyChannel.LOCALINDEXING); + public static final Set privateChannels = EnumSet.of(yacyChannel.LOCALSEARCH, yacyChannel.LOCALINDEXING, yacyChannel.PROXY); /** * the following static channels object is used to organize a storage array for RSS feeds @@ -62,7 +63,7 @@ public enum yacyChannel { } return null; } - + public static RSSFeed channels(final yacyChannel channel) { RSSFeed feed = channels.get(channel); if (feed != null) return feed;