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

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 f270fc7767b35f453a04ecf0d3b3c8dcb86b7197..35fd6530a99b3e73d40f3edd9412a8d4be21c871 100644 (file)
--- 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> {
                        }\r
                }\r
                if (json != null) {\r
-                       result = new ArchiveItem();\r
-                       result.setItemHouseId(json.getString(ITEM_HOUSEID));\r
-                       result.setItemTitle(json.getString(ITEM_TITLE));\r
-                       result.setMediaHouseId(json.getString(MEDIA_HOUSEID));\r
-                       result.setMediaTitle(json.getString(MEDIA_TITLE));\r
-                       result.setMediaDescription(json.getString(MEDIA_DESCRIPTION));\r
-                       result.setMediaType(json.getString(MEDIA_TYPE));\r
+                       logger.info(getSessionMarker(), json.toString());\r
+                       result = ArchiveItem.fromJSONObject(json);\r
                }\r
 \r
                if (result == null) {\r
@@ -209,13 +204,15 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
                                mediaHouseId = mediaHouseId.substring(0, mediaHouseId.length() - 2);\r
                                logger.info(getSessionMarker(), "Checking metadata for {}", mediaHouseId);\r
                                ArchiveItem metadata = getPlanAirMetadata(mediaHouseId);\r
-                               // elenorizni, hogy ez tenyleg az e\r
-\r
                                if (metadata == null)\r
                                        logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);\r
-                               else\r
+                               else {\r
                                        logger.info(getSessionMarker(), "Metadata is available for {}: {}", mediaHouseId,\r
                                                        metadata.getMediaTitle());\r
+\r
+                                       if (mediaHouseId.equals(metadata.getForeignMediaId()))\r
+                                               result = metadata;\r
+                               }\r
                        }\r
 \r
                }\r

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 a34ca0690fdd22562d1989a94912246e053cd0fd..6c0d20022916eb0ea06fadef414651192d77a461 100644 (file)
--- 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));\r
                result.setDuration(NoSQLUtils.asLong(dbObject, DURATION));\r
                result.setExistingMediaId(NoSQLUtils.asLong(dbObject, EXISTING_MEDIAID));\r
+               result.setForeignMediaId(NoSQLUtils.asString(dbObject, FOREIGN_MEDIAID));\r
                result.setTags(NoSQLUtils.asDBList(dbObject, TAGS));\r
 \r
                return result;\r

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 15c971eb1ae9cefe02abb8fd7cc85099ea241a90..f49a1dfec86d688229ed78ee100a3ad8ed582619 100644 (file)
--- 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\r
        public BasicDBObject asJSON() {\r
                BasicDBObject result = new BasicDBObject();\r
-               result.put("mediaId", mediaID);\r
+               result.put("foreignMediaId", mediaID);\r
                result.put("itemHouseId", mediaID);\r
                result.put("itemTitle", title);\r
                result.put("mediaHouseId", mediaID);\r

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 8c7e2bcfdcec44f778daf96b323ddc8427741dfa..c86bd92238c482a6f4a6b52876660bd0b0faef2a 100644 (file)
--- 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\r
        public BasicDBObject asJSON() {\r
                BasicDBObject result = new BasicDBObject();\r
-               result.put("mediaId", mediaID);\r
+               result.put("foreignMediaId", mediaID);\r
                result.put("itemHouseId", programmeID);\r
                result.put("itemTitle", progTitle);\r
                result.put("mediaHouseId", episodeID);\r

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 08ddb32d1795d5dcbb2fe5ce9c6ec9caa48c8bb5..a553428a9514156a04bfc782acec2518da4ded05 100644 (file)
--- 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\r
        public BasicDBObject asJSON() {\r
                BasicDBObject result = new BasicDBObject();\r
-               result.put("mediaId", mediaID);\r
+               result.put("foreignMediaId", mediaID);\r
                result.put("itemHouseId", mediaID);\r
                result.put("itemTitle", title);\r
                result.put("mediaHouseId", mediaID);\r