Author: chatellier Date: 2009-05-06 10:55:31 +0000 (Wed, 06 May 2009) New Revision: 2189 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Reachivage des resultats de simulation en zip Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-05-06 09:48:22 UTC (rev 2188) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-05-06 10:55:31 UTC (rev 2189) @@ -180,19 +180,10 @@ //ZipUtil.compressFiles(simulationResultZip, simulationStorage.getFile(), // Collections.singletonList(new File(simulationStorage.getFile(), simulationStorage.getName())), true); - // if .tbz2 or .tar.bz2 - if (simulationResultArchive.getName().endsWith("bz2")) { - if (log.isInfoEnabled()) { - log.info("Compressing simulation as tar/bzip2 : " + simulationResultArchive); - } - Tbz2Util.compress(simulationResultArchive, simulationStorage.getFile(), null, true); + if (log.isInfoEnabled()) { + log.info("Compressing simulation as zip : " + simulationResultArchive); } - else { - if (log.isInfoEnabled()) { - log.info("Compressing simulation as zip : " + simulationResultArchive); - } - ZipUtil.compress(simulationResultArchive, simulationStorage.getFile(), null, true); - } + ZipUtil.compress(simulationResultArchive, simulationStorage.getFile(), null, true); simulationStorage.getStorage().closeContext(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-06 09:48:22 UTC (rev 2188) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-06 10:55:31 UTC (rev 2189) @@ -41,6 +41,7 @@ import org.codelutin.util.MD5; import org.codelutin.util.MD5InputStream; import org.codelutin.util.Tbz2Util; +import org.codelutin.util.ZipUtil; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; @@ -83,8 +84,8 @@ protected Configuration freemarkerConfiguration; /** Freemarker qsub template. */ - protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; - //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; + //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; + protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; /** * Opened session. Stored in static context to not reask passphrase at each @@ -365,7 +366,8 @@ // FIXME too slow methods //SimulationStorage.importZip(resultZipFile); - Tbz2Util.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); + //Tbz2Util.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); + ZipUtil.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); if (log.isDebugEnabled()) { log.debug("Simulation imported : " + resultArchiveFile.getAbsolutePath()); @@ -665,7 +667,7 @@ protected File downloadResultsArchive(Session session, String simulationId, String md5sum) throws SSHException, IOException { - File localFile = File.createTempFile("simulation-results", ".tbz2"); + File localFile = File.createTempFile("simulation-results", ".zip"); if (log.isDebugEnabled()) { log.debug("Downloading results in " + localFile.getAbsolutePath()); @@ -822,7 +824,7 @@ remotePath += "/"; } - remotePath += "simulation-" + simulationId + "-result.tbz2"; + remotePath += "simulation-" + simulationId + "-result.zip"; return remotePath; }