From 9db032664ea0532e64b066066eda80ebbc3d4653 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 11 Sep 2012 20:15:54 +0200 Subject: [PATCH 1/2] activate two solr fields which will be used by administration interface (later) --- defaults/solr.keys.list | 4 ++-- .../yacy/cora/services/federated/solr/GSAResponseWriter.java | 2 +- source/net/yacy/search/index/SolrConfiguration.java | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defaults/solr.keys.list b/defaults/solr.keys.list index 36e2802e6..a58052e13 100644 --- a/defaults/solr.keys.list +++ b/defaults/solr.keys.list @@ -301,7 +301,7 @@ italic_txt #url_protocol_s ## all path elements in the url -#url_paths_sxt +url_paths_sxt ## number of key-value pairs in search part of the url #url_parameter_i @@ -316,7 +316,7 @@ italic_txt #url_chars_i ## host of the url, string -#host_s +host_s ## the Domain Class Name, either the TLD or a combination of ccSLD+TLD if a ccSLD is used. #host_dnc_s diff --git a/source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java b/source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java index 965f8740e..6735562bf 100644 --- a/source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java +++ b/source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java @@ -275,7 +275,7 @@ public class GSAResponseWriter implements QueryResponseWriter { continue; } if (YaCySchema.size_i.name().equals(fieldName)) { - size = Integer.parseInt(value.stringValue()); + size = value.stringValue() != null && value.stringValue().length() > 0 ? Integer.parseInt(value.stringValue()) : -1; continue; } } diff --git a/source/net/yacy/search/index/SolrConfiguration.java b/source/net/yacy/search/index/SolrConfiguration.java index 76fa93d39..395abc630 100644 --- a/source/net/yacy/search/index/SolrConfiguration.java +++ b/source/net/yacy/search/index/SolrConfiguration.java @@ -53,6 +53,7 @@ import net.yacy.document.parser.html.ImageEntry; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadata; import net.yacy.kelondro.data.meta.URIMetadataNode; +import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Bitfield; @@ -203,6 +204,7 @@ public class SolrConfiguration extends ConfigurationSet implements Serializable } public SolrInputDocument metadata2solr(final URIMetadata md) { + assert md instanceof URIMetadataRow; if (md instanceof URIMetadataNode) { return ClientUtils.toSolrInputDocument(((URIMetadataNode) md).getDocument()); } From b846f585fa7bce28d1651224c37398d2c6e64b9f Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 11 Sep 2012 20:24:27 +0200 Subject: [PATCH 2/2] fixed a bug with size_i field usage --- .../yacy/cora/services/federated/solr/JsonResponseWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/net/yacy/cora/services/federated/solr/JsonResponseWriter.java b/source/net/yacy/cora/services/federated/solr/JsonResponseWriter.java index d2e2fff68..9bdbb9d09 100644 --- a/source/net/yacy/cora/services/federated/solr/JsonResponseWriter.java +++ b/source/net/yacy/cora/services/federated/solr/JsonResponseWriter.java @@ -146,7 +146,7 @@ public class JsonResponseWriter implements QueryResponseWriter { solitaireTag(writer, "pubDate", HeaderFramework.formatRFC1123(d)); continue; } - if (YaCySchema.size_i.equals(fieldName)) { + if (YaCySchema.size_i.name().equals(fieldName)) { int size = value.stringValue() != null && value.stringValue().length() > 0 ? Integer.parseInt(value.stringValue()) : -1; int sizekb = size / 1024; int sizemb = sizekb / 1024;