LMS-1349 Fixing translation of user-specified regex patterns (with "regexp"...

LMS-1349 Fixing translation of user-specified regex patterns (with "regexp" prefix) to patterns meant for server consumption.

SVN: 14495

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;
     }

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" },
+                { "*.", ".*\\." },
+                { ".*", "\\..*" }
 
             };
     }