summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2022-03-16 14:49:01 +0000
committerArne H Juul <arnej@yahooinc.com>2022-03-17 10:21:09 +0000
commitdaf7808ffcc29d05c829060ab31d0655267e697e (patch)
treeb905faf6e11abb380e0d65c6d7cab11b268628fb /config-model
parent791812f39d990fb75c11cccb72334b21bf220630 (diff)
add conversion of "isNormal"
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedFields.java9
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java7
2 files changed, 10 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedFields.java
index b20ec6f6d6d..dee9b648228 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedFields.java
@@ -189,19 +189,22 @@ public class ConvertParsedFields {
}
parsed.getRankTypes().forEach((indexName, rankType) -> convertRankType(field, indexName, rankType));
parsed.getSorting().ifPresent(sortInfo -> convertSorting(field, sortInfo, name));
- if (parsed.getBolding()) {
+ if (parsed.hasBolding()) {
// TODO must it be so ugly:
SummaryField summaryField = field.getSummaryField(name, true);
summaryField.addSource(name);
summaryField.addDestination("default");
summaryField.setTransform(summaryField.getTransform().bold());
}
- if (parsed.getLiteral()) {
+ if (parsed.hasLiteral()) {
field.getRanking().setLiteral(true);
}
- if (parsed.getFilter()) {
+ if (parsed.hasFilter()) {
field.getRanking().setFilter(true);
}
+ if (parsed.hasNormal()) {
+ field.getRanking().setNormal(true);
+ }
}
static void convertSummaryFieldSettings(SummaryField summary, ParsedSummaryField parsed) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java
index ca876997dc6..ebb6acbc54c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java
@@ -44,9 +44,10 @@ class ParsedField extends ParsedBlock {
}
ParsedType getType() { return this.type; }
- boolean getBolding() { return this.hasBolding; }
- boolean getFilter() { return this.isFilter; }
- boolean getLiteral() { return this.isLiteral; }
+ boolean hasBolding() { return this.hasBolding; }
+ boolean hasFilter() { return this.isFilter; }
+ boolean hasLiteral() { return this.isLiteral; }
+ boolean hasNormal() { return this.isNormal; }
boolean hasIdOverride() { return overrideId != 0; }
int idOverride() { return overrideId; }
List<DictionaryOption> getDictionaryOptions() { return List.copyOf(dictionaryOptions); }