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

diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/-configuration-nle.json
similarity index 100%
rename from client/Maestro/Configuration/configuration-nle.json
rename to client/Maestro/Configuration/-configuration-nle.json

diff --git a/client/Maestro/Configuration/-configuration-tqc-check.json b/client/Maestro/Configuration/configuration-tqc-check.json
similarity index 96%
rename from client/Maestro/Configuration/-configuration-tqc-check.json
rename to client/Maestro/Configuration/configuration-tqc-check.json
index acd07c7e7ef3e201da9939122c0378f84295a449..d519cb8351567dee8a4f7b5dcd7ac71e36d2f108 100644 (file)
--- a/client/Maestro/Configuration/-configuration-tqc-check.json
+++ b/client/Maestro/Configuration/configuration-tqc-check.json
@@ -50,6 +50,7 @@
       "saveSegments": true,\r
       "tag": "Adáskész",\r
       "disableFileVersioning": true,\r
+      "enableOverride": true,\r
       "saveMorpheusMetadata": true,\r
       "pathMorpheusMetadata": "/PLAYOUT/MorpheusGateway/Input",\r
       "deviceIdMorpheus": "ISILON",\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 54e50e8eb5fae54a2d28a4a1c75c9cffe7997210..22f34e5c6349611f268b952a269da2c6bed7e16e 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -270,13 +270,13 @@
     <None Include="Configuration\-configuration-editor.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\configuration-nle.json">\r
+    <None Include="Configuration\-configuration-nle.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\-configuration-playout-ingest.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\-configuration-tqc-check.json">\r
+    <None Include="Configuration\configuration-tqc-check.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Connected Services\packages.config" />\r

diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs
index 3b54649548aff71774fc076555b95a3f10064cfa..01c68cc2439b1f17bae9d10cbdeb29f6767391a4 100644 (file)
--- a/client/MaestroShared/Targets/UNCTargetProcessor.cs
+++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs
@@ -178,7 +178,7 @@ namespace MaestroShared.Targets {
                 MetadataType = Parameters.MetadataKind,\r
                 Segments = Parameters.MovieSegments\r
             };\r
-\r
+            Parameters.MessageBus.Send(message);\r
         }\r
 \r
         private void UploadNexioMetadata() {\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index bc7cac1e1a572bf5c1265acf76af261abe12d29b..c4dddde7fb21bfedd23a0716da89d1d50b927964 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -151,7 +151,7 @@ namespace TrafficClient {
         }\r
 \r
         private void OnTypeFilterChanged(object sender, EventArgs e) {\r
-            dtScheduled.Enabled = rbMaterial.Checked;\r
+            //dtScheduled.Enabled = rbMaterial.Checked;\r
             RefreshResults();\r
         }\r
 \r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
index 979411bdba8df51c9a80f664b4b21b151f34d9e7..fd67d38239221d93f78249d90ce70cf5e6c59377 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
@@ -243,39 +243,39 @@ public class OctopusDataMiner implements Runnable {
 \r
                        logger.info("Fetch rundowns");\r
 \r
-                       ResteasyWebTarget target = webTarget.path(RUNDOWN);\r
-                       Builder result = target.request().header(OCTOPUS_DEVICE_ID, apiUser).header(OCTOPUS_DEVICE_NAME, apiPwd);\r
-                       Response r = result.get();\r
-                       String x = r.readEntity(String.class);\r
-                       return;\r
-                       //                      BasicDBList rundowns = queryRundowns();\r
-                       //                      logger.info("Fetch rundown story references");\r
-                       //                      storyRundowns = buildRundownReferences(rundowns);\r
-                       //                      logger.info("Fetch story folders");\r
-                       //                      BasicDBList storyFolders = queryStoryFolders();\r
-                       //                      logger.info("Fetch folder story references");\r
-                       //                      storyStoryFolders = buildFolderReferences(storyFolders);\r
-                       //\r
-                       //                      if (rundowns == null || rundowns.size() == 0) {\r
-                       //                              progressEvent.setProgress(50);\r
-                       //                              fireProgressEvent(progressEvent);\r
-                       //                      } else {\r
-                       //                              logger.info("Process rundowns");\r
-                       //                              storeRundowns(rundowns, null);\r
-                       //                      }\r
-                       //\r
-                       //                      if (storyFolders == null || storyFolders.size() == 0) {\r
-                       //                              progressEvent.setProgress(100);\r
-                       //                              fireProgressEvent(progressEvent);\r
-                       //                      } else {\r
-                       //                              logger.info("Process story folders");\r
-                       //                              storeStoryFolders(storyFolders, null);\r
-                       //                      }\r
-                       //                      setLastUpdateTime(new Date());\r
-                       //                      logger.info("Activate");\r
-                       //                      db.getCollection(RUNDOWN_COLLECTION).rename(IOctopusAPI.RUNDOWN_COLLECTION, true);\r
-                       //                      db.getCollection(FOLDER_COLLECTION).rename(IOctopusAPI.FOLDER_COLLECTION, true);\r
-                       //                      db.getCollection(STORY_COLLECTION).rename(IOctopusAPI.STORY_COLLECTION, true);\r
+                       //                      ResteasyWebTarget target = webTarget.path(RUNDOWN);\r
+                       //                      Builder result = target.request().header(OCTOPUS_DEVICE_ID, apiUser).header(OCTOPUS_DEVICE_NAME, apiPwd);\r
+                       //                      Response r = result.get();\r
+                       //                      String x = r.readEntity(String.class);\r
+                       //                      return;\r
+                       BasicDBList rundowns = queryRundowns();\r
+                       logger.info("Fetch rundown story references");\r
+                       storyRundowns = buildRundownReferences(rundowns);\r
+                       logger.info("Fetch story folders");\r
+                       BasicDBList storyFolders = queryStoryFolders();\r
+                       logger.info("Fetch folder story references");\r
+                       storyStoryFolders = buildFolderReferences(storyFolders);\r
+\r
+                       if (rundowns == null || rundowns.size() == 0) {\r
+                               progressEvent.setProgress(50);\r
+                               fireProgressEvent(progressEvent);\r
+                       } else {\r
+                               logger.info("Process rundowns");\r
+                               storeRundowns(rundowns, null);\r
+                       }\r
+\r
+                       if (storyFolders == null || storyFolders.size() == 0) {\r
+                               progressEvent.setProgress(100);\r
+                               fireProgressEvent(progressEvent);\r
+                       } else {\r
+                               logger.info("Process story folders");\r
+                               storeStoryFolders(storyFolders, null);\r
+                       }\r
+                       setLastUpdateTime(new Date());\r
+                       logger.info("Activate");\r
+                       db.getCollection(RUNDOWN_COLLECTION).rename(IOctopusAPI.RUNDOWN_COLLECTION, true);\r
+                       db.getCollection(FOLDER_COLLECTION).rename(IOctopusAPI.FOLDER_COLLECTION, true);\r
+                       db.getCollection(STORY_COLLECTION).rename(IOctopusAPI.STORY_COLLECTION, true);\r
 \r
                } catch (Exception e) {\r
                        logger.catching(e);\r