diff --git a/bin/localsearch.sh b/bin/localsearch.sh index be4b1576c..8acf586ba 100755 --- a/bin/localsearch.sh +++ b/bin/localsearch.sh @@ -2,9 +2,9 @@ cd "`dirname $0`" port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2) if which curl &>/dev/null; then - curl -s "http://localhost:$port/suggest.json?resource=local&verify=false&query=$1" + curl -s "http://localhost:$port/yacysearch.rss?resource=local&verify=false&query=$1" | awk '/^/{ gsub("","" );gsub("<\/link>","" ); print $0 }' elif which wget &>/dev/null; then - wget -q -O - "http://localhost:$port/suggest.json?resource=local&verify=false&query=$1" + wget -q -O - "http://localhost:$port/yacysearch.rss?resource=local&verify=false&query=$1" | awk '/^/{ gsub("","" );gsub("<\/link>","" ); print $0 }' else echo "Neither curl nor wget installed!" exit 1 diff --git a/source/net/yacy/cora/protocol/Domains.java b/source/net/yacy/cora/protocol/Domains.java index 26b2d4c8f..e4c099123 100644 --- a/source/net/yacy/cora/protocol/Domains.java +++ b/source/net/yacy/cora/protocol/Domains.java @@ -29,7 +29,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; import java.util.regex.Pattern; import net.yacy.cora.storage.ARC; @@ -459,13 +458,15 @@ public class Domains { public static String getHostName(final InetAddress i) { Collection hosts = nameCacheHit.getKeys(i); if (hosts.size() > 0) return hosts.iterator().next(); - + return i.getHostName(); + /* // call i.getHostName() using concurrency to interrupt execution in case of a time-out try { - return TimeoutRequest.getHostName(i, 1000); + //TimeoutRequest.getHostName(i, 1000); } catch (ExecutionException e) { return i.getHostAddress(); } + */ } public static InetAddress dnsResolve(String host) { @@ -484,7 +485,7 @@ public class Domains { // call dnsResolveNetBased(host) using concurrency to interrupt execution in case of a time-out try { boolean doCaching = true; - ip = TimeoutRequest.getByName(host, 1000); // this makes the DNS request to backbone + ip = InetAddress.getByName(host); //TimeoutRequest.getByName(host, 1000); // this makes the DNS request to backbone if ((ip == null) || (ip.isLoopbackAddress()) || (nameCacheNoCachingList.containsKey(host)) @@ -503,7 +504,7 @@ public class Domains { nameCacheHit.put(host, ip); } return ip; - } catch (final ExecutionException e) { + } catch (final UnknownHostException e) { // remove old entries flushMissNameCache();