From 3b32aa637af722a81c6485a5d4de00de141f87e0 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 27 Jan 2010 14:30:48 +0000
Subject: [PATCH] LMS-1349 Fixing translation of user-specified regex patterns
(with "regexp" prefix) to patterns meant for server consumption.
SVN: 14495
---
.../client/application/util/DataSetUtils.java | 3 +++
.../client/web/test/DataSetUtilsTest.java | 17 +++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
index 8e191fc2fd9..c6b2e1aab93 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
@@ -94,6 +94,9 @@ public class DataSetUtils
result = StringUtils.escape(result, REGEXP_METACHARACTERS_TO_ESCAPE);
result = result.replace("*", ".*");
result = result.replace("?", ".");
+ } else
+ {
+ result = result.substring(REGEXP_PREFIX.length());
}
return result;
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/DataSetUtilsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/DataSetUtilsTest.java
index 071652c3ac2..5012d29b933 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/DataSetUtilsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/DataSetUtilsTest.java
@@ -33,14 +33,15 @@ public class DataSetUtilsTest extends AssertJUnit
{
return new Object[][]
{
- { DataSetUtils.REGEXP_PREFIX + "file_.+\\.*",
- DataSetUtils.REGEXP_PREFIX + "file_.+\\.*" },
- { "file$^.|(1){2}<3>+", "file\\$\\^\\.\\|\\(1\\)\\{2\\}\\<3\\>\\+" },
- { "dir\\file", "dir\\\\file" },
- { "file.*", "file\\..*" },
- { "file.?", "file\\.." },
- { "*.tsv", ".*\\.tsv" },
- { "file[0-9].txt", "file[0-9]\\.txt" },
+ { DataSetUtils.REGEXP_PREFIX + "file_.+\\.*", "file_.+\\.*" },
+ { "file$^.|(1){2}<3>+", "file\\$\\^\\.\\|\\(1\\)\\{2\\}\\<3\\>\\+" },
+ { "dir\\file", "dir\\\\file" },
+ { "file.*", "file\\..*" },
+ { "file.?", "file\\.." },
+ { "*.tsv", ".*\\.tsv" },
+ { "file[0-9].txt", "file[0-9]\\.txt" },
+ { "*.", ".*\\." },
+ { ".*", "\\..*" }
};
}
--
GitLab