From: vasary.daniel Date: Mon, 21 Mar 2022 20:15:30 +0000 (+0000) Subject: Metaadat szinkronizacio X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=65f78e222a99bd5decfae79592d1d996658a4d17;p=mediacube.git Metaadat szinkronizacio git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33071 --- diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java index 7ea6612b..423bcae5 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java @@ -12,6 +12,7 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.io.FilenameUtils; +import org.apache.ibatis.jdbc.SQL; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -88,6 +89,11 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor mfList = mfDAO.getByHouseId(fileName); if (mfList != null && mfList.size() == 1) result = (MediaFile) mfList.get(0); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java index bd9a89bf..143a9920 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java @@ -292,7 +292,9 @@ public class SafeDeleteRecursive extends JobStep implements FileVisitor { Media media = getManager().getMedia(mediaFile.getMediaId()); mcArchivedDate = media.getCreated(); Item item = getManager().getItem(media.getItemId()); - metadataEquals = checkArchiveItem(mediaPath, archiveItem, item, media); + + // mivel nincs metaadat, nem ellenorizheto + metadataEquals = archiveItem == null || checkArchiveItem(mediaPath, archiveItem, item, media); // tsm String tsmFileName = mediaFile.getRelativePath();