From 9b25d072953e7f522af505b6766868c7ccf21268 Mon Sep 17 00:00:00 2001 From: orbiter Date: Wed, 30 Mar 2011 00:49:47 +0000 Subject: [PATCH] - added geo information parsing to html parser - extended metadata information in index with geolocalisation - added display of location in yacydoc and ViewFile git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7629 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- bin/apicall.sh | 4 +- htroot/IndexCreateWWWLocalQueue_p.html | 2 +- htroot/ViewFile.html | 2 + htroot/ViewFile.java | 2 + htroot/api/yacydoc.html | 3 +- htroot/api/yacydoc.java | 5 +- htroot/api/yacydoc.xml | 9 +++- htroot/yacysearch_location.html | 12 +++++ htroot/yacysearch_location.java | 2 +- source/de/anomic/crawler/ResultURLs.java | 2 +- source/de/anomic/search/Segment.java | 2 + source/net/yacy/cora/document/Hit.java | 3 ++ source/net/yacy/cora/document/RSSMessage.java | 13 +++++- source/net/yacy/cora/services/SearchHub.java | 2 +- .../net/yacy/cora/services/SearchSRURSS.java | 6 ++- source/net/yacy/document/Document.java | 15 ++++++ source/net/yacy/document/content/DCEntry.java | 23 +++++++++- .../document/content/SurrogateReader.java | 4 +- .../yacy/document/content/dao/PhpBB3Dao.java | 2 +- .../net/yacy/document/parser/csvParser.java | 1 + .../net/yacy/document/parser/docParser.java | 1 + .../yacy/document/parser/genericParser.java | 1 + .../document/parser/html/ContentScraper.java | 39 ++++++++++++++++ .../net/yacy/document/parser/htmlParser.java | 1 + .../parser/images/genericImageParser.java | 1 + source/net/yacy/document/parser/mmParser.java | 1 + .../net/yacy/document/parser/odtParser.java | 1 + .../net/yacy/document/parser/ooxmlParser.java | 1 + .../net/yacy/document/parser/pdfParser.java | 1 + .../net/yacy/document/parser/pptParser.java | 1 + source/net/yacy/document/parser/psParser.java | 1 + .../net/yacy/document/parser/rssParser.java | 2 + .../net/yacy/document/parser/rtfParser.java | 1 + .../yacy/document/parser/sevenzipParser.java | 18 +++++++- .../yacy/document/parser/sidAudioParser.java | 4 +- .../yacy/document/parser/sitemapParser.java | 1 + .../net/yacy/document/parser/swfParser.java | 1 + .../yacy/document/parser/torrentParser.java | 1 + .../net/yacy/document/parser/vcfParser.java | 1 + .../net/yacy/document/parser/vsdParser.java | 1 + .../net/yacy/document/parser/xlsParser.java | 1 + .../kelondro/data/meta/URIMetadataRow.java | 46 ++++++++++++++++--- source/net/yacy/kelondro/io/CharBuffer.java | 5 ++ source/net/yacy/yacy.java | 4 +- 44 files changed, 224 insertions(+), 25 deletions(-) diff --git a/bin/apicall.sh b/bin/apicall.sh index 818970a6b..60d359167 100755 --- a/bin/apicall.sh +++ b/bin/apicall.sh @@ -4,9 +4,9 @@ port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2) pw=$(grep ^adminAccountBase64MD5= ../DATA/SETTINGS/yacy.conf |cut -d= -f2) if which curl &>/dev/null; then - curl -s --header "Authorization: realm=$pw" "http://localhost:$port/$1" > /dev/null + curl -s --header "Authorization: realm=$pw" "http://127.0.0.1:$port/$1" > /dev/null elif which wget &>/dev/null; then - wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" "http://localhost:$port/$1" -O /dev/null + wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" "http://127.0.0.1:$port/$1" -O /dev/null else exit 1 fi diff --git a/htroot/IndexCreateWWWLocalQueue_p.html b/htroot/IndexCreateWWWLocalQueue_p.html index 27ffd6fc8..8c7bfeb01 100644 --- a/htroot/IndexCreateWWWLocalQueue_p.html +++ b/htroot/IndexCreateWWWLocalQueue_p.html @@ -19,7 +19,7 @@
Delete Entries: - +