- Coser-commits - mailman.cloud.codelutin.com

r573 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-web/src/main/java/fr/ifremer/coser/web/actions/common coser-web/src/main/java/fr/ifremer/coser/web/actions/source
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 16:01:34 +0000 (Tue, 25 Jan 2011) New Revision: 573 Log: Add option to get result with allowed data sources. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/ZoneAction.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-01-25 16:00:37 UTC (rev 572) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-25 16:01:34 UTC (rev 573) @@ -1033,10 +1033,11 @@ * campagne qui sont disponible dans cette zone principale. * * @param facade facade (le nom de la facade principale) + * @param onlyWithSource retourn zone liste with available source data * @return couple subzoneid/sub * @throws CoserBusinessException */ - public Map<String, String> getZoneForFacade(String facade) throws CoserBusinessException { + public Map<String, String> getZoneForFacade(String facade, boolean onlyWithSource) throws CoserBusinessException { Map<String, String> zonesForFacade = new HashMap<String, String>(); // get subzone for main zone @@ -1072,17 +1073,19 @@ for (File resultFile : resultFiles) { if (resultFile.isDirectory()) { RSufiResult rsufiResult = projectService.getRSufiResult(resultFile); - String resultZoneId = rsufiResult.getZone(); - if (subZones.contains(resultZoneId)) { - String zoneid = resultZoneId; - - // get zone name - // "id";"facade";"zone";"periode";"serie";"comment";"map" - int zoneIndex = getZonesMap().indexOf(zoneid); - String[] zoneData = getZonesMap().get(zoneIndex); - String zoneName = zoneData[2] + " - " + zoneData[3] + " - " + zoneData[4]; - - zonesForFacade.put(zoneid, zoneName); + + if (!onlyWithSource || rsufiResult.isDataAllowed()) { + String resultZoneId = rsufiResult.getZone(); + if (subZones.contains(resultZoneId)) { + String zoneid = resultZoneId; + // get zone name + // "id";"facade";"zone";"periode";"serie";"comment";"map" + int zoneIndex = getZonesMap().indexOf(zoneid); + String[] zoneData = getZonesMap().get(zoneIndex); + String zoneName = zoneData[2] + " - " + zoneData[3] + " - " + zoneData[4]; + + zonesForFacade.put(zoneid, zoneName); + } } } } @@ -1831,6 +1834,10 @@ */ protected File generateSourceZip(Project project, Selection selection, File resultDirectory, RSufiResult rSufiResult) throws CoserBusinessException { + if (rSufiResult.isDataAllowed()) { + throw new CoserBusinessException("Can't download source for non allowed result"); + } + File resultZip = null; try { Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-01-25 16:00:37 UTC (rev 572) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-01-25 16:01:34 UTC (rev 573) @@ -75,7 +75,7 @@ try { // renvoi la liste des id subzone-survey et leurs label associé - zones = webService.getZoneForFacade(facade); + zones = webService.getZoneForFacade(facade, false); zonesPictures = webService.getZonePictures(); zonesMetaInfo = webService.getZoneMetaInfo(); } catch (CoserBusinessException ex) { Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/ZoneAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/ZoneAction.java 2011-01-25 16:00:37 UTC (rev 572) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/ZoneAction.java 2011-01-25 16:01:34 UTC (rev 573) @@ -22,6 +22,10 @@ package fr.ifremer.coser.web.actions.source; +import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.services.WebService; +import fr.ifremer.coser.web.CoserWebException; +import fr.ifremer.coser.web.ServiceFactory; import fr.ifremer.coser.web.actions.common.CommonZone; /** @@ -38,4 +42,20 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3385467755357775199L; + @Override + public String execute() { + + WebService webService = ServiceFactory.getWebService(); + + try { + // renvoi la liste des id subzone-survey et leurs label associé + zones = webService.getZoneForFacade(facade, true); + zonesPictures = webService.getZonePictures(); + zonesMetaInfo = webService.getZoneMetaInfo(); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get zone map", ex); + } + + return SUCCESS; + } }

1 0

r572 - trunk/coser-web/src/main/webapp/WEB-INF/content/source
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 16:00:37 +0000 (Tue, 25 Jan 2011) New Revision: 572 Log: Fix image size, download link Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp 2011-01-25 11:59:10 UTC (rev 571) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/source.jsp 2011-01-25 16:00:37 UTC (rev 572) @@ -32,11 +32,11 @@ <h2><s:text name="message.source.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" /> - <s:a action="source-quality"> + <p><s:a action="source-quality"> <s:param name="zone" value="%{zone}" /> <s:text name="message.source.download"></s:text> - </s:a>. + </s:a>.</p> </body> </html> \ No newline at end of file

1 0

r571 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 11:59:10 +0000 (Tue, 25 Jan 2011) New Revision: 571 Log: Fix tests Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-25 11:56:30 UTC (rev 570) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-25 11:59:10 UTC (rev 571) @@ -116,7 +116,7 @@ registerUploadedResult("/web/upload2.zip"); // some tests (from first) - assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result111"); + assertFileNotExists(config.getWebMapsProjectsDirectory() + "/projet1/selections/selection11/results/result111"); assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result112"); assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection12"); // some tests (from second)

1 0

r570 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services test/resources test/resources/web
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 11:56:30 +0000 (Tue, 25 Jan 2011) New Revision: 570 Log: Fix result upload merge with separated indicators and maps results. 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-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java trunk/coser-business/src/test/resources/web/upload1.zip trunk/coser-business/src/test/resources/web/upload2.zip trunk/coser-business/src/test/resources/webindicators.csv 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-25 11:54:59 UTC (rev 569) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-25 11:56:30 UTC (rev 570) @@ -414,8 +414,7 @@ if (!projectDirectory.isDirectory()) { throw new CoserBusinessException(_("Project %s doesn't exists !", projectName)); } - Project project = new Project(); - project.setName(projectName); + Project project = new Project(projectName); for (Category category : Category.values()) { // load only additional files 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-25 11:54:59 UTC (rev 569) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-25 11:56:30 UTC (rev 570) @@ -254,8 +254,7 @@ for (File existingProject : projects) { if (existingProject.isDirectory()) { String projectName = existingProject.getName(); - Project p = new Project(); - p.setName(projectName); + Project p = new Project(projectName); // loop on selections File selectionsDirectory = new File(existingProject, CoserConstants.STORAGE_SELECTION_DIRECTORY); @@ -264,8 +263,7 @@ for (File existingSelection : selections) { if (existingSelection.isDirectory()) { String selectionName = existingSelection.getName(); - Selection s = new Selection(); - s.setName(selectionName); + Selection s = new Selection(selectionName); // loop on result File rsufisDirectory = new File(existingSelection, CoserConstants.STORAGE_RESULTS_DIRECTORY); @@ -343,7 +341,7 @@ Project project = path.getProject(); project = projectService.openProject(project.getName()); - OneResultFileFilter oneRFF = new OneResultFileFilter(config, + OneResultFileFilter oneRFF = new OneResultFileFilter(config.getProjectsDirectory(), project, path.getSelection(), path.getRsufiResult(), publishDataResults.contains(path)); mFileFilters.add(oneRFF); } @@ -566,14 +564,16 @@ * les fils (et il faut qu'il les demande) */ protected class OneResultFileFilter implements FileFilter { - protected CoserBusinessConfig config; + protected File projectsDirectory; + + /** Doit etre un project chargé avec nom de fichier originaux. */ protected Project project; protected Selection selection; protected RSufiResult rsufi; protected boolean exportWithData; - public OneResultFileFilter(CoserBusinessConfig config, Project project, Selection selection, RSufiResult rsufi, boolean exportWithData) { - this.config = config; + public OneResultFileFilter(File projectsDirectory, Project project, Selection selection, RSufiResult rsufi, boolean exportWithData) { + this.projectsDirectory = projectsDirectory; this.project = project; this.selection = selection; this.rsufi = rsufi; @@ -591,7 +591,7 @@ try { String currentPathName = pathname.getCanonicalPath() + File.separator; - File projectDirectory = new File(config.getProjectsDirectory(), project.getName()); + File projectDirectory = new File(projectsDirectory, project.getName()); File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); File selectionDirectory = new File(selectionsDirectory, selection.getName()); File resultsDirectory = new File(selectionDirectory, CoserConstants.STORAGE_RESULTS_DIRECTORY); @@ -655,8 +655,12 @@ * <li>suppression des selections vides * <li>suppression des projets vides * <li>copie (avec ecrasement) des nouveaux fichiers dans l'ancien répertoire + * mais seulement pour ceux des zones concernés (partie difficile) * </ul> * + * TODO chatellier 20110125 l'algorithme n'est pour l'instant pas performant + * et contient pas mal de code dupliqué, mais pour la v1.0 ca ira. + * * @param archiveFile uploaded file * @throws CoserBusinessException */ @@ -674,20 +678,24 @@ // suppression dans l'ancien répertoire des resultat deja present // dans le nouveau (pour les conflits) cleanCurrentProjectDirectory(projectsDirectory, indicatorsResultZoneIds); + // creation du filter qui copiera juste ce qu'il faut + FileFilter indicatorsFileFilter = getCopyFileFilter(tempDirectory, false); // copie (avec ecrasement) des nouveaux fichiers dans l'ancien répertoire - FileUtils.copyDirectory(tempDirectory, projectsDirectory); + //FileUtils.copyDirectory(tempDirectory, projectsDirectory, indicatorsFileFilter); + customCopyDirectory(tempDirectory, projectsDirectory, indicatorsFileFilter); - File mapsDirectory = config.getWebMapsProjectsDirectory(); // recuperation des noms zone des nouveau fichiers List<String> mapsResultZoneIds = getZonesIds(tempDirectory, true); // suppression dans l'ancien répertoire des resultat deja present // dans le nouveau (pour les conflits) cleanCurrentProjectDirectory(mapsDirectory, mapsResultZoneIds); + // creation du filter qui copiera juste ce qu'il faut + FileFilter mapsFileFilter = getCopyFileFilter(tempDirectory, true); // copie (avec ecrasement) des nouveaux fichiers dans l'ancien répertoire - FileUtils.copyDirectory(tempDirectory, mapsDirectory); + //FileUtils.copyDirectory(tempDirectory, mapsDirectory, mapsFileFilter); + customCopyDirectory(tempDirectory, mapsDirectory, mapsFileFilter); - FileUtils.deleteDirectory(tempDirectory); if (log.isInfoEnabled()) { @@ -705,7 +713,36 @@ } /** + * N'utilise pas la methode de commons-fileutils, car lorsqu'un répertoire + * est refusé, il ne descend pas dans les sous répertoire alors que dans + * notre cas il le faut. + * + * @param directory directory + * @param projectsDirectory + * @param indicatorsFileFilter + * @throws IOException + */ + protected void customCopyDirectory(File srcDir, + File destDir, FileFilter indicatorsFileFilter) throws IOException { + List<File> files = FileUtil.getFilteredElements(srcDir, null, true); + for (File file : files) { + if (indicatorsFileFilter.accept(file)) { + String path = file.getPath().substring(srcDir.getPath().length()); + + File destFile = new File(destDir, path); + if (file.isDirectory()) { + destFile.mkdirs(); + } + else { + FileUtils.copyFile(file, destFile); + } + } + } + } + + /** * Met à jour certaines proprietes apres la mise à jour des données. + * * @throws CoserBusinessException */ protected void updateDataProperties() throws CoserBusinessException { @@ -824,6 +861,61 @@ } /** + * Retourne un file filter qui ne copiera que les dossiers resultat + * correspondant au type demandé. Pour un resultat, le filtre devra + * egalement copier les dossiers projet et selection correspondants. + * + * @param scanDirectory directory containing result to copy + * @param mapResults result type to get + * @return aggragated file filter + * @throws CoserBusinessException + */ + protected FileFilter getCopyFileFilter(File scanDirectory, boolean mapResults) throws CoserBusinessException { + + MultipleFileFilter aggregateFileFilter = new MultipleFileFilter(); + + File[] projectFiles = scanDirectory.listFiles(); + if (projectFiles != null) { + for (File projectFile : projectFiles) { + if (projectFile.isDirectory()) { + + File selectionsDirectory = new File(projectFile, CoserConstants.STORAGE_SELECTION_DIRECTORY); + File[] selectionFiles = selectionsDirectory.listFiles(); + if (selectionFiles != null) { + for (File selectionFile : selectionFiles) { + if (selectionFile.isDirectory()) { + + File resultsDirectory = new File(selectionFile, CoserConstants.STORAGE_RESULTS_DIRECTORY); + File[] resultFiles = resultsDirectory.listFiles(); + if (resultFiles != null) { + for (File resultFile : resultFiles) { + if (resultFile.isDirectory()) { + RSufiResult rsufiResult = projectService.getRSufiResult(resultFile); + + // return result depending on result type + if ( (mapResults && rsufiResult.isMapsResult()) || + (!mapResults && rsufiResult.isIndicatorsResult())) { + + Project p = new Project(projectFile.getName()); + Selection s = new Selection(selectionFile.getName()); + + OneResultFileFilter resultFileFilter = new OneResultFileFilter(scanDirectory, p, s, rsufiResult, true); + aggregateFileFilter.add(resultFileFilter); + } + } + } + } + } + } + } + } + } + } + + return aggregateFileFilter; + } + + /** * Fait le menage dans le dossier courant des projets en supprimant * tout les resulat qui ont un result id non present dans la liste * {@code newResultIds}. Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2011-01-25 11:54:59 UTC (rev 569) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2011-01-25 11:56:30 UTC (rev 570) @@ -104,7 +104,7 @@ @AfterClass public static void cleanDirectory() throws IOException { - FileUtils.deleteDirectory(testDirectory); + //FileUtils.deleteDirectory(testDirectory); } /** Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-25 11:54:59 UTC (rev 569) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-25 11:56:30 UTC (rev 570) @@ -88,7 +88,7 @@ @Test public void testGetIndicators() throws CoserBusinessException { MultiKeyMap indicators = webService.getIndicatorsMap(); - Assert.assertEquals(62, indicators.size()); + Assert.assertEquals(93, indicators.size()); } /** @@ -119,11 +119,10 @@ assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result111"); assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result112"); assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection12"); - assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet2"); // some tests (from second) assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result113"); assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result114"); - assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet3/selections/selection31/results/result311"); + assertFileExists(config.getWebMapsProjectsDirectory() + "/projet3/selections/selection31/results/result311"); } /** Modified: trunk/coser-business/src/test/resources/web/upload1.zip =================================================================== (Binary files differ) Modified: trunk/coser-business/src/test/resources/web/upload2.zip =================================================================== (Binary files differ) Modified: trunk/coser-business/src/test/resources/webindicators.csv =================================================================== --- trunk/coser-business/src/test/resources/webindicators.csv 2011-01-25 11:54:59 UTC (rev 569) +++ trunk/coser-business/src/test/resources/webindicators.csv 2011-01-25 11:56:30 UTC (rev 570) @@ -1,33 +1,33 @@ -"id";"label_fr";"label_en" -"Abundance";"Abondance totale dans la zone (valeur relative)";"Total abundance in the area (relative value)" -"Biomass";"Biomasse totale dans la zone (valeur relative)";"Total biomass in the area (relative value)" -"Dbar";"Densité relative dans la zone";"Relative density in the area" -"l0.05";"Longueur au 5ème percentile de la distribution de longueur";"Length at the fifth percentile of the length distribution" -"l0.25";"Longueur au 25ème percentile de la distribution de longueur";"Length at the twenty-fifth percentile of the length distribution" -"l0.75";"Longueur au 75ème percentile de la distribution de longueur";"Length at the seventy-fifth percentile of the length distribution" -"l0.95";"Longueur au 95ème percentile de la distribution de longueur";"Length at the ninety- fifth percentile of the length distribution" -"L50";"Taille à 50 % de maturité";"Size at 50 % maturity" -"Lbar";"Longueur moyenne dans la population";"Mean length in the population" -"lnN";"Logarithme naturel de l'abondance";"Natural Logarithm of abundance" -"lvar";"Variance de la longueur dans l'échantillon";"Sample variance of length measurements" -"PropMat";"Proportion de matures";"Proportion of mature individuals" -"sexRatio";"Sexe ratio (males/femelles)";"Sex ratio (males/females)" -"Wbar";"Poids individuel moyen dans la population";"Average individual weight in the population" -"biomBig";"Biomasse des grandes espèces (valeur relative)";"Biomass of the large species (relative value)" -"biomSmall";"Biomasse des petites espèces (valeur relative)";"Biomass of the small species (relative value)" -"Btot";"Biomasse totale dans la zone (valeur relative)";"Total biomass in the area (relative value)" -"Delta";"Indice de diversité \u0394";"Diversity index \u0394" -"Gtot";"Moyenne géométrique du nombre par espèce";"Geometric mean of species abundances" -"Lbcomm";"Taille moyenne dans communauté";"Average length in community" -"meanQuant0.95";"Moyenne des l0;95 des espèces";"Average across species of l0;95" -"meanWbar";"Moyenne des Wbar par espèce";"Average of species Wbar " -"Ntot";"Abondance totale dans la zone (valeur relative)";"Total abundance in the area (relative value)" -"propL15";"Proportion des grands individus en nombre (taille seuil 15 cm)";"Proportion of large individuals in numbers (threshold size 15 cm)" -"propL20";"Proportion des grands individus en nombre (taille seuil 20 cm)";"Proportion of large individuals in numbers (threshold size 20 cm)" -"propL25";"Proportion des grands individus en nombre (taille seuil 25 cm)";"Proportion of large individuals in numbers (threshold size 25 cm)" -"propL30";"Proportion des grands individus en nombre (taille seuil 30 cm)";"Proportion of large individuals in numbers (threshold size 30 cm)" -"propLW";"Proportion des grands individus en poids (/ taille seuil spécifique à la zone)";"Proportion of large individuals in weight (/ threshold length area specific)" -"Shannonmod";"Indice de Shannon normalisé / première année";"Shannon index normalized wrt the first year" -"Wbcomm";"Poids moyen d'un individu";"Average weight of an individual" -"Wtot";"Biomasse totale dans la zone (valeur relative)";"Total biomass in the area (relative value)" +"id";"label_fr";"label_en";"unit" +"Abundance";"Abondance totale dans la zone (valeur relative)";"Total abundance in the area (relative value)";"" +"Biomass";"Biomasse totale dans la zone (valeur relative)";"Total biomass in the area (relative value)";"" +"Dbar";"Densité relative dans la zone";"Relative density in the area";"" +"l0.05";"Longueur au 5ème percentile de la distribution de longueur";"Length at the fifth percentile of the length distribution";"cm" +"l0.25";"Longueur au 25ème percentile de la distribution de longueur";"Length at the twenty-fifth percentile of the length distribution";"cm" +"l0.75";"Longueur au 75ème percentile de la distribution de longueur";"Length at the seventy-fifth percentile of the length distribution";"cm" +"l0.95";"Longueur au 95ème percentile de la distribution de longueur";"Length at the ninety- fifth percentile of the length distribution";"cm" +"L50";"Taille à 50 % de maturité";"Size at 50 % maturity";"cm" +"Lbar";"Longueur moyenne dans la population";"Mean length in the population";"cm" +"lnN";"Logarithme naturel de l'abondance";"Natural Logarithm of abundance";"" +"lvar";"Variance de la longueur dans l'échantillon";"Sample variance of length measurements";"" +"PropMat";"Proportion de matures";"Proportion of mature individuals";"" +"sexRatio";"Sexe ratio (males/femelles)";"Sex ratio (males/females)";"" +"Wbar";"Poids individuel moyen dans la population";"Average individual weight in the population";"kg" +"biomBig";"Biomasse des grandes espèces (valeur relative)";"Biomass of the large species (relative value)";"" +"biomSmall";"Biomasse des petites espèces (valeur relative)";"Biomass of the small species (relative value)";"" +"Btot";"Biomasse totale dans la zone (valeur relative)";"Total biomass in the area (relative value)";"" +"Delta";"Indice de diversité \u0394";"Diversity index \u0394";"" +"Gtot";"Moyenne géométrique du nombre par espèce";"Geometric mean of species abundances";"" +"Lbcomm";"Taille moyenne dans communauté";"Average length in community";"cm" +"meanQuant0.95";"Moyenne des l0;95 des espèces";"Average across species of l0;95";"cm" +"meanWbar";"Moyenne des Wbar par espèce";"Average of species Wbar";"kg" +"Ntot";"Abondance totale dans la zone (valeur relative)";"Total abundance in the area (relative value)";"" +"propL15";"Proportion des grands individus en nombre (taille seuil 15 cm)";"Proportion of large individuals in numbers (threshold size 15 cm)";"" +"propL20";"Proportion des grands individus en nombre (taille seuil 20 cm)";"Proportion of large individuals in numbers (threshold size 20 cm)";"" +"propL25";"Proportion des grands individus en nombre (taille seuil 25 cm)";"Proportion of large individuals in numbers (threshold size 25 cm)";"" +"propL30";"Proportion des grands individus en nombre (taille seuil 30 cm)";"Proportion of large individuals in numbers (threshold size 30 cm)";"" +"propLW";"Proportion des grands individus en poids (/ taille seuil spécifique à la zone)";"Proportion of large individuals in weight (/ threshold length area specific)";"" +"Shannonmod";"Indice de Shannon normalisé / première année";"Shannon index normalized wrt the first year";"" +"Wbcomm";"Poids moyen d'un individu)";"Average weight of an individual";"kg" +"Wtot";"Biomasse totale dans la zone (valeur relative)";"Total biomass in the area (relative value)";""

1 0

r569 - trunk/coser-web/src/main/webapp/styles
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 11:54:59 +0000 (Tue, 25 Jan 2011) New Revision: 569 Log: fix image position Modified: trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-25 10:21:03 UTC (rev 568) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-25 11:54:59 UTC (rev 569) @@ -557,7 +557,7 @@ #middle .col_droite { float: right; - margin-top: 159px; + margin-top: 155px; width: 288px; position: relative; height: 100%;

1 0

r568 - trunk/coser-business/src/main/java/fr/ifremer/coser/bean
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 10:21:03 +0000 (Tue, 25 Jan 2011) New Revision: 568 Log: Readd empty contructor too Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-25 09:51:18 UTC (rev 567) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-25 10:21:03 UTC (rev 568) @@ -113,7 +113,12 @@ /** Type especes */ protected DataStorage typeEspeces; + public Project() { + + } + public Project(String name) { + this(); this.name = name; } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2011-01-25 09:51:18 UTC (rev 567) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2011-01-25 10:21:03 UTC (rev 568) @@ -76,7 +76,12 @@ /** Data download allowed. */ protected boolean dataAllowed; + public RSufiResult() { + + } + public RSufiResult(String name) { + this(); this.name = name; }

1 0

r567 - trunk/coser-business/src/main/java/fr/ifremer/coser/bean
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 09:51:18 +0000 (Tue, 25 Jan 2011) New Revision: 567 Log: Add contructor with name parameter Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-25 09:01:25 UTC (rev 566) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-25 09:51:18 UTC (rev 567) @@ -113,6 +113,10 @@ /** Type especes */ protected DataStorage typeEspeces; + public Project(String name) { + this.name = name; + } + public String getName() { return name; } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2011-01-25 09:01:25 UTC (rev 566) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2011-01-25 09:51:18 UTC (rev 567) @@ -76,6 +76,10 @@ /** Data download allowed. */ protected boolean dataAllowed; + public RSufiResult(String name) { + this.name = name; + } + public Date getCreationDate() { return creationDate; } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2011-01-25 09:01:25 UTC (rev 566) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2011-01-25 09:51:18 UTC (rev 567) @@ -96,8 +96,6 @@ protected List<RSufiResult> rsufiResults; public Selection() { - super(); - // c'est plus facile de ne pas gerer le cas "null" partout dans le code allYears = Collections.EMPTY_LIST; selectedYears = Collections.EMPTY_LIST; @@ -107,6 +105,11 @@ selectedSpeciesSizeAllYear = Collections.EMPTY_LIST; selectedSpeciesMaturity = Collections.EMPTY_LIST; } + + public Selection(String name) { + this(); + this.name = name; + } public String getName() { return name;

1 0

r566 - in trunk/coser-web/src/main/webapp: WEB-INF/content/com WEB-INF/content/map WEB-INF/content/pop WEB-INF/content/source images styles
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 09:01:25 +0000 (Tue, 25 Jan 2011) New Revision: 566 Log: Use new pictures. Update styles Added: trunk/coser-web/src/main/webapp/images/facadesmap.png Removed: trunk/coser-web/src/main/webapp/images/barre_select.png trunk/coser-web/src/main/webapp/images/bt_suite.png trunk/coser-web/src/main/webapp/images/bt_suitehover.png trunk/coser-web/src/main/webapp/images/footer_01.jpg trunk/coser-web/src/main/webapp/images/ico_carte.png trunk/coser-web/src/main/webapp/images/ico_pdf.png trunk/coser-web/src/main/webapp/images/poisson.jpg trunk/coser-web/src/main/webapp/images/zonesmap.jpg Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp trunk/coser-web/src/main/webapp/images/fond_02.jpg trunk/coser-web/src/main/webapp/images/logoSIH.png trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/facade.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -34,7 +34,7 @@ <p><s:text name="message.com.paragraph1" /></p> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -43,7 +43,7 @@ </div> </s:iterator> <div id="coserzonemap"> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> </div> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -40,7 +40,7 @@ <s:text name="message.map.warningcontent" /> </p> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -32,7 +32,7 @@ <h2><s:text name="message.map.title" /></h2> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -35,7 +35,7 @@ <p><s:text name="message.pop.paragraph1" /></p> <p><s:text name="message.pop.paragraph2" /></p> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -43,7 +43,7 @@ </div> </s:iterator> <div id="coserzonemap"> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> </div> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/facade.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -42,7 +42,7 @@ <p><s:text name="message.source.paragraph3" /></p> <p><s:text name="message.source.paragraph4" /></p> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/zone.jsp 2011-01-25 09:01:25 UTC (rev 566) @@ -43,7 +43,7 @@ </div> </s:iterator> <div id="coserzonemap"> - <img src="<s:url value='/images/zonesmap.jpg' />" /> + <img src="<s:url value='/images/facadesmap.png' />" /> </div> <br /> Deleted: trunk/coser-web/src/main/webapp/images/barre_select.png =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/bt_suite.png =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/bt_suitehover.png =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/facadesmap.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/facadesmap.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/coser-web/src/main/webapp/images/fond_02.jpg =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/footer_01.jpg =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/ico_carte.png =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/ico_pdf.png =================================================================== (Binary files differ) Modified: trunk/coser-web/src/main/webapp/images/logoSIH.png =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/poisson.jpg =================================================================== (Binary files differ) Deleted: trunk/coser-web/src/main/webapp/images/zonesmap.jpg =================================================================== (Binary files differ) Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-24 21:23:43 UTC (rev 565) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-25 09:01:25 UTC (rev 566) @@ -377,9 +377,10 @@ #head a.logoSIH { background: url(../images/logoSIH.png) no-repeat; - width: 250px; + width: 160px; height: 135px; float: left; + margin-left: 55px; } #head a.logoIfremer { @@ -419,12 +420,16 @@ #middle .page .content { /*background: url(../images/warper_page.png) repeat-y;*/ background-color: white; - -moz-border-radius: 10px; - border-radius: 10px; font-size: 140%; color: #2e2e2e; line-height: 1.4em; width: 100%; + + -moz-border-radius: 10px; + border-radius: 10px; + -moz-box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5); + box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5); } #middle .page span.clb {

1 0

r565 - trunk
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 21:23:43 +0000 (Mon, 24 Jan 2011) New Revision: 565 Log: Update i18n Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-24 20:58:52 UTC (rev 564) +++ trunk/pom.xml 2011-01-24 21:23:43 UTC (rev 565) @@ -320,7 +320,7 @@  <jaxx.version>2.2.5</jaxx.version> - <i18n.version>2.0.1</i18n.version> + <i18n.version>2.1</i18n.version> <struts.version>2.2.1.1</struts.version> </properties>

1 0

r564 - trunk/coser-web/src/main/webapp/styles
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 20:58:52 +0000 (Mon, 24 Jan 2011) New Revision: 564 Log: Fix footer Modified: trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-24 20:52:01 UTC (rev 563) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-24 20:58:52 UTC (rev 564) @@ -585,6 +585,7 @@ /*margin: 30px 0;*/ position: relative; text-transform: uppercase; + text-align:center; color: #fff; font-size: 140%; } @@ -595,7 +596,7 @@ } #footer ul li { - float: left; + display:inline; list-style: none; margin: 0 10px; line-height: 30px;

1 0