From 149edf1f0cb04a0731072473c1420cf5bee9ef0a Mon Sep 17 00:00:00 2001
From: Daniel Hornung <d.hornung@indiscale.com>
Date: Tue, 21 Jun 2022 17:04:39 +0200
Subject: [PATCH] WIP: Undoing number pattern in query.
---
src/main/java/org/caosdb/server/query/POV.java | 4 ++--
src/test/java/org/caosdb/server/query/TestCQL.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/caosdb/server/query/POV.java b/src/main/java/org/caosdb/server/query/POV.java
index 0bd04879..99aecf7f 100644
--- a/src/main/java/org/caosdb/server/query/POV.java
+++ b/src/main/java/org/caosdb/server/query/POV.java
@@ -134,8 +134,8 @@ public class POV implements EntityFilterInterface {
this.vDouble = (double) this.vInt;
} else {
try {
- final Pattern dp = Pattern.compile("^(-?[0-9]+(?:(\\.)?[0-9]+))\\s*([^-]*)$");
- // final Pattern dp = Pattern.compile("^(-?[0-9]+(?:\\.[0-9]+))\\s*([^-]*)$");
+ // final Pattern dp = Pattern.compile("^(-?[0-9]+(?:(\\.)?[0-9]+))\\s*([^-]*)$");
+ final Pattern dp = Pattern.compile("^(-?[0-9]+(?:\\.[0-9]+))\\s*([^-]*)$");
final Matcher m = dp.matcher(value);
if (!m.matches()) {
throw new NumberFormatException();
diff --git a/src/test/java/org/caosdb/server/query/TestCQL.java b/src/test/java/org/caosdb/server/query/TestCQL.java
index 707462e5..9abed098 100644
--- a/src/test/java/org/caosdb/server/query/TestCQL.java
+++ b/src/test/java/org/caosdb/server/query/TestCQL.java
@@ -240,7 +240,7 @@ public class TestCQL {
String queryIssue132b = "FIND ENTITY WHICH HAS BEEN CREATED TODAY BY ME";
String queryIssue134 = "SELECT pname FROM ename";
String queryIssue131 = "FIND ENTITY WITH pname = 13 €";
- String queryIssue145 = "FIND ENTITY WITH pname145 = 100000000000000000000";
+ String queryIssue145 = "FIND ENTITY WITH pname145 = 10000000000";
// File paths ///////////////////////////////////////////////////////////////
String filepath_verb01 = "/foo/";
@@ -6924,12 +6924,12 @@ public class TestCQL {
final CqContext sfq = parser.cq();
System.out.println(sfq.toStringTree(parser));
- // assertEquals("POV(pname145,=,10000000000)", sfq.filter.toString());
+ assertEquals("POV(pname145,=,10000000000)", sfq.filter.toString());
// assert value
POV pov = ((POV) sfq.filter);
System.out.println(pov.getValue());
- // // assertEquals("10000000000", pov.getValue());
- // assertEquals("Double", pov.getValueType());
+ assertEquals("10000000000", pov.getValue());
+ assertEquals("Double", pov.getValueType());
}
}
--
GitLab