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

diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json
index 32edff1acd4bbf30bdebb83fb852aed36a61da3f..867041bcd6c043232d12656fb9ede033e7664101 100644 (file)
--- a/client/Maestro/Configuration/configuration.json
+++ b/client/Maestro/Configuration/configuration.json
@@ -23,6 +23,17 @@
     }\r
   },\r
   "metadatas": [\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "functionName": "clIFsp_ORI_MAM",\r
+      "version": 1,\r
+      "server": {\r
+        "address": "Data Source=10.11.254.86;Initial Catalog=PA_Vivantis;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "1LCAeMAI5W5eWdtaN25mHX/9JkXjkr0JZDvTZp//HYtUPo/UKyJnuZoLKFo9G9FbAhUha8xnniV+v/9BQ6c/7e0phmCYUdeLEdQcg0hHvU9njMSqYBV75b6oB9jhvtoZ",\r
+        "timeout": 1000\r
+      }\r
+    },\r
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index be37e78987e64feb1df63054912ba0839a81babe..b657a37d7a29d7145e43c71345e6cc50c56af4be 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -127,7 +127,7 @@ namespace MaestroShared.Configuration {
         public string SourceNexioAgency { get; set; }\r
         public int SourceNexioKillDateDays { get; set; }\r
         public bool MoveToFolder { get; set; }\r
-\r
+        public string ForceMediaType { get; set; }\r
     }\r
 \r
     public class Connection {\r

diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index 6846506aa2f38e6df3ccb304a58ceb700ff58cd0..39ec0603704672cfd40c83dec78f98bb3cb7f46b 100644 (file)
--- a/client/MaestroShared/Properties/AssemblyInfo.cs
+++ b/client/MaestroShared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.1.0.7")]\r
-[assembly: AssemblyFileVersion("2.1.0.7")]\r
+[assembly: AssemblyVersion("2.1.0.8")]\r
+[assembly: AssemblyFileVersion("2.1.0.8")]\r

diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs
index 459383bfc2d99665d1e7cc12b523c868e0cbfc79..1d33242a7356b13b80f3825e23ac49918b22f649 100644 (file)
--- a/client/MaestroShared/Targets/UNCTargetProcessor.cs
+++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs
@@ -403,8 +403,18 @@ namespace MaestroShared.Targets {
             Uri address = Parameters.TargetConfig.Remote.Address;\r
             string statusWorkDir = Path.Combine(workingDir, STATUS_FOLDER);\r
             EnsureDirectoryExistence(statusWorkDir);\r
-            string fileName = String.Format(METADATA_FILE, OutputName);\r
+            string fileName = string.Format(METADATA_FILE, OutputName);\r
             //logger.Debug("Creating METADATA file {0}", fileName);\r
+\r
+            //20210201 tipus felulirva configbol\r
+\r
+            logger.Info("Parameters.TargetConfig.ForceMediaType {0}", Parameters.TargetConfig.ForceMediaType);\r
+            if (!string.IsNullOrEmpty(Parameters.TargetConfig.ForceMediaType)) {\r
+                logger.Info("Using FIXED archive media type {0}", Parameters.TargetConfig.ForceMediaType);\r
+                Parameters.ArchiveMetadata.mediaType = Parameters.TargetConfig.ForceMediaType;\r
+            }\r
+\r
+\r
             byte[] content = Encoding.UTF8.GetBytes(Parameters.ArchiveMetadata.ToString());\r
             string ouputPath = GetOutputFilePath(statusWorkDir, fileName);\r
             UploadContent(ouputPath, content);\r

diff --git a/client/PlanAIRClient/Properties/AssemblyInfo.cs b/client/PlanAIRClient/Properties/AssemblyInfo.cs
index 7b96f724e2c3b9888a8f303813ed6306b99edb9e..955909fa3e2bdd58d2e9867ae513e10a146c521f 100644 (file)
--- a/client/PlanAIRClient/Properties/AssemblyInfo.cs
+++ b/client/PlanAIRClient/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.1.1")]\r
-[assembly: AssemblyFileVersion("1.0.1.1")]\r
+[assembly: AssemblyVersion("1.0.1.2")]\r
+[assembly: AssemblyFileVersion("1.0.1.2")]\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 253bbb36995bd4024158b4590a6bfcd95eb9eac6..180c7cc6af31fcfaf673915085bcf229c36223fa 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -91,7 +91,10 @@ namespace TrafficClient {
                     dgTraffic.Columns.AddRange(GetMultiMaterialColumns(metadata));\r
                 else\r
                     dgTraffic.Columns.AddRange(GetSingleMaterialColumns(metadata));\r
-                string searchText = Regex.Replace(txtFilter.Text, "[^0-9]", "");\r
+\r
+                //Minden ami nem szam, torlodik. Miert?\r
+                //string searchText = Regex.Replace(txtFilter.Text, "[^0-9]", "");\r
+                string searchText = txtFilter.Text;\r
                 items = trafficAPI.GetMaterials(searchText, chkProblematic.Checked, scheduledDate, scheduledDate);\r
             } else if (rbAD.Checked) {\r
                 dgTraffic.Columns.AddRange(GetADColumns(metadata));\r

diff --git a/server/-dependencies/libs/humble-video-arch-x86_64-pc-linux-gnu6-0.2.1.jar b/server/-dependencies/libs/humble-video-arch-x86_64-pc-linux-gnu6-0.2.1.jar
deleted file mode 100644 (file)
index 9baa313..0000000
Binary files a/server/-dependencies/libs/humble-video-arch-x86_64-pc-linux-gnu6-0.2.1.jar and /dev/null differ

diff --git a/server/-dependencies/libs/humble-video-arch-x86_64-w64-mingw32-0.2.1.jar b/server/-dependencies/libs/humble-video-arch-x86_64-w64-mingw32-0.2.1.jar
deleted file mode 100644 (file)
index ccd42e5..0000000
Binary files a/server/-dependencies/libs/humble-video-arch-x86_64-w64-mingw32-0.2.1.jar and /dev/null differ

diff --git a/server/-dependencies/libs/humble-video-noarch-0.2.1.jar b/server/-dependencies/libs/humble-video-noarch-0.2.1.jar
deleted file mode 100644 (file)
index c8fc9bb..0000000
Binary files a/server/-dependencies/libs/humble-video-noarch-0.2.1.jar and /dev/null differ

diff --git a/server/-dependencies/libs/libhumblevideo-0.dll b/server/-dependencies/libs/libhumblevideo-0.dll
deleted file mode 100644 (file)
index c47fb08..0000000
Binary files a/server/-dependencies/libs/libhumblevideo-0.dll and /dev/null differ