diff options
Diffstat (limited to 'config-model/src/main/javacc/SDParser.jj')
| -rw-r--r-- | config-model/src/main/javacc/SDParser.jj | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 40da779dd20..d1c67a6d425 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -286,6 +286,7 @@ TOKEN : | < SOURCE: "source" > | < TO: "to" > | < DIRECT: "direct" > +| < FROMDISK: "from-disk" > | < ALWAYS: "always" > | < ONDEMAND: "on-demand" > | < NEVER: "never" > @@ -1715,9 +1716,16 @@ Object documentSummary(Search search) : } { ( ( <DOCUMENTSUMMARY> | - <SUMMARY> { deployLogger.log(Level.WARNING, "Directive 'summary' is deprecated, use 'document-summary' instead."); } ) + <SUMMARY> { deployLogger.log(Level.WARNING, "Directive 'summary' is deprecated, use 'document-summary' instead."); } ) // TODO: Remove on Vespa 7 name = identifier() { search.addSummary(summary = new DocumentSummary(name)); } - lbrace() (documentSummaryItem(summary) (<NL>)*)* <RBRACE> ) + lbrace() + ( + <FROMDISK> { summary.setFromDisk(true); } | + documentSummaryItem(summary) | + <NL> + )* + <RBRACE> + ) { return null; } } |