From 3b89c232dbe3861244bba42edd4b43900a449ce5 Mon Sep 17 00:00:00 2001 From: luccioman Date: Tue, 1 May 2018 09:58:05 +0200 Subject: [PATCH] Easier tracking of longest text snippets initializations When text snippets statistics are enabled and FINE log level is enabled on the TextSnippetStatistics class. --- source/net/yacy/search/query/SearchEvent.java | 2 +- .../net/yacy/search/snippet/TextSnippet.java | 36 +++++++++---------- .../search/snippet/TextSnippetStatistics.java | 15 ++++++-- .../yacy/search/snippet/TextSnippetTest.java | 6 ++-- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/source/net/yacy/search/query/SearchEvent.java b/source/net/yacy/search/query/SearchEvent.java index 0acdfd823..49fe0ede4 100644 --- a/source/net/yacy/search/query/SearchEvent.java +++ b/source/net/yacy/search/query/SearchEvent.java @@ -1874,7 +1874,7 @@ public final class SearchEvent implements ScoreMapUpdatesListener { LinkedHashSet solrsnippetlines = this.snippets.remove(ASCII.String(node.hash())); // we can remove this because it's used only once if (solrsnippetlines != null && solrsnippetlines.size() > 0) { OpensearchResponseWriter.removeSubsumedTitle(solrsnippetlines, node.dc_title()); - final TextSnippet solrsnippet = new TextSnippet(node.hash(), OpensearchResponseWriter.getLargestSnippet(solrsnippetlines), true, ResultClass.SOURCE_SOLR, ""); + final TextSnippet solrsnippet = new TextSnippet(node.url(), OpensearchResponseWriter.getLargestSnippet(solrsnippetlines), true, ResultClass.SOURCE_SOLR, ""); final TextSnippet yacysnippet = new TextSnippet(this.loader, node, this.query.getQueryGoal().getIncludeHashes(), diff --git a/source/net/yacy/search/snippet/TextSnippet.java b/source/net/yacy/search/snippet/TextSnippet.java index 5da937dce..3b7fb9f36 100644 --- a/source/net/yacy/search/snippet/TextSnippet.java +++ b/source/net/yacy/search/snippet/TextSnippet.java @@ -154,13 +154,13 @@ public class TextSnippet implements Comparable, Comparator, Comparator, Comparator, Comparator, Comparator, Comparator 0 ? textline : this.line, false, ResultClass.SOURCE_METADATA, null, beginTime); + init(url, textline.length() > 0 ? textline : this.line, false, ResultClass.SOURCE_METADATA, null, beginTime); return; } sentences = null; // we don't need this here any more @@ -309,12 +309,12 @@ public class TextSnippet implements Comparable, Comparator, Comparator, Comparator, Comparator snippetMaxLength) textline = textline.substring(0, snippetMaxLength); // finally store this snippet in our own cache snippetsCache.put(wordhashes, urls, textline); - init(url.hash(), textline, false, source, null, beginTime); + init(url, textline, false, source, null, beginTime); } /** @@ -378,18 +378,18 @@ public class TextSnippet implements Comparable, Comparator