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

diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
index f8558bb4490721aedbc488b0e598cb99bff61f7f..8a6630c90d8a548fc4c2c65db7f4eea52be1c1a3 100644 (file)
--- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
@@ -41,7 +41,6 @@ import java.util.TreeMap;
 import java.util.TreeSet;\r
 import java.util.concurrent.TimeUnit;\r
 import java.util.regex.Pattern;\r
-import java.util.stream.Collectors;\r
 \r
 import org.apache.commons.io.FileUtils;\r
 import org.apache.commons.io.FilenameUtils;\r
@@ -1504,17 +1503,20 @@ public class SmallTests {
 //             MediaArea m = new MediaArea(Paths.get(string));\r
 //             System.out.println(m.getFrameCount());\r
 \r
-               Map<String, Integer> inputFiles = new HashMap<String, Integer>();\r
-               inputFiles.put("A", 1);\r
-               inputFiles.put("B", 2);\r
-\r
-               Map<String, Integer> result = inputFiles.entrySet().stream().filter(fileEntry -> {\r
-                       return fileEntry.getValue() > 1;\r
-               }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));\r
+//             Map<String, Integer> inputFiles = new HashMap<String, Integer>();\r
+//             inputFiles.put("A", 1);\r
+//             inputFiles.put("B", 2);\r
+//\r
+//             Map<String, Integer> result = inputFiles.entrySet().stream().filter(fileEntry -> {\r
+//                     return fileEntry.getValue() > 1;\r
+//             }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));\r
+//\r
+//             result.entrySet().forEach(i -> {\r
+//                     System.out.println(i.getKey() + " " + i.getValue());\r
+//             });\r
 \r
-               result.entrySet().forEach(i -> {\r
-                       System.out.println(i.getKey() + " " + i.getValue());\r
-               });\r
+               String mediaHouseId = "XX-1";\r
+               System.out.println(mediaHouseId.substring(0, mediaHouseId.length() - 2));\r
        }\r
 \r
 }\r

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 423bcae5e315dc8e0ec8ef242c35617b00bcff08..c133bcf54a082e9c576f26f7b06e656629de1158 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java
@@ -159,6 +159,23 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
                        result.setMediaDescription(json.getString(MEDIA_DESCRIPTION));\r
                        result.setMediaType(json.getString(MEDIA_TYPE));\r
                }\r
+\r
+               if (result == null) {\r
+                       logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);\r
+\r
+                       if (mediaHouseId.charAt(mediaHouseId.length() - 2) == '-') {\r
+                               mediaHouseId = mediaHouseId.substring(0, mediaHouseId.length() - 2);\r
+                               logger.info(getSessionMarker(), "Checking metadata for {}", mediaHouseId);\r
+                               ArchiveItem metadata = getPlanAirMetadata(mediaHouseId);\r
+                               if (metadata == null)\r
+                                       logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);\r
+                               else\r
+                                       logger.info(getSessionMarker(), "Metadata is available for {}: {}", mediaHouseId,\r
+                                                       metadata.getMediaTitle());\r
+                       }\r
+\r
+               }\r
+\r
                return result;\r
        }\r
 \r
@@ -222,14 +239,9 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
                                tsmSize = tsmFile.getSize();\r
                                sizeEquals = tsmSize == size;\r
 \r
-                               if (archiveItem == null) {\r
-                                       // korabban mentettuk metaadat nelkul\r
-                                       logger.info(getSessionMarker(), "Metadata not available for {}", mediaPath);\r
-                               } else {\r
-                                       if (sizeEquals && !metadataEquals) {\r
-                                               syncMetadata(mediaPath, item, media, archiveItem, mediaFile);\r
-                                               logger.info(getSessionMarker(), "Metadata sync applied for {}", mediaPath);\r
-                                       }\r
+                               if (sizeEquals && archiveItem != null && !metadataEquals) {\r
+                                       syncMetadata(mediaPath, item, media, archiveItem, mediaFile);\r
+                                       logger.info(getSessionMarker(), "Metadata sync applied for {}", mediaPath);\r
                                }\r
 \r
                        }\r