From 4fed4a86d8c06d8231ff1a6abe0df812ab962b55 Mon Sep 17 00:00:00 2001 From: orbiter Date: Thu, 4 Oct 2012 22:44:44 +0200 Subject: [PATCH] another fix to location search --- source/net/yacy/search/query/QueryParams.java | 2 +- source/net/yacy/search/query/SearchEvent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/net/yacy/search/query/QueryParams.java b/source/net/yacy/search/query/QueryParams.java index 1725fe2a4..095e9469b 100644 --- a/source/net/yacy/search/query/QueryParams.java +++ b/source/net/yacy/search/query/QueryParams.java @@ -523,7 +523,7 @@ public final class QueryParams { if (this.radius > 0.0d && this.lat != 0.0d && this.lon != 0.0d) { // localtion search, no special ranking // try http://localhost:8090/solr/select?q=*:*&fq={!bbox}&sfield=coordinate_p&pt=50.17,8.65&d=1 - q.append('&').append(CommonParams.FQ).append("={!bbox}&sfield=").append(YaCySchema.coordinate_p.name()).append("&pt="); + q.append('&').append(CommonParams.FQ).append("=!bbox&sfield=").append(YaCySchema.coordinate_p.name()).append("&pt="); q.append(Double.toString(this.lat)).append(',').append(Double.toString(this.lon)).append("&d=").append(GeoLocation.degreeToKm(this.radius)); } else { // set ranking diff --git a/source/net/yacy/search/query/SearchEvent.java b/source/net/yacy/search/query/SearchEvent.java index a26be77d7..83d95f93e 100644 --- a/source/net/yacy/search/query/SearchEvent.java +++ b/source/net/yacy/search/query/SearchEvent.java @@ -150,7 +150,7 @@ public final class SearchEvent { this.rankingProcess = new RWIProcess(this.query, this.order, remote); // start a local solr search - RemoteSearch.solrRemoteSearch(this, 100, 10000, null /*this peer*/, Switchboard.urlBlacklist); + RemoteSearch.solrRemoteSearch(this, Math.min(300, this.query.itemsPerPage() * 3), 10000, null /*this peer*/, Switchboard.urlBlacklist); // start a local RWI search concurrently this.rankingProcess.start();