git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/-configuration/maestro.json b/server/-configuration/maestro.json
index 18378aabad1145082a1b9eb0b851e820a17b5f90..a65216a29bd6fb6caa6245081b10f4c345dfd043 100644 (file)
--- a/server/-configuration/maestro.json
+++ b/server/-configuration/maestro.json
@@ -2,7 +2,8 @@
        "sourceStoreUri": {\r
                "protocol": "LOCAL",\r
                "uri": "c:/temp",\r
-               "fileFilter": "*.mxf"\r
+               "fileFilter": "*.log;*.bat",\r
+               "showDirectories": true\r
        },\r
        "targets": \r
        [\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/DirectoryFileFilter.java b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/DirectoryFileFilter.java
index b8be6970bdf52e18bedc4fce6c5af704e8cfec5a..755de486490b064a1d5ccd8398eaca276a531d10 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/DirectoryFileFilter.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/DirectoryFileFilter.java
@@ -28,17 +28,25 @@ public class DirectoryFileFilter implements FileFilter {
                if (filters == null || filters.trim().length() == 0)\r
                        return ret;\r
 \r
-               if (!filters.contains("*")) {\r
-                       ret &= name.toLowerCase().contains(filters.toLowerCase());\r
-               } else {\r
-                       if (filters.startsWith("*")) {\r
-                               ret &= name.toLowerCase().endsWith(filters.toLowerCase().replace("*", ""));\r
-                               return ret;\r
-                       }\r
-                       if (filters.endsWith("*")) {\r
-                               ret &= name.toLowerCase().startsWith(filters.toLowerCase().replace("*", ""));\r
-                               return ret;\r
+               String[] tokens = filters.split(";");\r
+               //              if (name.endsWith("echo.bat"))\r
+               //                      System.out.println("");\r
+               for (String token : tokens) {\r
+\r
+                       if (!token.contains("*")) {\r
+                               ret = name.toLowerCase().contains(token.toLowerCase());\r
+                       } else {\r
+                               if (token.startsWith("*")) {\r
+                                       ret = name.toLowerCase().endsWith(token.toLowerCase().replace("*", ""));\r
+                               } else {\r
+                                       if (token.endsWith("*")) {\r
+                                               ret = name.toLowerCase().startsWith(token.toLowerCase().replace("*", ""));\r
+                                       }\r
+                               }\r
                        }\r
+\r
+                       if (ret == true)\r
+                               break;\r
                }\r
 \r
                return ret;\r