diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-10-12 19:37:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 19:37:50 +0200 |
commit | dbbf9308d6bf57843895cf9783fb71bf82c00632 (patch) | |
tree | ab2e1d13d3da1ac815b89694e0962568c7188c7e /container-search/src/main/java/com/yahoo/search/query/properties | |
parent | 7da60e9bf0aaa04eee3b5fdc9ec0bdd107b3c581 (diff) |
Revert "Remove coverage attribute on query"
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/properties')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java | 6 |
1 files changed, 4 insertions, 2 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 7d2ebd2a0ec..cd4e02dc768 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 true; // TODO: Remove this line on Vespa 7 + if (key.last().equals(Presentation.REPORT_COVERAGE)) return query.getPresentation().getReportCoverage(); 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,13 +227,15 @@ 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 if ( ! key.last().equals(Presentation.REPORT_COVERAGE)) // TODO: Change this line to "else" on Vespa 7 + else throwIllegalParameter(key.last(), Presentation.PRESENTATION); } else if (key.first().equals("rankfeature") || key.first().equals("featureoverride") ) { // featureoverride is deprecated |