From 20e0cc08228045e067088156b97f05d85f1997c4 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 29 May 2012 14:46:13 +0200 Subject: [PATCH] fix for bad location evaluation --- htroot/yacysearch_location.html | 2 +- htroot/yacysearch_location.java | 54 ++++++---------------- source/de/anomic/server/serverObjects.java | 18 +++++++- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/htroot/yacysearch_location.html b/htroot/yacysearch_location.html index 71061019f..065f1b5b0 100644 --- a/htroot/yacysearch_location.html +++ b/htroot/yacysearch_location.html @@ -71,7 +71,7 @@ //map.panTo(searchLayer_co.getExtent().getCenterLonLat()); //map.setCenter(searchLayer_co.getExtent().getLonLatFromViewPortPx, 5); //map.setCenter(searchLayer_co.getExtent().getCenterLonLat(), map.getZoomForExtent(searchLayer_co.getExtent(), true)); - document.getElementById('apilink').setAttribute('href', 'yacysearch_location.rss?query=' + query); + //document.getElementById('apilink').setAttribute('href', 'yacysearch_location.rss?query=' + query); } diff --git a/htroot/yacysearch_location.java b/htroot/yacysearch_location.java index efd40d928..9467e1bce 100644 --- a/htroot/yacysearch_location.java +++ b/htroot/yacysearch_location.java @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import java.util.Date; -import java.util.HashSet; import java.util.Set; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -98,46 +97,19 @@ public class yacysearch_location { RSSMessage message; loop: while ((message = results.poll(maximumTime, TimeUnit.MILLISECONDS)) != RSSMessage.POISON) { if (message == null) break loop; - - // find all associated locations - final Set locations = new HashSet(); - final StringBuilder words = new StringBuilder(120); - if (search_title) words.append(message.getTitle().trim()).append(space); - if (search_publisher) words.append(message.getCopyright().trim()).append(space); - if (search_creator) words.append(message.getAuthor().trim()).append(space); - String subject = ""; - assert message != null; - assert message.getSubject() != null; - for (final String s: message.getSubject()) subject += s.trim() + space; - if (search_subject) words.append(subject).append(space); - final String[] wordlist = words.toString().trim().split(space); - for (final String word: wordlist) if (word.length() >= 3) locations.addAll(LibraryProvider.geoLoc.find(word, true)); - for (int i = 0; i < wordlist.length - 1; i++) locations.addAll(LibraryProvider.geoLoc.find(wordlist[i] + space + wordlist[i + 1], true)); - for (int i = 0; i < wordlist.length - 2; i++) locations.addAll(LibraryProvider.geoLoc.find(wordlist[i] + space + wordlist[i + 1] + space + wordlist[i + 2], true)); - - // add locations from metatag - if (metatag) { - if (message.getLat() != 0.0f && message.getLon() != 0.0f) { - locations.add(new Location(message.getLon(), message.getLat(), message.getTitle().trim())); - } - } - - for (final Location location: locations) { - // write for all locations a point to this message - prop.put("kml_placemark_" + placemarkCounter + "_location", location.getName()); - prop.put("kml_placemark_" + placemarkCounter + "_name", message.getTitle()); - prop.put("kml_placemark_" + placemarkCounter + "_author", message.getAuthor()); - prop.put("kml_placemark_" + placemarkCounter + "_copyright", message.getCopyright()); - prop.put("kml_placemark_" + placemarkCounter + "_subject", subject.trim()); - prop.put("kml_placemark_" + placemarkCounter + "_description", message.getDescription()); - prop.put("kml_placemark_" + placemarkCounter + "_date", message.getPubDate()); - prop.putXML("kml_placemark_" + placemarkCounter + "_url", message.getLink()); - prop.put("kml_placemark_" + placemarkCounter + "_pointname", location.getName()); - prop.put("kml_placemark_" + placemarkCounter + "_lon", location.lon()); - prop.put("kml_placemark_" + placemarkCounter + "_lat", location.lat()); - placemarkCounter++; - if (placemarkCounter >= maximumRecords) break loop; - } + prop.put("kml_placemark_" + placemarkCounter + "_location", message.getTitle()); + prop.put("kml_placemark_" + placemarkCounter + "_name", message.getTitle()); + prop.put("kml_placemark_" + placemarkCounter + "_author", message.getAuthor()); + prop.put("kml_placemark_" + placemarkCounter + "_copyright", message.getCopyright()); + prop.put("kml_placemark_" + placemarkCounter + "_subject", message.getSubject()); + prop.put("kml_placemark_" + placemarkCounter + "_description", message.getDescription()); + prop.put("kml_placemark_" + placemarkCounter + "_date", message.getPubDate()); + prop.putXML("kml_placemark_" + placemarkCounter + "_url", message.getLink()); + prop.put("kml_placemark_" + placemarkCounter + "_pointname", message.getTitle()); + prop.put("kml_placemark_" + placemarkCounter + "_lon", message.getLon()); + prop.put("kml_placemark_" + placemarkCounter + "_lat", message.getLat()); + placemarkCounter++; + if (placemarkCounter >= maximumRecords) break loop; } } catch (final InterruptedException e) {} prop.put("kml_placemark", placemarkCounter); diff --git a/source/de/anomic/server/serverObjects.java b/source/de/anomic/server/serverObjects.java index 3d4097e70..b7b25b989 100644 --- a/source/de/anomic/server/serverObjects.java +++ b/source/de/anomic/server/serverObjects.java @@ -69,7 +69,7 @@ public class serverObjects extends HashMap implements Cloneable public static final String ACTION_AUTHENTICATE = "AUTHENTICATE"; public static final String ACTION_LOCATION = "LOCATION"; public final static String ADMIN_AUTHENTICATE_MSG = "admin log-in. If you don't know the password, set it with {yacyhome}/bin/passwd.sh {newpassword}"; - + private final static Pattern patternNewline = Pattern.compile("\n"); private final static Pattern patternDoublequote = Pattern.compile("\""); private final static Pattern patternSlash = Pattern.compile("/"); @@ -98,7 +98,7 @@ public class serverObjects extends HashMap implements Cloneable public void authenticationRequired() { this.put(ACTION_AUTHENTICATE, ADMIN_AUTHENTICATE_MSG); } - + private static final String removeByteOrderMark(final String s) { if (s == null || s.length() == 0) return s; if (s.charAt(0) == BOM) return s.substring(1); @@ -127,6 +127,20 @@ public class serverObjects extends HashMap implements Cloneable } } + public String put(final String key, final String[] values) { + if (key == null) { + // this does nothing + return null; + } else if (values == null) { + // assigning the null value creates the same effect like removing the element + return super.remove(key); + } else { + StringBuilder sb = new StringBuilder(10 + values.length * 8); + for (String s: values) sb.append(s).append(' '); + return put(key, sb.toString().trim()); + } + } + /** * Add a key-value pair of Objects to the map. * @param key This method will do nothing if the key is null.