Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

pull/1/head
orbiter 13 years ago
commit 9413f77b65

@ -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

@ -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;
}
}

@ -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;

@ -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());
}

Loading…
Cancel
Save