From: Márk Mérész <USER\mark.meresz>
Date: Tue, 17 Jul 2018 14:29:48 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=e3f9475321717f340156a18a7be28e6929f16c7c;p=mediacube.git

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

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