From: vasary.daniel <TFS\vasary.daniel>
Date: Thu, 31 Mar 2022 12:20:01 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=f6e8fe4e7089c675313ba108a95bc8db01faef5b;p=mediacube.git

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

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
index f270fc77..35fd6530 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
@@ -193,13 +193,8 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 			}
 		}
 		if (json != null) {
-			result = new ArchiveItem();
-			result.setItemHouseId(json.getString(ITEM_HOUSEID));
-			result.setItemTitle(json.getString(ITEM_TITLE));
-			result.setMediaHouseId(json.getString(MEDIA_HOUSEID));
-			result.setMediaTitle(json.getString(MEDIA_TITLE));
-			result.setMediaDescription(json.getString(MEDIA_DESCRIPTION));
-			result.setMediaType(json.getString(MEDIA_TYPE));
+			logger.info(getSessionMarker(), json.toString());
+			result = ArchiveItem.fromJSONObject(json);
 		}
 
 		if (result == null) {
@@ -209,13 +204,15 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 				mediaHouseId = mediaHouseId.substring(0, mediaHouseId.length() - 2);
 				logger.info(getSessionMarker(), "Checking metadata for {}", mediaHouseId);
 				ArchiveItem metadata = getPlanAirMetadata(mediaHouseId);
-				// elenorizni, hogy ez tenyleg az e
-
 				if (metadata == null)
 					logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);
-				else
+				else {
 					logger.info(getSessionMarker(), "Metadata is available for {}: {}", mediaHouseId,
 							metadata.getMediaTitle());
+
+					if (mediaHouseId.equals(metadata.getForeignMediaId()))
+						result = metadata;
+				}
 			}
 
 		}
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
index a34ca069..6c0d2002 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
@@ -56,6 +56,7 @@ public class ArchiveItem implements Serializable {
 		result.setMediaType(NoSQLUtils.asString(dbObject, MEDIA_TYPE));
 		result.setDuration(NoSQLUtils.asLong(dbObject, DURATION));
 		result.setExistingMediaId(NoSQLUtils.asLong(dbObject, EXISTING_MEDIAID));
+		result.setForeignMediaId(NoSQLUtils.asString(dbObject, FOREIGN_MEDIAID));
 		result.setTags(NoSQLUtils.asDBList(dbObject, TAGS));
 
 		return result;
diff --git a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
index 15c971eb..f49a1dfe 100644
--- a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
+++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
@@ -13,7 +13,7 @@ public class PlanAirAD implements IMetadata {
 	@Override
 	public BasicDBObject asJSON() {
 		BasicDBObject result = new BasicDBObject();
-		result.put("mediaId", mediaID);
+		result.put("foreignMediaId", mediaID);
 		result.put("itemHouseId", mediaID);
 		result.put("itemTitle", title);
 		result.put("mediaHouseId", mediaID);
diff --git a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java
index 8c7e2bcf..c86bd922 100644
--- a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java
+++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java
@@ -24,7 +24,7 @@ public class PlanAirMaterial implements IMetadata {
 	@Override
 	public BasicDBObject asJSON() {
 		BasicDBObject result = new BasicDBObject();
-		result.put("mediaId", mediaID);
+		result.put("foreignMediaId", mediaID);
 		result.put("itemHouseId", programmeID);
 		result.put("itemTitle", progTitle);
 		result.put("mediaHouseId", episodeID);
diff --git a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java
index 08ddb32d..a553428a 100644
--- a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java
+++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java
@@ -18,7 +18,7 @@ public class PlanAirPromo implements IMetadata {
 	@Override
 	public BasicDBObject asJSON() {
 		BasicDBObject result = new BasicDBObject();
-		result.put("mediaId", mediaID);
+		result.put("foreignMediaId", mediaID);
 		result.put("itemHouseId", mediaID);
 		result.put("itemTitle", title);
 		result.put("mediaHouseId", mediaID);