From: Sweidan Omar <TFS\sweidan.omar>
Date: Mon, 24 Jan 2022 14:04:14 +0000 (+0000)
Subject: #311
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=0b725d1a4f1b21ec8627dfbf7d9a7d2ea4feaa6b;p=mediacube.git

#311

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

diff --git a/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java b/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java
index 78ca210f..2b2a13ba 100644
--- a/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java
+++ b/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java
@@ -29,21 +29,16 @@ public class MoveJpegToIsilonStep extends JobStep {
 	public Object[] execute(String sourceUri, String sourceProtocol, String sourceFolder, String targetUri,
 			String targetProtocol, String targetFolder, String userName, String password, int port) throws Exception {
 		StoreUri sourceStoreUri = new StoreUri(sourceUri);
-//		StoreUri targetStoreUri = new StoreUri(targetUri);
 		if (sourceFolder.endsWith("/")) {
 			sourceFolder = sourceFolder.substring(0, sourceFolder.length() - 1);
 		}
 
-//		logger.info("sourceFolder: {}", sourceFolder);
 		List<String> foundItems = new ArrayList<>();
 		sourceStoreUri.setRootPath(sourceFolder);
 		sourceStoreUri.setPortNumber(port);
 		sourceStoreUri.setPassword(password);
 		sourceStoreUri.setUserName(userName);
 		sourceStoreUri.setProtocol(RemoteStoreProtocol.valueOf(sourceProtocol));
-//		logger.info("sourceStoreUri.toString(): {}", sourceStoreUri.toString());
-
-//		targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol));
 
 		FileVisitor<Path> visitor = new SimpleFileVisitor<Path>() {
 			String fileNamePattern = "yyyymmdd";
@@ -67,18 +62,12 @@ public class MoveJpegToIsilonStep extends JobStep {
 						if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) {
 							logger.info("path: {}", path.toString());
 							foundItems.add(path.toString());
-//							logger.info("getRootPath(): {}", sourceStoreUri.getRootPath());
 							StoreUri targetStoreUri = getManager()
 									.createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri);
 							targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol));
 							targetStoreUri.setRootPath(targetFolder);
 
-//							if (!targetStoreUri.fileExists(URLEncoder.encode(path.toString(), "UTF-8"))) {
-							logger.info("Paths.get(targetStoreUri.getRootPath()): {}", targetStoreUri.getRootPath());
 							copyFile(path, Paths.get(targetStoreUri.getRootPath()));
-//								getManager().createStore();
-//								getPathUntilCurrentFile(sourceStoreUri.getRootPath().toString(), path), "" );
-//							}
 						}
 					}
 				} catch (ParseException e) {
@@ -108,7 +97,7 @@ public class MoveJpegToIsilonStep extends JobStep {
 		}
 
 		logger.info("Found {} files", foundItems.size());
-		logger.info("files: {}", foundItems);
+		logger.info("foundItems: {}", foundItems);
 		return new Object[] { foundItems };
 	}
 
@@ -146,7 +135,6 @@ public class MoveJpegToIsilonStep extends JobStep {
 			}
 		}
 
-//		logger.info("Path until file: {}", fullPath.toString().replace(tempRootfolder, ""));
 		return fullPath.toString().replace(rootFolder, "").substring(1);
 	}
 }