honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-30 11:58:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Boolean field type does not handle number/string properly when searching, closes #59.

Browse Source
This commit is contained in:
kimchy 2010-03-12 16:53:11 +02:00
parent 6fe329ab69
commit 47c11aa538
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonBooleanFieldMapper.java
View File

@ -22,12 +22,13 @@ package org.elasticsearch.index.mapper.json;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.codehaus.jackson.JsonToken; import org.codehaus.jackson.JsonToken;
import org.elasticsearch.util.Booleans;
import org.elasticsearch.util.lucene.Lucene; import org.elasticsearch.util.lucene.Lucene;
import java.io.IOException; import java.io.IOException;
/** /**
* @author kimchy (Shay Banon) * @author kimchy (shay.banon)
*/ */
// TODO this can be made better, maybe storing a byte for it? // TODO this can be made better, maybe storing a byte for it?
public class JsonBooleanFieldMapper extends JsonFieldMapper<Boolean> { public class JsonBooleanFieldMapper extends JsonFieldMapper<Boolean> {
@ -93,7 +94,7 @@ public class JsonBooleanFieldMapper extends JsonFieldMapper<Boolean> {
} }
@Override public Boolean value(Fieldable field) { @Override public Boolean value(Fieldable field) {
return Boolean.parseBoolean(valueAsString(field)); return field.stringValue().charAt(0) == 'T' ? Boolean.TRUE : Boolean.FALSE;
} }
@Override public String valueAsString(Fieldable field) { @Override public String valueAsString(Fieldable field) {
@ -104,7 +105,10 @@ public class JsonBooleanFieldMapper extends JsonFieldMapper<Boolean> {
if (value == null || value.length() == 0) { if (value == null || value.length() == 0) {
return "F"; return "F";
} }
return value.equals("true") ? "T" : "F"; if (Booleans.parseBoolean(value, false)) {
return "T";
}
return "F";
} }
@Override public String indexedValue(Boolean value) { @Override public String indexedValue(Boolean value) {
@ -132,10 +136,10 @@ public class JsonBooleanFieldMapper extends JsonFieldMapper<Boolean> {
value = "T"; value = "T";
} }
} else if (token == JsonToken.VALUE_STRING) { } else if (token == JsonToken.VALUE_STRING) {
if (jsonContext.jp().getText().equals("false")) { if (Booleans.parseBoolean(jsonContext.jp().getText(), false)) {
value = "F";
} else {
value = "T"; value = "T";
} else {
value = "F";
} }
} else { } else {
return null; return null;