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

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 7730eb747dec464535b1bfde7d767bfd54bf77c6..12da38af9796bcd621612f8bf2b1a8846b7c2df6 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -89,7 +89,7 @@ namespace TrafficClient {
             return segmentWorker.GetADSegments(strParam);\r
         }\r
 \r
-        public string CreateMaterialVersion(string episodeID) {\r
+        public TrafficVersion CreateMaterialVersion(string episodeID) {\r
             return materialWorker.CreateMaterialVersion(episodeID);\r
         }\r
     }\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 8ff4e0e7ebbfae04ac35fadf152600628f6a11b6..921d8aa58001d7e5c77edd8578c74c6bcf0eeb43 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -94,8 +94,10 @@ namespace TrafficClient {
         private void OnSelectionChanged(DataGridViewRow actualRow) {\r
             TrafficItem res = actualRow.DataBoundItem as TrafficItem;\r
             if (String.IsNullOrEmpty(res.MediaID)) {\r
-                res.MediaID = trafficAPI.CreateMaterialVersion(res.EpisodeID);\r
-                if (String.IsNullOrEmpty(res.MediaID))\r
+                TrafficVersion v = trafficAPI.CreateMaterialVersion(res.EpisodeID);\r
+                res.MediaID = v.MediaID;\r
+                res.VariantID = v.VariantID;\r
+                if (res.VariantID == 0 || String.IsNullOrEmpty(res.MediaID))\r
                     return;\r
             }\r
             DataGridViewCheckBoxCell actualCell = actualRow.Cells[0] as DataGridViewCheckBoxCell;\r
@@ -139,6 +141,11 @@ namespace TrafficClient {
         public string EpisodeID { get; set; }\r
     }\r
 \r
+    public class TrafficVersion {\r
+        public string MediaID { get; set; }\r
+        public int VariantID { get; set; }\r
+    }\r
+\r
     public class TrafficItemMetadata {\r
         public string ProgTitle { get; set; }\r
         public string ProgDescription { get; set; }\r

diff --git a/client/PlanAIRClient/Workers/MaterialWorker.cs b/client/PlanAIRClient/Workers/MaterialWorker.cs
index a27e55e7e586d3e0bcf874d36caebd7255f1555f..01732efc7c073ceb88a221685ddf31e7e33762b5 100644 (file)
--- a/client/PlanAIRClient/Workers/MaterialWorker.cs
+++ b/client/PlanAIRClient/Workers/MaterialWorker.cs
@@ -111,8 +111,8 @@ namespace TrafficClient.Workers {
             return result;\r
         }\r
 \r
-        public string CreateMaterialVersion(string episodeID) {\r
-            string result = null;\r
+        public TrafficVersion CreateMaterialVersion(string episodeID) {\r
+            TrafficVersion result = null;\r
             try {\r
                 TryConnect();\r
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
@@ -126,8 +126,12 @@ namespace TrafficClient.Workers {
 \r
                     using (SqlDataReader reader = cmd.ExecuteReader()) {\r
                         if (reader.Read()) {\r
+                            result = new TrafficVersion();\r
+                            if (!reader.IsDBNull(0))\r
+                                result.VariantID = reader.GetInt32(0);\r
+\r
                             if (!reader.IsDBNull(1))\r
-                                result = reader.GetString(1);\r
+                                result.MediaID = reader.GetString(1);\r
                         }\r
                     }\r
                 }\r