#125 Az archive JSON-ba kerüljön be a STORYFORMAT

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

diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json
index 20b85668165af316012fa6d39e52a838287a6764..322f07ec84a9dfa739082ae2ffebf18d83d24fd8 100644 (file)
--- a/client/Maestro/Configuration/configuration.json
+++ b/client/Maestro/Configuration/configuration.json
@@ -44,25 +44,25 @@
       "version": 0,\r
       "redefineSegments": true\r
     },\r
-{\r
-  "$type": "MediaCubeMetadata",\r
-  "server": {\r
-    "address": "http://localhost:8888/services/rest/jobengine",\r
-    "userName": "mediacube",\r
-    "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-    "timeout": 1000\r
-  },\r
-  "wsserver": {\r
-    "address": "ws://10.10.1.29:88/services/wsapi",\r
-    "timeout": 1000\r
-  },\r
-  "jobTemplate": "retrieve-material.xml",\r
-  "archiveFolder": "file://10.10.1.105/TESZT/TC/ARCHIVE",\r
-  "restoreFolder": "file://10.10.1.105/BRAAVOS/ARCHIVE_RESTORE",\r
-  "restoreNamePattern": "%s_%GUID%",\r
-  "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE",\r
-  "killDateDays": 1\r
-}\r
+  {\r
+    "$type": "MediaCubeMetadata",\r
+    "server": {\r
+      "address": "http://10.10.1.27:88/services/rest/jobengine",\r
+      "userName": "mediacube",\r
+      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+      "timeout": 1000\r
+    },\r
+    "wsserver": {\r
+      "address": "ws://10.10.1.27/services/wsapi",\r
+      "timeout": 1000\r
+    },\r
+    "jobTemplate": "retrieve-material.xml",\r
+    "archiveFolder": "file://10.10.1.105/TESZT/TC/ARCHIVE",\r
+    "restoreFolder": "file://10.10.1.105/BRAAVOS/ARCHIVE_RESTORE",\r
+    "restoreNamePattern": "%s_%GUID%",\r
+    "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE",\r
+    "killDateDays": 1\r
+  }\r
   ],\r
   "targets": [\r
     {\r
@@ -110,7 +110,7 @@
       "saveArchiveMetadata": false,\r
       "sendEmailOnSuccess": true,\r
       "successEmailPattern": "%JSON%",\r
-      "successEmailSubject": "%ID% - %ITEMTITLE% sikeres feltöltése",\r
+      "successEmailSubject": "%ID% - %ITEMTITLE% - %FORMAT% sikeres feltöltése",\r
       "successEmailRecipient": "vasary@elgekko.net",\r
       "remote": {\r
         "address": "ftp://10.10.1.105/TESZT/CHECK",\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 57c5b76f0a24972a7191d473687a02009f6651bd..150275080832872b657ac670d3eecc9d719d95a3 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -357,6 +357,7 @@ namespace Maestro {
             result.mediaHouseId = story.ParentStoryID;\r
             result.mediaTitle = story.Name;\r
             result.mediaDescription = story.ScriptContent;\r
+            result.format = story.Format;\r
             return result;\r
         }\r
 \r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index 5eae53d84b410c3b9cf14e6272e8f110cd7d9c2b..2b9337d2fefa86d32c1fe0f597510a2fbf0db470 100644 (file)
--- a/client/Maestro/Properties/AssemblyInfo.cs
+++ b/client/Maestro/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.0.9.0")]\r
-[assembly: AssemblyFileVersion("2.0.9.0")]\r
+[assembly: AssemblyVersion("2.0.9.3")]\r
+[assembly: AssemblyFileVersion("2.0.9.3")]\r

diff --git a/client/MaestroShared/Commons/PatternNameMaker.cs b/client/MaestroShared/Commons/PatternNameMaker.cs
index 6194280346e5c432b58bfbcf60a7e296abc05548..edd42ee90d747a31092d4c1077ee41f537a3e925 100644 (file)
--- a/client/MaestroShared/Commons/PatternNameMaker.cs
+++ b/client/MaestroShared/Commons/PatternNameMaker.cs
@@ -15,6 +15,7 @@ namespace MaestroShared.Commons {
         private const string PATTERN_JSON = "%JSON%";\r
         private const string PATTERN_ITEMTITLE = "%ITEMTITLE%";\r
         private const string PATTERN_MEDIATITLE = "%MEDIATITLE%";\r
+        private const string PATTERN_FORMAT = "%FORMAT%";\r
         private const string PATTERN_IDROOT = "%IDROOT%";\r
         private const string PATTERN_GUID = "%GUID%";\r
         private const string PATTERN_SOURCENAME = "%SOURCENAME%";\r
@@ -44,7 +45,7 @@ namespace MaestroShared.Commons {
             return result;\r
         }\r
 \r
-        static public string Get(string pattern, string id, string inputName, string outputName, string userName, string text, DateTime? storedDateTime = null, string json = null, string itemTitle = null, string mediaTitle = null) {\r
+        static public string Get(string pattern, string id, string inputName, string outputName, string userName, string text, DateTime? storedDateTime = null, string json = null, string itemTitle = null, string mediaTitle = null, string format = null) {\r
             if (pattern == null)\r
                 return null;\r
             string idRoot = id != null && id.Contains(UNDERSCORE) ? id.Split(UNDERSCORE[0])[0] : id;\r
@@ -57,7 +58,8 @@ namespace MaestroShared.Commons {
                 .Replace(PATTERN_DATESTAMP, dt.ToString(DATE_FORMAT_NODOTS, CultureInfo.InvariantCulture))\r
                 .Replace(PATTERN_JSON, json)\r
                 .Replace(PATTERN_ITEMTITLE, itemTitle)\r
-                .Replace(PATTERN_MEDIATITLE, mediaTitle);\r
+                .Replace(PATTERN_MEDIATITLE, mediaTitle)\r
+                .Replace(PATTERN_FORMAT, format);\r
 \r
             if (!String.IsNullOrEmpty(inputName)) {\r
                 result = result.Replace(PATTERN_SOURCENAME, Normalize(Path.GetFileNameWithoutExtension(inputName)));\r

diff --git a/client/MaestroShared/Metadata/ArchiveMetadata.cs b/client/MaestroShared/Metadata/ArchiveMetadata.cs
index c2a46710772ce314f08d646ef985dd23933afff9..b5a5d78bacc3813b33614e58b1bcba778e47a65d 100644 (file)
--- a/client/MaestroShared/Metadata/ArchiveMetadata.cs
+++ b/client/MaestroShared/Metadata/ArchiveMetadata.cs
@@ -1,7 +1,7 @@
-using System;\r
-using Newtonsoft.Json;\r
-using System.Runtime.Serialization.Formatters.Binary;\r
+using Newtonsoft.Json;\r
+using System;\r
 using System.IO;\r
+using System.Runtime.Serialization.Formatters.Binary;\r
 \r
 namespace MaestroShared.Metadata {\r
 \r
@@ -12,6 +12,8 @@ namespace MaestroShared.Metadata {
         public string itemHouseId { get; set; }\r
         public string itemTitle { get; set; }\r
         public string itemDescription { get; set; }\r
+        //csak octopus\r
+        public string format { get; set; }\r
         public string mediaHouseId { get; set; }\r
         public string mediaTitle { get; set; }\r
         public string mediaDescription { get; set; }\r

diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index c05a92a69d6e9d09acd3f11b4d5e1493f52f49f0..9c8a8f1818b832d8ff3e2607f1fa211c275e986d 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.0.9.1")]\r
-[assembly: AssemblyFileVersion("2.0.9.1")]\r
+[assembly: AssemblyVersion("2.0.9.4")]\r
+[assembly: AssemblyFileVersion("2.0.9.4")]\r

diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs
index c88dbb6bfa439eefbd7c2b820fbf7d405cf71c77..f390bc0c0a195c24173167f104e412249ac326ab 100644 (file)
--- a/client/MaestroShared/Targets/FXPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs
@@ -169,7 +169,7 @@ namespace MaestroShared.Targets {
             string xml = null;\r
             string name = Path.GetFileNameWithoutExtension(Input);\r
             string description = Parameters.ArchiveMetadata?.mediaTitle;\r
-            if (Parameters.TargetConfig.KillDateDays > 0) {\r
+            if (Parameters.TargetConfig.SourceNexioKillDateDays > 0) {\r
                 DateTime date = GetKillDate(Parameters.TargetConfig.SourceNexioKillDateDays);\r
                 KillDate = date.ToString(DATE_FORMAT);\r
                 xml = NexioXML.ToXML(name, date, null, Parameters.TargetConfig.SourceNexioAgency);\r

diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs
index 1b1311b37960bd6599894be921468edc553960c1..6fbb317ea4125805e97ddfdb1d064549dd79079f 100644 (file)
--- a/client/MaestroShared/Targets/UNCTargetProcessor.cs
+++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs
@@ -420,7 +420,7 @@ namespace MaestroShared.Targets {
         }\r
 \r
         protected string GetDynamicText(string pattern) {\r
-            return PatternNameMaker.Get(pattern, ID, InputName, Output, Parameters.UserName, Parameters.MetadataText, Parameters.CreateDate, Parameters.ArchiveMetadata?.ToString(), Parameters.ArchiveMetadata?.itemTitle, Parameters.ArchiveMetadata?.mediaTitle);\r
+            return PatternNameMaker.Get(pattern, ID, InputName, Output, Parameters.UserName, Parameters.MetadataText, Parameters.CreateDate, Parameters.ArchiveMetadata?.ToString(), Parameters.ArchiveMetadata?.itemTitle, Parameters.ArchiveMetadata?.mediaTitle, Parameters.ArchiveMetadata?.format);\r
         }\r
 \r
         private string CreateOutputFileName() {\r

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index 724ea60faa5aea5cfe1d5cea6177bd09836746a3..b39ff8fec22d4042fd33140d5c950530e4b64c9a 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -108,26 +108,12 @@
                                                        <packaging>jar</packaging>\r
                                                </configuration>\r
                                        </execution>\r
-<!--                                   <execution> -->\r
-<!--                                           <id>install6</id> -->\r
-<!--                                           <phase>package</phase> -->\r
-<!--                                           <goals> -->\r
-<!--                                                   <goal>install-file</goal> -->\r
-<!--                                           </goals> -->\r
-<!--                                           <configuration> -->\r
-<!--                                                   <file>libs/solr-solrj-7.5.0.jar</file> -->\r
-<!--                                                   <groupId>org.apache.solr</groupId> -->\r
-<!--                                                   <artifactId>solr-sorlj</artifactId> -->\r
-<!--                                                   <version>7.5.0</version> -->\r
-<!--                                                   <packaging>jar</packaging> -->\r
-<!--                                           </configuration> -->\r
-<!--                                   </execution> -->\r
                                </executions>\r
                        </plugin>\r
                        <plugin>\r
                                <groupId>org.reficio</groupId>\r
                                <artifactId>p2-maven-plugin</artifactId>\r
-                               <version>1.2.0-SNAPSHOT</version>\r
+                               <version>1.3.0</version>\r
                                <executions>\r
                                        <execution>\r
                                                <id>default-cli</id>\r