Author: chatellier Date: 2011-02-02 10:05:56 +0000 (Wed, 02 Feb 2011) New Revision: 642 Log: Name extracted result archive as Coserextract<dateofday> Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-02 10:00:57 UTC (rev 641) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-02 10:05:56 UTC (rev 642) @@ -37,6 +37,8 @@ import java.io.StringWriter; import java.io.Writer; import java.nio.charset.Charset; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -71,6 +73,7 @@ import org.apache.http.entity.mime.content.StringBody; import org.apache.http.impl.client.DefaultHttpClient; import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; import org.w3c.dom.Document; @@ -334,8 +337,18 @@ public File performResultExtract(Collection<RSufiResultPath> selectedResults, Collection<RSufiResultPath> publishDataResults, File extractDirectory) throws CoserBusinessException { File prepareZip = null; try { - prepareZip = File.createTempFile("coserextract-", ".zip", extractDirectory); + // create zip file name not random name + if (extractDirectory == null) { + prepareZip = File.createTempFile("Coserextract-", ".zip"); + } + else { + // cas extraction vers un répertoire specifique + DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + String zipName = "Coserextract" + dateFormat.format(new Date()) + ".zip"; + prepareZip = new File(extractDirectory, zipName); + } + // copy selectively all data to target directory MultipleFileFilter mFileFilters = new MultipleFileFilter(); for (RSufiResultPath path : selectedResults) {