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

diff --git a/client/Maestro/Configuration/editor-mv.json b/client/Maestro/Configuration/editor-mv.json
index 5645a4dce399fc335bf6df02e59ba8e03ac11f70..52ddf170c5705c0027f2fb8ba18939ef24707392 100644 (file)
--- a/client/Maestro/Configuration/editor-mv.json
+++ b/client/Maestro/Configuration/editor-mv.json
@@ -12,13 +12,7 @@
                "$type": "UNCSource",\r
                "filter": "avi,wav,mxf,mts",\r
                "local": {\r
-                       "address": "file://d:/_video",\r
-                       "timeout": 1000\r
-               },\r
-               "remote": {\r
-                       "address": "ftp://10.11.1.100/Promise/",\r
-                       "userName": "editor1",\r
-                       "password": "mBsAKn0RRr+lErAWAu+oMD/3CRxlBLNvm3UB84SKl5KBVYD5+wIANFL0eszfbAUtzYKqdN/dEB/6ItBNz9D6C4/hppcYrg0+73+xFW9KYEwd2KfgHaH5uslbA/8IyI/U",\r
+                       "address": "file://c:/_video",\r
                        "timeout": 1000\r
                }\r
        },\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index c6032a96f377df0e7a70f3b278d6453ae1be237d..181497a6480d63654473788327851a5a885f88d1 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -241,7 +241,11 @@ namespace Maestro {
         private ArchiveMetadata GetArchiveMetadata() {\r
             ArchiveMetadata result = null;\r
             Cursor.Current = Cursors.WaitCursor;\r
-            MetadataType metadataType = MetadataTypeUtil.Guess(textSelectedMetadata.Text);\r
+\r
+\r
+            //MetadataType metadataType = MetadataTypeUtil.Guess(textSelectedMetadata.Text);\r
+            MetadataType metadataType = SelectedMetadata.Kind;\r
+\r
             switch (metadataType) {\r
                 case MetadataType.None:\r
                 case MetadataType.MediaCube:\r
@@ -311,7 +315,10 @@ namespace Maestro {
             List<TrafficItemMetadata> trafficResult = null;\r
             switch (metadataType) {\r
                 case MetadataType.TrafficMaterial:\r
-                    trafficResult = api.GetMaterialMetadata(id);\r
+                    if (SelectedMetadata.MetaDataID != null)\r
+                        trafficResult = api.GetMaterialMetadata(SelectedMetadata.MetaDataID);\r
+                    else\r
+                        trafficResult = api.GetMaterialMetadata(id);\r
                     break;\r
                 case MetadataType.TrafficPromo:\r
                     trafficResult = api.GetPromoArchiveMetadata(id);\r
@@ -328,8 +335,8 @@ namespace Maestro {
             result.itemTitle = actualResult.ProgTitle;\r
             result.itemDescription = actualResult.ProgDescription;\r
             result.mediaHouseId = actualResult.EpisodeID;\r
-            result.mediaTitle = !string.IsNullOrEmpty(actualResult.EpisodeTitle) ? actualResult.EpisodeTitle : actualResult.ProgTitle;\r
-            result.mediaDescription = actualResult.EpisodeDescription;\r
+            result.mediaTitle = !string.IsNullOrEmpty(actualResult.EpisodeTitle) && SelectedMetadata.MetaDataID == null ? actualResult.EpisodeTitle : actualResult.ProgTitle;\r
+            result.mediaDescription = SelectedMetadata.MetaDataID == null ? null : actualResult.EpisodeDescription;\r
             result.ok = actualResult.OK;\r
             return result;\r
         }\r
@@ -423,10 +430,13 @@ namespace Maestro {
             SelectedMetadata = new MetadataInfo() {\r
                 Kind = metadataType,\r
                 ID = btnUseEpisodeID.Checked ? serialID : id,\r
+                //csak arra hasznaljuk, hogy a metaadat lekeres mukodjon\r
+                MetaDataID = btnUseEpisodeID.Checked ? id : null,\r
                 MetadataText = text,\r
                 VariantID = variantID,\r
                 Selected = selected\r
             };\r
+\r
             TrafficMetadata metadata = MetadataProvider.Get<TrafficMetadata>(Configuration.Metadatas);\r
             if (true.Equals(metadata?.RedefineSegments))\r
                 CheckIfRedefineSegments();\r

diff --git a/client/Maestro/Metadata/MetaDataInfo.cs b/client/Maestro/Metadata/MetaDataInfo.cs
index dec051610460422cb02937390bd5389fd9e25efa..aad389b55c8fc143f9155e3ab76ec4d69737cfb7 100644 (file)
--- a/client/Maestro/Metadata/MetaDataInfo.cs
+++ b/client/Maestro/Metadata/MetaDataInfo.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 namespace Maestro.Metadata {\r
     public class MetadataInfo {\r
         public string ID { get; set; }\r
+        public string MetaDataID { get; set; }\r
         public string MetadataText { get; set; }\r
         public MetadataType Kind { get; set; }\r
         public int VariantID { get; set; }\r