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

diff --git a/client/Maestro/Resources/configuration-nexio.json b/client/Maestro/Resources/configuration-nexio.json
index e31b2a031b3edc86effaf0697b94b4fa1e14c162..e226b0dec0dc02ce9ea340a3594dabe302fe5805 100644 (file)
--- a/client/Maestro/Resources/configuration-nexio.json
+++ b/client/Maestro/Resources/configuration-nexio.json
@@ -32,7 +32,7 @@
     {\r
       "$type": "TrafficMetadata",\r
       "server": {\r
-        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "address": "Data Source=folkloredb.hu\\sql08,33860;Initial Catalog=CLArchiveTF_0;Persist Security Info=True;",\r
         "userName": "MAM",\r
         "password": "Echotv.hu",\r
         "timeout": 5\r

diff --git a/client/Maestro/Resources/configuration-unc.json b/client/Maestro/Resources/configuration-unc.json
index 4bf60fc13614e37768f583c3646c1c6ab2f33824..60442871c147db90c45c37e624669d3a5a44df78 100644 (file)
--- a/client/Maestro/Resources/configuration-unc.json
+++ b/client/Maestro/Resources/configuration-unc.json
@@ -33,7 +33,7 @@
     {\r
       "$type": "TrafficMetadata",\r
       "server": {\r
-        "address": "Data Source=folkloredb.hu\\sql08,33860;Initial Catalog=CLArchiveTF_0;Persist Security Info=True;",\r
+        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
         "userName": "MAM",\r
         "password": "Echotv.hu",\r
         "timeout": 60\r
@@ -63,15 +63,15 @@
     },\r
     {\r
       "label": "Adáskész",\r
-      "processor": "FTPTargetProcessor",\r
-      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "processor": "UNCTargetProcessor",\r
+      "outputFormat": "%ID%",\r
       "saveSegments": true,\r
-      "killDateDays": 1,\r
+      "killDateDays": 0,\r
       "tag": "Adáskész",\r
-      "createSubFolder": true,\r
-      "useMetadata": true,\r
+      "createSubFolder": false,\r
+      "useMetadata": false,\r
       "remote": {\r
-        "address": "ftp://10.10.1.100:21/READY",\r
+        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT/IceGateway",\r
         "userName": "mediacube",\r
         "password": "Broadca5T"\r
       }\r

diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index e8ed691b8c2afb810de218227cf6f2000028c7ea..615abcf64e4738045f82b53755388c44965cfb7c 100644 (file)
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -99,7 +99,7 @@ namespace Maestro.Targets {
             TrafficAPI client = new TrafficAPI(metadata.Server.Address.OriginalString, metadata.Server.UserName, metadata.Server.Password, metadata.Server.Timeout);\r
             client.DeleteSegments(maestroForm.SelectedMetadata.VariantID);\r
             foreach (Segment actual in segments) {\r
-                Segment segment = client.AddSegmentToCopia(maestroForm.SelectedMetadata.VariantID, actual.Comment, actual.TCIn, actual.TCOut, actual.Optional);\r
+                client.AddSegmentToCopia(maestroForm.SelectedMetadata.VariantID, actual.Comment, actual.TCIn, actual.TCOut, actual.Optional);\r
             }\r
         }\r
 \r

diff --git a/client/PlanAIRClient/Reader.cs b/client/PlanAIRClient/Reader.cs
index b7d25a31c30c1f50d02c2c6fe31bf546ebc3b045..93d1103f2feb33a2fa4c6c720063fa5cd0b50946 100644 (file)
--- a/client/PlanAIRClient/Reader.cs
+++ b/client/PlanAIRClient/Reader.cs
@@ -116,6 +116,7 @@ namespace TrafficClient {
             clIFsp_EC_SegmentResult item = new clIFsp_EC_SegmentResult();\r
             int f = 0;\r
             item.v_SegID = (int)ReadInt(reader, ref f);\r
+            //item.v_ClipID = ReadString(reader, ref f);\r
             item.v_VariantID = ReadInt(reader, ref f);\r
             item.v_SegTitle = ReadString(reader, ref f);\r
             item.v_SegKeyWords = ReadString(reader, ref f);\r

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 7af30395620840779dea334a20c6efaa090be21f..948f6b02c603b4de80b314d1b2c04813d40e8110 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -26,13 +26,14 @@ namespace TrafficClient {
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1001);\r
-                    cmd.Parameters.AddWithValue("@@@Options", 40);\r
                     cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
                     if (!missingCopia) {\r
+                        cmd.Parameters.AddWithValue("@@@Options", 1);\r
                         cmd.Parameters.AddWithValue("@@StrParam1", strParam);\r
                         cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date);\r
                         cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date);\r
                     } else {\r
+                        cmd.Parameters.AddWithValue("@@@Options", 24);\r
                         if (!String.IsNullOrEmpty(strParam))\r
                             cmd.Parameters.AddWithValue("@@StrParam1", strParam);\r
                         if (from.HasValue) {\r
@@ -169,8 +170,7 @@ namespace TrafficClient {
             }\r
         }\r
 \r
-        public Segment AddSegmentToCopia(int itemID, string strParam, long tcIn, long tcOut, bool options) {\r
-            Segment result = null;\r
+        public void AddSegmentToCopia(int itemID, string strParam, long tcIn, long tcOut, bool options) {\r
             //string strparam = String.IsNullOrEmpty(strParam) ? string.Empty : strParam;\r
             object strparam = strParam;\r
             if (String.IsNullOrEmpty(strParam))\r
@@ -187,17 +187,7 @@ namespace TrafficClient {
                     cmd.Parameters.AddWithValue("@@StrParam1", strparam);\r
                     cmd.Parameters.AddWithValue("@@StrParam2", DBNull.Value);\r
                     cmd.Parameters.AddWithValue("@@@Options", optionsParam);\r
-                    using (SqlDataReader reader = cmd.ExecuteReader()) {\r
-                        if (reader.Read()) {\r
-                            clIFsp_EC_SegmentResult actual = cliFSPReader.ToclIFsp_SegmentResult(reader);\r
-                            result = new Segment() {\r
-                                TCIn = actual.v_TcIn.HasValue ? actual.v_TcIn.Value : -1,\r
-                                TCOut = actual.v_TcOut.HasValue ? actual.v_TcOut.Value : -1,\r
-                                Comment = actual.v_SegTitle,\r
-                                Optional = actual.v_Dropable.HasValue ? actual.v_Dropable.Value : false\r
-                            };\r
-                        }\r
-                    }\r
+                    cmd.ExecuteNonQuery();\r
                 }\r
             }\r
             catch (Exception e) {\r
@@ -207,7 +197,6 @@ namespace TrafficClient {
             finally {\r
                 connection.Close();\r
             }\r
-            return result;\r
         }\r
 \r
         private List<clIFsp_EC_MAMBradocastResult> ExecuteAndReadBradcast(SqlCommand cmd) {\r
@@ -231,7 +220,7 @@ namespace TrafficClient {
                 using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1001);\r
-                    cmd.Parameters.AddWithValue("@@@Options", 40);\r
+                    cmd.Parameters.AddWithValue("@@@Options", 1);\r
                     cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
                     cmd.Parameters.AddWithValue("@@StrParam1", strParam);\r
                     sqlResult = ExecuteAndReadBradcast(cmd);\r

diff --git a/client/PlanAIRClient/clIFsp_EC_SegmentResult.cs b/client/PlanAIRClient/clIFsp_EC_SegmentResult.cs
index 79a8bd88238744b5956744853181f205cdec3073..6226e315988dcccff1e9ecb733cbd6cbbdfe3526 100644 (file)
--- a/client/PlanAIRClient/clIFsp_EC_SegmentResult.cs
+++ b/client/PlanAIRClient/clIFsp_EC_SegmentResult.cs
@@ -11,6 +11,8 @@ namespace TrafficClient {
 \r
         private System.Nullable<int> _v_VariantID;\r
 \r
+        private string _v_ClipID;\r
+\r
         private string _v_SegTitle;\r
 \r
         private string _v_SegKeyWords;\r
@@ -142,6 +144,17 @@ namespace TrafficClient {
             }\r
         }\r
 \r
+        [global::System.Data.Linq.Mapping.ColumnAttribute(Storage = "v_ClipID", DbType = "VarChar(8)")]\r
+        public string v_ClipID {\r
+            get {\r
+                return this._v_ClipID;\r
+            }\r
+            set {\r
+                if ((this._v_ClipID != value)) {\r
+                    this._v_ClipID = value;\r
+                }\r
+            }\r
+        }\r
         [global::System.Data.Linq.Mapping.ColumnAttribute(Storage = "v_TcOutTC", DbType = "VarChar(25)")]\r
         public string v_TcOutTC {\r
             get {\r