diff --git a/src/main/java/org/caosdb/server/query/POV.java b/src/main/java/org/caosdb/server/query/POV.java index 0bd0487989d2430b26bee1a5a2daa595521ca835..99aecf7ff0ec0e8c415ea7a68325de31e0cbaeb9 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 707462e543f412086efee094dfd5932533c16478..9abed098ceacc4b9381b46ac79a407cb1d8a3ca3 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()); } }