From 32c737f9de7b6852ee10b73bad796127c573d7b5 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 26 May 2021 11:28:04 +0200
Subject: [PATCH] fix unit rule

---
 src/main/java/org/caosdb/server/query/CQLParser.g4 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/caosdb/server/query/CQLParser.g4 b/src/main/java/org/caosdb/server/query/CQLParser.g4
index b2e3cb5d..6aea8c55 100644
--- a/src/main/java/org/caosdb/server/query/CQLParser.g4
+++ b/src/main/java/org/caosdb/server/query/CQLParser.g4
@@ -495,8 +495,10 @@ number_with_unit
 
 unit
 :
-	(~(WHITE_SPACE | DOT))+
-	| NUM SLASH (~(WHITE_SPACE | DOT))+
+	(~(WHITE_SPACE | WHICH | HAS_A | WITH | WHERE | DOT | AND | OR ))
+	(~(WHITE_SPACE))*
+	|
+	NUM SLASH (~(WHITE_SPACE))+
 ;
 
 location returns [String str]
-- 
GitLab