Author: chatellier Date: 2011-01-26 15:23:18 +0000 (Wed, 26 Jan 2011) New Revision: 590 Log: Fix files in data sources download zip. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-26 15:11:46 UTC (rev 589) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-26 15:23:18 UTC (rev 590) @@ -2625,10 +2625,11 @@ * @param project project * @param selection selection * @param directory directory to extract file to + * @param onlyDataTable extract only data table without additionnal information * @return extracted directory * @throws CoserBusinessException */ - public File extractRSUfiData(Project project, Selection selection, File directory) throws CoserBusinessException { + public File extractRSUfiData(Project project, Selection selection, File directory, boolean onlyDataTable) throws CoserBusinessException { File projectDirectory = new File(directory, project.getName()); projectDirectory.mkdirs(); @@ -2648,25 +2649,27 @@ } } - // extract additionnal data file (selected species) - File listSpeciesFile = new File(projectDirectory, "ListEspeces" + project.getName() + ".txt"); - fillListSpeciesFile(selection, listSpeciesFile); - - // extract additionnal project information - File informationFile = new File(projectDirectory, "project.txt"); - PrintStream out = null; - try { - out = new PrintStream(new BufferedOutputStream(new FileOutputStream(informationFile))); + if (!onlyDataTable) { + // extract additionnal data file (selected species) + File listSpeciesFile = new File(projectDirectory, "ListEspeces" + project.getName() + ".txt"); + fillListSpeciesFile(selection, listSpeciesFile); - out.println(_("coser.business.extract.projectName") + project.getName()); - out.println(_("coser.business.extract.projectAuthor") + project.getAuthor()); - out.println(_("coser.business.extract.projectComment") + project.getComment()); - } catch (IOException ex) { - throw new CoserBusinessException("Can't save project information file", ex); + // extract additionnal project information + File informationFile = new File(projectDirectory, "project.txt"); + PrintStream out = null; + try { + out = new PrintStream(new BufferedOutputStream(new FileOutputStream(informationFile))); + + out.println(_("coser.business.extract.projectName") + project.getName()); + out.println(_("coser.business.extract.projectAuthor") + project.getAuthor()); + out.println(_("coser.business.extract.projectComment") + project.getComment()); + } catch (IOException ex) { + throw new CoserBusinessException("Can't save project information file", ex); + } + finally { + IOUtils.closeQuietly(out); + } } - finally { - IOUtils.closeQuietly(out); - } return projectDirectory; } 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-01-26 15:11:46 UTC (rev 589) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-26 15:23:18 UTC (rev 590) @@ -1892,7 +1892,7 @@ // il ne faut pas les fichiers de selection, mais leurs // export rsufi (sans les lignes, et les quotes) - File archiveDir = projectService.extractRSUfiData(project, selection, tempDir); + File archiveDir = projectService.extractRSUfiData(project, selection, tempDir, true); // add decharge file File dechargePDF = generateDechargePDF(resultDirectory, rSufiResult); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-26 15:11:46 UTC (rev 589) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-26 15:23:18 UTC (rev 590) @@ -1167,7 +1167,7 @@ String directoryPath = view.getResultExtractDataField().getText(); File directory = new File(directoryPath); try { - projectService.extractRSUfiData(project, selection, directory); + projectService.extractRSUfiData(project, selection, directory, false); JOptionPane.showMessageDialog(view, _("coser.ui.selection.rsufidataextracted"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE);