diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-10-13 14:40:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-13 14:40:54 +0200 |
commit | c0b701ca4518e01eb8d7e52aa50348298f6a8922 (patch) | |
tree | 91b2777066ce06cacbdcc9e098dba0dbb44393c5 /container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java | |
parent | 4781e77d144f932913d0e37924ed931bbd880e13 (diff) |
Revert "Revert "Remove coverage attribute on query""
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java index cd4e02dc768..7d2ebd2a0ec 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java @@ -120,7 +120,7 @@ public class QueryProperties extends Properties { else if (key.size()==2 && key.first().equals(Presentation.PRESENTATION)) { if (key.last().equals(Presentation.BOLDING)) return query.getPresentation().getBolding(); if (key.last().equals(Presentation.SUMMARY)) return query.getPresentation().getSummary(); - if (key.last().equals(Presentation.REPORT_COVERAGE)) return query.getPresentation().getReportCoverage(); + if (key.last().equals(Presentation.REPORT_COVERAGE)) return true; // TODO: Remove this line on Vespa 7 if (key.last().equals(Presentation.FORMAT)) return query.getPresentation().getFormat(); if (key.last().equals(Presentation.TIMING)) return query.getPresentation().getTiming(); if (key.last().equals(Presentation.SUMMARY_FIELDS)) return query.getPresentation().getSummaryFields(); @@ -227,15 +227,13 @@ public class QueryProperties extends Properties { query.getPresentation().setBolding(asBoolean(value, true)); else if (key.last().equals(Presentation.SUMMARY)) query.getPresentation().setSummary(asString(value, "")); - else if (key.last().equals(Presentation.REPORT_COVERAGE)) - query.getPresentation().setReportCoverage(asBoolean(value,true)); else if (key.last().equals(Presentation.FORMAT)) query.getPresentation().setFormat(asString(value,"")); else if (key.last().equals(Presentation.TIMING)) query.getPresentation().setTiming(asBoolean(value, true)); else if (key.last().equals(Presentation.SUMMARY_FIELDS)) query.getPresentation().setSummaryFields(asString(value,"")); - else + else if ( ! key.last().equals(Presentation.REPORT_COVERAGE)) // TODO: Change this line to "else" on Vespa 7 throwIllegalParameter(key.last(), Presentation.PRESENTATION); } else if (key.first().equals("rankfeature") || key.first().equals("featureoverride") ) { // featureoverride is deprecated |