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

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java
index 3dcaeb1164d9e8cd937d5bee85f0019892848f19..ed6fc097e5967f9ce8e2fead871e3c60dea71240 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java
@@ -28,8 +28,12 @@ import com.ibm.nosql.json.api.DB;
 import com.ibm.nosql.json.api.DBCollection;\r
 import com.ibm.nosql.json.api.QueryBuilder;\r
 \r
+import user.commons.IEntityBase;\r
 import user.commons.MediaCubeMarker;\r
 import user.commons.nosql.NoSQLUtils;\r
+import user.jobengine.db.IItemManager;\r
+import user.jobengine.db.MediaFile;\r
+import user.jobengine.db.MediaFileDAO;\r
 import user.mediacube.metadata.interfaces.IMetadata;\r
 import user.mediacube.metadata.interfaces.IMetadataProvider;\r
 import user.mediacube.metadata.interfaces.IMetadataProviderFactory;\r
@@ -227,15 +231,23 @@ public class HSMMigrateStep extends JobStep {
        //true if need copy\r
        public boolean prepareCopy(String hsmFileName, Path source, Path target) throws IOException {\r
                boolean result = true;\r
-               File sourceFile = source.toFile();\r
-               File targetFile = target.toFile();\r
-\r
                BasicDBObject excludeResult = queryExclude(hsmFileName);\r
                if (excludeResult != null) {\r
-                       logger.warn(marker, "Kivételként megjelölt: {}", hsmFileName, excludeResult.get("name"));\r
+                       logger.warn(marker, "Kivételként megjelölt: {}", hsmFileName);\r
                        return false;\r
                }\r
 \r
+               IItemManager manager = (IItemManager) jobRuntime.getPersister();\r
+               MediaFileDAO mfDAO = (MediaFileDAO) manager.getBaseDAO(MediaFile.class);\r
+               List<IEntityBase> mediaFiles = mfDAO.getByHouseId(source.getFileName().toString());\r
+               if (mediaFiles != null && mediaFiles.size() > 0) {\r
+                       logger.warn(marker, "Már archivált: {}", hsmFileName);\r
+                       return false;\r
+               }\r
+\r
+               File sourceFile = source.toFile();\r
+               File targetFile = target.toFile();\r
+\r
                if (!sourceFile.exists()) {\r
                        logger.warn(marker, "A forrás nem elérhető: {}", source);\r
                        return false;\r