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

diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
index b3501f3d684404b1f551e80719964885acb8a774..e9234abb7812742019aa386f18266d33b70bd06e 100644 (file)
--- a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
+++ b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
@@ -4,7 +4,9 @@
                <parameters>\r
                        <parameter name="localRetrievePath" type="java.lang.String" />\r
                        <parameter name="globalRetrievePath" type="java.lang.String" />\r
-                       <parameter name="trafficOutputFolder" type="java.lang.String" />\r
+                       <parameter name="materialOutputFolder" type="java.lang.String" />\r
+                       <parameter name="promoOutputFolder" type="java.lang.String" />\r
+                       <parameter name="advertisementOutputFolder" type="java.lang.String" />\r
                        <parameter name="octopusOutputFolder" type="java.lang.String" />\r
                        <parameter name="genericOutputFolder" type="java.lang.String" />\r
                        <parameter name="mediaCubeMedia" type="user.jobengine.db.Media" />\r
@@ -26,7 +28,13 @@
                                        <parameter name="localRetrievePath" />\r
                                </input>\r
                                <input>\r
-                                       <parameter name="trafficOutputFolder" />\r
+                                       <parameter name="materialOutputFolder" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="promoOutputFolder" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="advertisementOutputFolder" />\r
                                </input>\r
                                <input>\r
                                        <parameter name="octopusOutputFolder" />\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
index 9e1d02318cd5edd3595886735d4554b0e2a5ee19..deac1f1dc41d010b9ed37d461e6edbab56947b37 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
@@ -26,15 +26,23 @@ public class OutputPathAndNameSelectorStep extends JobStep {
 \r
        private Marker marker;\r
 \r
-       private void check(String localRetrievePath, String trafficOutputFolder, String octopusOutputFolder, String genericOutputFolder, String houseId,\r
-                       String targetPathType) {\r
+       private void check(String localRetrievePath, String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder,\r
+                       String octopusOutputFolder, String genericOutputFolder, String houseId, String targetPathType) {\r
                if (StringUtils.isBlank(localRetrievePath)) {\r
                        logger.error(marker, "A folyamat 'localRetrievePath' bemeneti paramétere üres.");\r
                        throw new NullPointerException("System is not configured properly, 'localRetrievePath' input parameter missing.");\r
                }\r
-               if (StringUtils.isBlank(trafficOutputFolder)) {\r
-                       logger.error(marker, "A folyamat 'trafficOutputFolder' bemeneti paramétere üres.");\r
-                       throw new NullPointerException("System is not configured properly, 'trafficOutputFolder' input parameter missing.");\r
+               if (StringUtils.isBlank(materialOutputFolder)) {\r
+                       logger.error(marker, "A folyamat 'materialOutputFolder' bemeneti paramétere üres.");\r
+                       throw new NullPointerException("System is not configured properly, 'materialOutputFolder' input parameter missing.");\r
+               }\r
+               if (StringUtils.isBlank(promoOutputFolder)) {\r
+                       logger.error(marker, "A folyamat 'promoOutputFolder' bemeneti paramétere üres.");\r
+                       throw new NullPointerException("System is not configured properly, 'promoOutputFolder' input parameter missing.");\r
+               }\r
+               if (StringUtils.isBlank(advertisementOutputFolder)) {\r
+                       logger.error(marker, "A folyamat 'advertisementOutputFolder' bemeneti paramétere üres.");\r
+                       throw new NullPointerException("System is not configured properly, 'advertisementOutputFolder' input parameter missing.");\r
                }\r
                if (StringUtils.isBlank(octopusOutputFolder)) {\r
                        logger.error(marker, "A folyamat 'octopusOutputFolder' bemeneti paramétere üres.");\r
@@ -55,15 +63,17 @@ public class OutputPathAndNameSelectorStep extends JobStep {
        }\r
 \r
        @StepEntry\r
-       public Object[] execute(String localRetrievePath, String trafficOutputFolder, String octopusOutputFolder, String genericOutputFolder,\r
-                       String onlineOutputFolder, boolean retrieveToNexio, String houseId, String targetPathType, IJobEngine jobEngine, IJobRuntime jobRuntime)\r
-                       throws IOException {\r
+       public Object[] execute(String localRetrievePath, String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder,\r
+                       String octopusOutputFolder, String genericOutputFolder, String onlineOutputFolder, boolean retrieveToNexio, String houseId, String targetPathType,\r
+                       IJobEngine jobEngine, IJobRuntime jobRuntime) throws IOException {\r
                marker = jobRuntime.getMarker();\r
-               check(localRetrievePath, trafficOutputFolder, octopusOutputFolder, genericOutputFolder, houseId, targetPathType);\r
+               check(localRetrievePath, materialOutputFolder, promoOutputFolder, advertisementOutputFolder, octopusOutputFolder, genericOutputFolder, houseId,\r
+                               targetPathType);\r
                Object[] result = null;\r
                switch (Integer.parseInt(targetPathType)) {\r
                case 0:\r
-                       String outputFolder = getFolderById(trafficOutputFolder, octopusOutputFolder, genericOutputFolder, houseId);\r
+                       String outputFolder = getFolderById(materialOutputFolder, promoOutputFolder, advertisementOutputFolder, octopusOutputFolder, genericOutputFolder,\r
+                                       houseId);\r
                        return localTargetInit(localRetrievePath, outputFolder, houseId, jobRuntime);\r
                case 1:\r
                        return localTargetInit(localRetrievePath, onlineOutputFolder, houseId, jobRuntime);\r
@@ -73,7 +83,8 @@ public class OutputPathAndNameSelectorStep extends JobStep {
                return result;\r
        }\r
 \r
-       private String getFolderById(String trafficOutputFolder, String octopusOutputFolder, String genericOutputFolder, String houseId) {\r
+       private String getFolderById(String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder, String octopusOutputFolder,\r
+                       String genericOutputFolder, String houseId) {\r
                String id = houseId.toUpperCase();\r
                MetadataType mdType = MetadataTypeDetector.GuessMetadataType(id);\r
                String result = null;\r
@@ -86,9 +97,13 @@ public class OutputPathAndNameSelectorStep extends JobStep {
                        result = octopusOutputFolder;\r
                        break;\r
                case TrafficMaterial:\r
+                       result = materialOutputFolder;\r
+                       break;\r
                case TrafficPromo:\r
+                       result = promoOutputFolder;\r
+                       break;\r
                case TrafficAD:\r
-                       result = trafficOutputFolder;\r
+                       result = advertisementOutputFolder;\r
                        break;\r
                }\r
                return result;\r