From: Vásáry Dániel Date: Tue, 10 Oct 2017 15:04:17 +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=dfb2a742a1a903d08edce76fefc98db6a5657d5b;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30579 --- 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 b1f806ee..10f7884c 100644 --- a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand-material.xml +++ b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml @@ -2,6 +2,8 @@ + + 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 d166e18a..7e494610 100644 --- 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; public class CheckMORPHEUSMissingMaterialsStep extends JobStep { - private static final String MATERIAL_ID = "Material ID"; private static final Logger logger = LogManager.getLogger(); + private static final String TARGET_NAME_PATTERN = "targetNamePattern"; + private static final String MATERIAL_ID = "Material ID"; private static final String RETRIEVE_MATERIAL = "Adásanyag visszatöltés"; - private static final String OUTPUT_PATH = "outputPath"; + private static final String TARGET_PATH = "targetPath"; private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia"; private static final String JOBTEMPLATE = "retrieve-material.xml"; private static final String CSV_EXT = ".csv"; @@ -64,7 +65,7 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep { return; } - jobEngine.submit(JOBTEMPLATE, RETRIEVE_MATERIAL, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, targetPath)); + jobEngine.submit(JOBTEMPLATE, RETRIEVE_MATERIAL, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), TARGET_PATH, targetPath, TARGET_NAME_PATTERN, "%s")); } private void processMissingMaterialCSV(Path csvFilePath) throws Exception { 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 d54e055e..d4f096e6 100644 --- 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; public class CheckTRAFFICMissingMaterialsStep extends JobStep { private static final Logger logger = LogManager.getLogger(); - private static final String OUTPUT_PATH = "outputPath"; + private static final String TARGET_NAME_PATTERN = "targetNamePattern"; + private static final String TARGET_PATH = "targetPath"; private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia"; private static final String SQLSERVER_JDBC_SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; private static final String SQL = "{call dbo.clIFsp_EC_MAM(1001, 32, Null, Null, ?)}"; @@ -81,7 +82,7 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep { } String title = "Traffic adásanyag visszatöltés: " + trafficId; - jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, targetPath)); + jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), TARGET_PATH, targetPath, TARGET_NAME_PATTERN, "%s")); } } 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 index 00000000..eab9db4d --- /dev/null +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java @@ -0,0 +1,34 @@ +package user.jobengine.server.steps; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import user.jobengine.db.Media; +import user.jobengine.server.IJobEngine; +import user.jobengine.server.IJobRuntime; + +/** + * Elinditja minden mediara az archivalo folyamatot. + * + * @author robi + */ +public class OutputPathAndNameSelectorStep extends JobStep { + private static final String ARCHIVE = "Archiválás"; + private static final String GLOBAL_SOURCE_PATH = "globalSourcePath"; + private static final Logger logger = LogManager.getLogger(); + private static final String JOBTEMPLATE = "archive-material.xml"; + private static final String ARCHIVE_ITEM = "archiveItem"; + + @StepEntry + public Object[] execute(Media mediaCubeMedia, String houseId, IJobEngine jobEngine, IJobRuntime jobRuntime) { + String targetPath = ""; + String targetNamePattern = ""; + + try { + } catch (Exception e) { + logger.catching(e); + } + return new Object[] { targetPath, targetNamePattern }; + } + +} 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 4a22a963..4ef58c7e 100644 --- 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; public class SearchModel extends BaseModel { + private static final String TARGET_NAME_PATTERN = "targetNamePattern"; + private static final String RESTORE = "Visszatöltés"; private static final String JOBTEMPLATE = "retrieve-material.xml"; private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia"; - private static final String OUTPUT_PATH = "outputPath"; + private static final String TARGET_PATH = "targetPath"; private static final Logger logger = LogManager.getLogger(); @@ -57,7 +59,8 @@ public class SearchModel extends BaseModel { public void downloadMedia() { if (getHasTSMMediaFile()) { try { - Map parameters = ListUtils.asMap(MEDIA_CUBE_MEDIA, this.selectedMedia, OUTPUT_PATH, "/mnt/ISILON/RESTORE"); + Map parameters = ListUtils.asMap(MEDIA_CUBE_MEDIA, this.selectedMedia, TARGET_PATH, "/mnt/ISILON/RESTORE", TARGET_NAME_PATTERN, + "%s"); IJobEngine jobEngine = JobEngine.getInstance(); IJobRuntime runtime1 = jobEngine.submit(JOBTEMPLATE, RESTORE, parameters); } catch (Exception exc) { @@ -144,7 +147,7 @@ public class SearchModel extends BaseModel { } return ret; } - + public boolean getHasSelectedMediaFile(){ String mediaFilePath =getMediaFilePath(); return (mediaFilePath != null && !"".equals(mediaFilePath));