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

diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand-material.xml b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
similarity index 87%
rename from server/user.jobengine.executors/jobtemplates/retrieve-ondemand-material.xml
rename to server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
index b1f806eea992ae28563cea90eb406c713b08148b..10f7884c14acb385f63198cd878198cd6f755f39 100644 (file)
--- a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand-material.xml
+++ b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
@@ -2,6 +2,8 @@
 <jobtemplate name="Archivált anyag visszatöltése">\r
        <declarations>\r
                <parameters>\r
+                       <parameter name="trafficOuputPath" type="java.lang.String" />\r
+                       <parameter name="octopusOuputPath" type="java.lang.String" />\r
                        <parameter name="mediaCubeMedia" type="user.jobengine.db.Media" />\r
                        <parameter name="houseId" type="java.lang.String" />\r
                </parameters>\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java
index d166e18af11840fff0aba41857e867e36815c1dd..7e494610dc89c0e3623c4f086605c324711b8872 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java
@@ -22,10 +22,11 @@ import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;\r
 \r
 public class CheckMORPHEUSMissingMaterialsStep extends JobStep {\r
-       private static final String MATERIAL_ID = "Material ID";\r
        private static final Logger logger = LogManager.getLogger();\r
+       private static final String TARGET_NAME_PATTERN = "targetNamePattern";\r
+       private static final String MATERIAL_ID = "Material ID";\r
        private static final String RETRIEVE_MATERIAL = "Adásanyag visszatöltés";\r
-       private static final String OUTPUT_PATH = "outputPath";\r
+       private static final String TARGET_PATH = "targetPath";\r
        private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia";\r
        private static final String JOBTEMPLATE = "retrieve-material.xml";\r
        private static final String CSV_EXT = ".csv";\r
@@ -64,7 +65,7 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep {
                        return;\r
                }\r
 \r
-               jobEngine.submit(JOBTEMPLATE, RETRIEVE_MATERIAL, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, targetPath));\r
+               jobEngine.submit(JOBTEMPLATE, RETRIEVE_MATERIAL, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), TARGET_PATH, targetPath, TARGET_NAME_PATTERN, "%s"));\r
        }\r
 \r
        private void processMissingMaterialCSV(Path csvFilePath) throws Exception {\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java
index d54e055e8ed14f199634e8c2d99524061cd92c6a..d4f096e67178a7eafc59f68c6ac2b81fe18e83a1 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java
@@ -20,7 +20,8 @@ import user.jobengine.server.IJobRuntime;
 \r
 public class CheckTRAFFICMissingMaterialsStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
-       private static final String OUTPUT_PATH = "outputPath";\r
+       private static final String TARGET_NAME_PATTERN = "targetNamePattern";\r
+       private static final String TARGET_PATH = "targetPath";\r
        private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia";\r
        private static final String SQLSERVER_JDBC_SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";\r
        private static final String SQL = "{call dbo.clIFsp_EC_MAM(1001, 32, Null,  Null, ?)}";\r
@@ -81,7 +82,7 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep {
                }\r
 \r
                String title = "Traffic adásanyag visszatöltés: " + trafficId;\r
-               jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, targetPath));\r
+               jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), TARGET_PATH, targetPath, TARGET_NAME_PATTERN, "%s"));\r
        }\r
 \r
 }\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
new file mode 100644 (file)
index 0000000..eab9db4
--- /dev/null
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
@@ -0,0 +1,34 @@
+package user.jobengine.server.steps;\r
+\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import user.jobengine.db.Media;\r
+import user.jobengine.server.IJobEngine;\r
+import user.jobengine.server.IJobRuntime;\r
+\r
+/**\r
+ * Elinditja minden mediara az archivalo folyamatot.\r
+ *\r
+ * @author robi\r
+ */\r
+public class OutputPathAndNameSelectorStep extends JobStep {\r
+       private static final String ARCHIVE = "Archiválás";\r
+       private static final String GLOBAL_SOURCE_PATH = "globalSourcePath";\r
+       private static final Logger logger = LogManager.getLogger();\r
+       private static final String JOBTEMPLATE = "archive-material.xml";\r
+       private static final String ARCHIVE_ITEM = "archiveItem";\r
+\r
+       @StepEntry\r
+       public Object[] execute(Media mediaCubeMedia, String houseId, IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
+               String targetPath = "";\r
+               String targetNamePattern = "";\r
+\r
+               try {\r
+               } catch (Exception e) {\r
+                       logger.catching(e);\r
+               }\r
+               return new Object[] { targetPath, targetNamePattern };\r
+       }\r
+\r
+}\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 4a22a96394301b8948d12aaa51694f9f4c33913a..4ef58c7ee29b151a8b51e057b807b21447578f0c 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -25,13 +25,15 @@ import user.jobengine.server.IJobRuntime;
 import user.jobengine.server.JobEngine;\r
 \r
 public class SearchModel extends BaseModel {\r
+       private static final String TARGET_NAME_PATTERN = "targetNamePattern";\r
+\r
        private static final String RESTORE = "Visszatöltés";\r
 \r
        private static final String JOBTEMPLATE = "retrieve-material.xml";\r
 \r
        private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia";\r
 \r
-       private static final String OUTPUT_PATH = "outputPath";\r
+       private static final String TARGET_PATH = "targetPath";\r
 \r
        private static final Logger logger = LogManager.getLogger();\r
 \r
@@ -57,7 +59,8 @@ public class SearchModel extends BaseModel {
        public void downloadMedia() {\r
                if (getHasTSMMediaFile()) {\r
                        try {\r
-                               Map<String, Object> parameters = ListUtils.asMap(MEDIA_CUBE_MEDIA, this.selectedMedia, OUTPUT_PATH, "/mnt/ISILON/RESTORE");\r
+                               Map<String, Object> parameters = ListUtils.asMap(MEDIA_CUBE_MEDIA, this.selectedMedia, TARGET_PATH, "/mnt/ISILON/RESTORE", TARGET_NAME_PATTERN,\r
+                                               "%s");\r
                                IJobEngine jobEngine = JobEngine.getInstance();\r
                                IJobRuntime runtime1 = jobEngine.submit(JOBTEMPLATE, RESTORE, parameters);\r
                        } catch (Exception exc) {\r
@@ -144,7 +147,7 @@ public class SearchModel extends BaseModel {
                        }\r
                        return ret;\r
                }\r
-       \r
+\r
                public boolean getHasSelectedMediaFile(){\r
                        String mediaFilePath =getMediaFilePath();\r
                        return (mediaFilePath != null && !"".equals(mediaFilePath));\r