*) peer-search now checks matches to peername and peerhash

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3520 6c8d7289-2bf4-0310-a012-ef5d649a1542
18 years ago · 2522c26921
parent 5c3afb3202
commit 2522c26921
1 changed files with 8 additions and 2 deletions
--- a/htroot/Network.java
+++ b/htroot/Network.java
@ -304,10 +304,16 @@ public class Network {
                        seed = (yacySeed) e.nextElement();
                        if (seed != null) {
                            if(post.containsKey("search")) {
+                                boolean abort = true;
                                Matcher m = peerSearchPattern.matcher (seed.getName());
-                                if (!m.find ()) {
-                                    continue;
+                                if (m.find ()) {
+                                    abort = false;
                                }
+                                m = peerSearchPattern.matcher (seed.hash);
+                                if (m.find ()) {
+                                    abort = false;
+                                }
+                                if (abort) continue;
                            }
                            prop.put(STR_TABLE_LIST + conCount + "_updatedProfile", 0);
                            prop.put(STR_TABLE_LIST + conCount + "_updatedWikiPage", 0);