#311

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

diff --git a/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java b/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java
index 2b2a13bac9f6b87bbd80c612ae518277c9f1c3b5..48580358325bfd3500335dc32e0d1c7658ac28d5 100644 (file)
--- a/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java
+++ b/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java
@@ -41,6 +41,7 @@ public class MoveJpegToIsilonStep extends JobStep {
                sourceStoreUri.setProtocol(RemoteStoreProtocol.valueOf(sourceProtocol));\r
 \r
                FileVisitor<Path> visitor = new SimpleFileVisitor<Path>() {\r
+                       boolean isFolderDateBeforeNow = false;\r
                        String fileNamePattern = "yyyymmdd";\r
                        SimpleDateFormat dateFormatter = new SimpleDateFormat(fileNamePattern);\r
                        Date currentDate = new Date(); // initializes with the current date\r
@@ -52,22 +53,26 @@ public class MoveJpegToIsilonStep extends JobStep {
                                        if (Files.isDirectory(path)) {\r
                                                dateFromFileName = dateFormatter.parse(path.toString().substring(0, 8));\r
                                                if (!(dateFromFileName.compareTo(currentDate) > 0)) {\r
+                                                       isFolderDateBeforeNow = false;\r
                                                        return FileVisitResult.SKIP_SUBTREE;\r
                                                } else {\r
+                                                       isFolderDateBeforeNow = true;\r
                                                        return FileVisitResult.CONTINUE;\r
                                                }\r
                                        } else {\r
-                                               String fileExtension = FilenameUtils.getExtension(path.toString());\r
-\r
-                                               if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) {\r
-                                                       logger.info("path: {}", path.toString());\r
-                                                       foundItems.add(path.toString());\r
-                                                       StoreUri targetStoreUri = getManager()\r
-                                                                       .createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri);\r
-                                                       targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol));\r
-                                                       targetStoreUri.setRootPath(targetFolder);\r
-\r
-                                                       copyFile(path, Paths.get(targetStoreUri.getRootPath()));\r
+                                               if (isFolderDateBeforeNow) {\r
+                                                       String fileExtension = FilenameUtils.getExtension(path.toString());\r
+\r
+                                                       if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) {\r
+                                                               logger.info("path: {}", path.toString());\r
+                                                               foundItems.add(path.toString());\r
+                                                               StoreUri targetStoreUri = getManager()\r
+                                                                               .createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri);\r
+                                                               targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol));\r
+                                                               targetStoreUri.setRootPath(targetFolder);\r
+\r
+                                                               copyFile(path, Paths.get(targetStoreUri.getRootPath()));\r
+                                                       }\r
                                                }\r
                                        }\r
                                } catch (ParseException e) {\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MoveJpegToIsilonStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MoveJpegToIsilonStep.java
index 2b2a13bac9f6b87bbd80c612ae518277c9f1c3b5..48580358325bfd3500335dc32e0d1c7658ac28d5 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MoveJpegToIsilonStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MoveJpegToIsilonStep.java
@@ -41,6 +41,7 @@ public class MoveJpegToIsilonStep extends JobStep {
                sourceStoreUri.setProtocol(RemoteStoreProtocol.valueOf(sourceProtocol));\r
 \r
                FileVisitor<Path> visitor = new SimpleFileVisitor<Path>() {\r
+                       boolean isFolderDateBeforeNow = false;\r
                        String fileNamePattern = "yyyymmdd";\r
                        SimpleDateFormat dateFormatter = new SimpleDateFormat(fileNamePattern);\r
                        Date currentDate = new Date(); // initializes with the current date\r
@@ -52,22 +53,26 @@ public class MoveJpegToIsilonStep extends JobStep {
                                        if (Files.isDirectory(path)) {\r
                                                dateFromFileName = dateFormatter.parse(path.toString().substring(0, 8));\r
                                                if (!(dateFromFileName.compareTo(currentDate) > 0)) {\r
+                                                       isFolderDateBeforeNow = false;\r
                                                        return FileVisitResult.SKIP_SUBTREE;\r
                                                } else {\r
+                                                       isFolderDateBeforeNow = true;\r
                                                        return FileVisitResult.CONTINUE;\r
                                                }\r
                                        } else {\r
-                                               String fileExtension = FilenameUtils.getExtension(path.toString());\r
-\r
-                                               if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) {\r
-                                                       logger.info("path: {}", path.toString());\r
-                                                       foundItems.add(path.toString());\r
-                                                       StoreUri targetStoreUri = getManager()\r
-                                                                       .createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri);\r
-                                                       targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol));\r
-                                                       targetStoreUri.setRootPath(targetFolder);\r
-\r
-                                                       copyFile(path, Paths.get(targetStoreUri.getRootPath()));\r
+                                               if (isFolderDateBeforeNow) {\r
+                                                       String fileExtension = FilenameUtils.getExtension(path.toString());\r
+\r
+                                                       if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) {\r
+                                                               logger.info("path: {}", path.toString());\r
+                                                               foundItems.add(path.toString());\r
+                                                               StoreUri targetStoreUri = getManager()\r
+                                                                               .createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri);\r
+                                                               targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol));\r
+                                                               targetStoreUri.setRootPath(targetFolder);\r
+\r
+                                                               copyFile(path, Paths.get(targetStoreUri.getRootPath()));\r
+                                                       }\r
                                                }\r
                                        }\r
                                } catch (ParseException e) {\r