OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Persistence filters allow unquoted units (#4681) 

* allow filters without quotes around units

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
pull/4693/head
Mark Herwege 2025-04-02 20:07:52 +02:00 committed by GitHub
parent a670ddf2ef
commit 69aaf40e0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext
View File

@ -32,7 +32,7 @@ FilterDetails:
; ;
ThresholdFilter: ThresholdFilter:
'>' (relative?='%')? value=DECIMAL unit=STRING? '>' (relative?='%')? value=DECIMAL unit=(UNIT|STRING)?
; ;
TimeFilter: TimeFilter:
@ -48,11 +48,11 @@ NotEqualsFilter:
; ;
IncludeFilter: IncludeFilter:
'[]' lower=DECIMAL upper=DECIMAL unit=STRING? '[]' lower=DECIMAL upper=DECIMAL unit=(UNIT|STRING)?
; ;
NotIncludeFilter: NotIncludeFilter:
'][' lower=DECIMAL upper=DECIMAL unit=STRING? '][' lower=DECIMAL upper=DECIMAL unit=(UNIT|STRING)?
; ;
@ -92,3 +92,7 @@ AliasConfiguration:
DECIMAL returns ecore::EBigDecimal : DECIMAL returns ecore::EBigDecimal :
'-'? INT ('.' INT)? '-'? INT ('.' INT)?
; ;
UNIT:
(('^' INT)|'²'|'³'|'/'|'*'|'·'|'°'|'µ'|'%'|'‰'|'Ω'|'Å'|'('|')'|ID)+
;