- added more selection criteria for network seed list

- enhanced up script

3 files changed, 12 insertions, 12 deletions

diff --git a/bin/up.sh b/bin/up.sh
index 2a57b6eb6..414ac16de 100755
--- a/bin/up.sh
+++ b/bin/up.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 cd "`dirname $0`"
-port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
-./up1.sh localhost:$port
+./apicall.sh "/Network.xml?page=1&ip=" | awk '/<address>/{ gsub("<address>","" );gsub("<\/address>","" ); print $0 }' | awk '{print $1}';
+
+#port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
+#./up1.sh localhost:$port
 
diff --git a/bin/up1.sh b/bin/up1.sh
deleted file mode 100755
index 17d88cc39..000000000
--- a/bin/up1.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-cd "`dirname $0`"
-if which curl &>/dev/null; then
-  curl -s "http://$1/Network.xml?page=1&ip=" | awk '/<address>/{ gsub("<address>","" );gsub("<\/address>","" ); print $0 }' | awk '{print $1}';
-elif which wget &>/dev/null; then
-  wget -q -O - "http://$1/Network.xml?page=1&ip=" | awk '/<address>/{ gsub("<address>","" );gsub("<\/address>","" ); print $0 }' | awk '{print $1}';
-else
-  exit 1
-fi
-
diff --git a/htroot/Network.java b/htroot/Network.java
index 4971b68ca..f73938259 100644
--- a/htroot/Network.java
+++ b/htroot/Network.java
@@ -284,6 +284,10 @@ public class Network {
                     boolean dark = true;

                     Seed seed;

                     final boolean complete = (post != null && post.containsKey("ip"));

+                    final boolean onlyIncomingDHT = (post != null && post.containsKey("onlydhtin"));

+                    final boolean onlyNode = (post != null && post.containsKey("onlynode"));

+                    final long onlyAgeOverDays = post == null ? 0 : post.getLong("onlyageoverdays", 0);

+                    final long onlySizeLessDocs = post == null ? Long.MAX_VALUE : post.getLong("onlysizelessdocs", Long.MAX_VALUE);

                     Iterator<Seed> e = null;

                     final boolean order = (post != null && post.get("order", "down").equals("up"));

                     final String sort = (post == null ? null : post.get("sort", null));

@@ -315,6 +319,10 @@ public class Network {
                         seed = e.next();

                         assert seed != null;

                         if (seed != null) {

+                            if (onlyIncomingDHT && !seed.getFlagAcceptRemoteIndex()) continue;

+                            if (onlyNode && !seed.getFlagRootNode()) continue;

+                            if (seed.getAge() < onlyAgeOverDays) continue;

+                            if (seed.getLinkCount() > onlySizeLessDocs) continue;

                             if((post != null && post.containsKey("search"))  && peerSearchPattern != null /*(wrongregex == null)*/) {

                                 boolean abort = true;

                                 Matcher m = peerSearchPattern.matcher (seed.getName());