From 2d8e2ec9a797b2942edaa427e9c5b18b42ea7e27 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Tue, 9 Oct 2018 16:46:32 +0200
Subject: [PATCH] BUG: wrong regular expression, for consistency checks
---
.../jobs/core/CheckFileStorageConsistency.java | 2 +-
src/test/java/caosdb/server/Misc.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/main/java/caosdb/server/jobs/core/CheckFileStorageConsistency.java b/src/main/java/caosdb/server/jobs/core/CheckFileStorageConsistency.java
index 43695191..27c13e77 100644
--- a/src/main/java/caosdb/server/jobs/core/CheckFileStorageConsistency.java
+++ b/src/main/java/caosdb/server/jobs/core/CheckFileStorageConsistency.java
@@ -52,7 +52,7 @@ import org.jdom2.output.XMLOutputter;
public class CheckFileStorageConsistency extends FlagJob {
public static final Pattern parseArgs =
- Pattern.compile("\\s*-t\\s*([0-1]+)\\s*|\\s*-c\\s*([^\\s]+)\\s*|\\s*([^\\s]+\\s*)");
+ Pattern.compile("\\s*-t\\s*([0-9]+)\\s*|\\s*-c\\s*([^\\s]+)\\s*|\\s*([^\\s]+\\s*)");
private int timeout = 1000 * 30; // milliseconds
private String location = "";
diff --git a/src/test/java/caosdb/server/Misc.java b/src/test/java/caosdb/server/Misc.java
index 25a8c701..625213e9 100644
--- a/src/test/java/caosdb/server/Misc.java
+++ b/src/test/java/caosdb/server/Misc.java
@@ -120,6 +120,18 @@ public class Misc {
assertEquals("SOMETEST", matcher.group(2));
assertNull(matcher.group(1));
assertFalse(matcher.find());
+
+ matcher = parseargs.matcher("-t 12000/ExperimentalData");
+ assertTrue(matcher.find());
+ assertEquals("-t 12000", matcher.group(0));
+ assertEquals("12000", matcher.group(1));
+ assertNull(matcher.group(2));
+ assertNull(matcher.group(3));
+ assertTrue(matcher.find());
+ assertEquals("/ExperimentalData", matcher.group(0));
+ assertNull(matcher.group(1));
+ assertNull(matcher.group(2));
+ assertFalse(matcher.find());
}
@Test
--
GitLab