diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2018-10-29 10:17:30 +0000 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:24 +0100 |
| commit | a6505c115457b87884fe2132b83afc352e8af31a (patch) | |
| tree | 0e5abd0690eca4c3159412e55851d84b7af8de29 /config-model/src/main/javacc/SDParser.jj | |
| parent | b82f37f83b8cfdf562160065cb14f0454b3d0cc0 (diff) | |
remove "header" and "body" keywords
Diffstat (limited to 'config-model/src/main/javacc/SDParser.jj')
| -rw-r--r-- | config-model/src/main/javacc/SDParser.jj | 68 |
1 files changed, 3 insertions, 65 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 19c410b4b98..966ef46f6ac 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -265,8 +265,6 @@ TOKEN : | < STEMMING: "stemming" > | < NORMALIZING: "normalizing" > | < BOLDING: "bolding" > -| < BODY: "body" > -| < HEADER: "header" > | < NONE: "none" > | < ON: "on" > | < OFF: "off" > @@ -538,35 +536,13 @@ Object documentBody(SDDocumentType document, Search search) : { ( annotation(search, document) | compression(document, null) - | headercfg(document) - | bodycfg(document) | structInside(document, search) | field(document, search) ) { return null; } } /** - * Consumes a document head block. - * - * @param document The document type to modify. - */ -void headercfg(SDDocumentType document) : { } -{ - <HEADER> lbrace() [compression(document, "header") (<NL>)*] <RBRACE> -} - -/** - * Consumes a document body block. - * - * @param document The document type to modify. - */ -void bodycfg(SDDocumentType document) : { } -{ - <BODY> lbrace() [compression(document, "body") (<NL>)*] <RBRACE> -} - -/** - * Consumes a compression block. This can be set in both document header and -body block. + * Consumes a compression block. * * @param document The document type to modify. * @param name The name of the document block to modify. @@ -578,12 +554,8 @@ void compression(SDDocumentType document, String name) : { <COMPRESSION> lbrace() (cfg = compressionItem(cfg) (<NL>)*)* <RBRACE> { - if (name == null || name.equals("header")) { - document.getDocumentType().contentStruct().setCompressionConfig(cfg); - } - if (name == null || name.equals("body")) { - document.getDocumentType().getBodyType().setCompressionConfig(cfg); - } + document.getDocumentType().contentStruct().setCompressionConfig(cfg); + document.getDocumentType().getBodyType().setCompressionConfig(cfg); } } @@ -966,10 +938,8 @@ String fieldBody(SDField field, Search search, SDDocumentType document) : { } { ( alias(field) | attribute(field) | - body(field) | bolding(field) | fieldStemming(field) | - header(field) | id(field, document) | summaryInField(field) | index(search, field) | @@ -1496,36 +1466,6 @@ void bolding(FieldOperationContainer field) : } } -/** - * This rule consumes a body statement of a field element. - * - * @param field The field to modify. - */ -void body(SDField field) : { } -{ - <BODY> - { - deployLogger.log(Level.WARNING, field + ": 'header/body' is deprecated and has no effect."); - field.setHeader(false); - field.setHeaderOrBodyDefined(true); - } -} - -/** - * This rule consumes a header statement of a field element. - * - * @param field The field to modify. - */ -void header(SDField field) : { } -{ - <HEADER> - { - deployLogger.log(Level.WARNING, field + ": 'header/body' is deprecated and has no effect."); - field.setHeader(true); - field.setHeaderOrBodyDefined(true); - } -} - void queryCommand(FieldOperationContainer container) : { String command; @@ -2481,7 +2421,6 @@ String identifier() : { } | <AS> | <ASCENDING> | <ATTRIBUTE> - | <BODY> | <BOLDING> | <COMPRESSION> | <COMPRESSIONLEVEL> @@ -2511,7 +2450,6 @@ String identifier() : { } | <FULL> | <FUNCTION> | <GRAM> - | <HEADER> | <HUGE> | <ID> | <IDENTICAL> |