May 2013 - Wao-commits - mailman.cloud.codelutin.com

r1668 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com May 31, 2013

May 31, 2013

Author: bleny Date: 2013-05-31 15:23:24 +0200 (Fri, 31 May 2013) New Revision: 1668 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1668 Log: fixes #2512 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-05-26 06:58:33 UTC (rev 1667) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-05-31 13:23:24 UTC (rev 1668) @@ -1206,7 +1206,7 @@ "Merci d'ajouter le navire \"%d\" au portefeuille ALLEGRO de l'observateur %s %s %s.\n\n" + "%s.\n\n" + "Cordialement,\n\n" + - "L'équipe Obsmer", + "Wao", boat.getImmatriculation(), observer.getFullName(), observer.getCompany().getName(),

1 0

r1667 - trunk
by tchemit＠users.forge.codelutin.com May 26, 2013

May 26, 2013

Author: tchemit Date: 2013-05-26 08:58:33 +0200 (Sun, 26 May 2013) New Revision: 1667 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1667 Log: updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-16 13:21:33 UTC (rev 1666) +++ trunk/pom.xml 2013-05-26 06:58:33 UTC (rev 1667) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.9</version> + <version>3.4.11</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1666 - trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations
by bleny＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: bleny Date: 2013-05-16 15:21:33 +0200 (Thu, 16 May 2013) New Revision: 1666 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1666 Log: update file headers Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java 2013-05-16 13:14:50 UTC (rev 1665) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java 2013-05-16 13:21:33 UTC (rev 1666) @@ -3,7 +3,7 @@ /* * #%L * Wao :: Business - * + * * * $Id$ * $HeadURL$ * %% @@ -13,12 +13,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L%

1 0

r1665 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: maven-release Date: 2013-05-16 15:14:50 +0200 (Thu, 16 May 2013) New Revision: 1665 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1665 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-16 13:14:39 UTC (rev 1664) +++ trunk/pom.xml 2013-05-16 13:14:50 UTC (rev 1665) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> <modules> <module>wao-business</module> @@ -355,12 +355,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.4 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.4 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.4</url> + <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-05-16 13:14:39 UTC (rev 1664) +++ trunk/wao-business/pom.xml 2013-05-16 13:14:50 UTC (rev 1665) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2013-05-16 13:14:39 UTC (rev 1664) +++ trunk/wao-ui/pom.xml 2013-05-16 13:14:50 UTC (rev 1665) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1664 - in tags: . wao-3.4
by maven-release＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: maven-release Date: 2013-05-16 15:14:39 +0200 (Thu, 16 May 2013) New Revision: 1664 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1664 Log: [maven-release-plugin] copy for tag wao-3.4 Added: tags/wao-3.4/ Property changes on: tags/wao-3.4 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

r1663 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: maven-release Date: 2013-05-16 15:14:31 +0200 (Thu, 16 May 2013) New Revision: 1663 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1663 Log: [maven-release-plugin] prepare release wao-3.4 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-16 13:07:49 UTC (rev 1662) +++ trunk/pom.xml 2013-05-16 13:14:31 UTC (rev 1663) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> <modules> <module>wao-business</module> @@ -355,12 +355,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.4 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.4 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.4</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-05-16 13:07:49 UTC (rev 1662) +++ trunk/wao-business/pom.xml 2013-05-16 13:14:31 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2013-05-16 13:07:49 UTC (rev 1662) +++ trunk/wao-ui/pom.xml 2013-05-16 13:14:31 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1662 - in trunk/wao-business/src/main/java/fr/ifremer/wao: io/csv2/models/operations service
by bleny＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: bleny Date: 2013-05-16 15:07:49 +0200 (Thu, 16 May 2013) New Revision: 1662 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1662 Log: remove usages of guava Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java 2013-05-16 12:17:42 UTC (rev 1661) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java 2013-05-16 13:07:49 UTC (rev 1662) @@ -23,8 +23,8 @@ */ package fr.ifremer.wao.io.csv2.models.operations; -import com.google.common.base.Joiner; import fr.ifremer.wao.entity.TerrestrialLocation; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.csv.ValueFormatter; import java.util.Collection; @@ -41,7 +41,7 @@ districtNames.add(terrestrialLocation.getDistrictName()); } } - String value = Joiner.on(", ").join(districtNames); + String value = StringUtils.join(districtNames, ", "); return value; } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java 2013-05-16 12:17:42 UTC (rev 1661) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java 2013-05-16 13:07:49 UTC (rev 1662) @@ -23,7 +23,6 @@ */ package fr.ifremer.wao.io.csv2.models.operations; -import com.google.common.base.Splitter; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.lang3.StringUtils; @@ -67,10 +66,10 @@ if (StringUtils.isBlank(value)) { throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.districtMissing")); } - Iterable<String> districtCodes = Splitter.on(',').trimResults().split(value); + String[] districtCodes = StringUtils.split(value, ','); Collection<TerrestrialLocation> districts = new LinkedList<TerrestrialLocation>(); for (String districtCode : districtCodes) { - TerrestrialLocation district = indexedDistricts.get(districtCode); + TerrestrialLocation district = indexedDistricts.get(districtCode.trim()); if (district == null) { throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongDistrict", value)); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-05-16 12:17:42 UTC (rev 1661) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-05-16 13:07:49 UTC (rev 1662) @@ -24,7 +24,6 @@ package fr.ifremer.wao.service; -import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; @@ -1144,10 +1143,8 @@ boolean addBoatToObserversAllegroWallet = false; if (obsProgram == ObsProgram.OBSMER) { - addBoatToObserversAllegroWallet = - ImmutableSet.of( - ContactState.OBSERVATION_DONE, - ContactState.OBSERVATION_EXPECTED).contains(contactState); + addBoatToObserversAllegroWallet = contactState == ContactState.OBSERVATION_DONE + || contactState == ContactState.OBSERVATION_EXPECTED; } else if (obsProgram == ObsProgram.OBSVENTE) { addBoatToObserversAllegroWallet = ContactState.OBSERVATION_DONE == contactState; }

1 0

r1661 - trunk/wao-business/src/license
by bleny＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: bleny Date: 2013-05-16 14:17:42 +0200 (Thu, 16 May 2013) New Revision: 1661 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1661 Log: add missing third party license Modified: trunk/wao-business/src/license/THIRD-PARTY.properties Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2013-05-16 12:14:26 UTC (rev 1660) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2013-05-16 12:17:42 UTC (rev 1661) @@ -28,6 +28,7 @@ # #Mon Dec 19 10:03:49 CET 2011 antlr--antlr--2.7.6=BSD +com.sun.istack--istack-commons-runtime--2.14=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD ical4j--ical4j--0.9.20=iCal4j License http\://m2.modularity.net.au/projects/ical4j/license.html

1 0

r1660 - trunk/wao-business/src/license
by bleny＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: bleny Date: 2013-05-16 14:14:26 +0200 (Thu, 16 May 2013) New Revision: 1660 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1660 Log: add missing third party license Modified: trunk/wao-business/src/license/THIRD-PARTY.properties Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2013-05-16 11:50:52 UTC (rev 1659) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2013-05-16 12:14:26 UTC (rev 1660) @@ -32,3 +32,4 @@ dom4j--dom4j--1.6.1=BSD ical4j--ical4j--0.9.20=iCal4j License http\://m2.modularity.net.au/projects/ical4j/license.html javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jsr173_api--1.0=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0

r1659 - trunk
by bleny＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: bleny Date: 2013-05-16 13:50:52 +0200 (Thu, 16 May 2013) New Revision: 1659 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1659 Log: use i18n released version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-15 09:14:32 UTC (rev 1658) +++ trunk/pom.xml 2013-05-16 11:50:52 UTC (rev 1659) @@ -337,7 +337,7 @@ <license.licenseName>agpl_v3</license.licenseName>  - <nuitonI18nVersion>2.5.1-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <nuitonCsvVersion>2.6.12.1</nuitonCsvVersion> <nuitonWebVersion>1.10</nuitonWebVersion>

1 0

r1658 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com May 15, 2013

May 15, 2013

Author: bleny Date: 2013-05-15 11:14:32 +0200 (Wed, 15 May 2013) New Revision: 1658 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1658 Log: refs #1967 fixes bug when computing differences when updating terrestrial locations on a sample row Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2013-05-13 13:58:38 UTC (rev 1657) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2013-05-15 09:14:32 UTC (rev 1658) @@ -233,6 +233,49 @@ // using the three list to add info if ( ! removedTerrestrialLocations.isEmpty()) { + addChange("Les lieux terrestres suivants ont été dissociés : " + + StringUtils.join(removedTerrestrialLocations, ", ")); + } +// if ( ! keptTerrestrialLocations.isEmpty()) { +// addChange("Les lieux terrestres suivants sont toujours associées : " + +// StringUtils.join(keptTerrestrialLocations, ", ")); +// } + if ( ! addedTerrestrialLocations.isEmpty()) { + addChange("Les lieux terrestres suivants ont été ajoutés : " + + StringUtils.join(addedTerrestrialLocations, ", ")); + } + } + + protected void compareTerrestrialDistricts() { + Collection<TerrestrialLocation> oldTerrestrialLocations; + if (oldRow == null) { + oldTerrestrialLocations = Collections.emptyList(); + } else { + oldTerrestrialLocations = oldRow.getTerrestrialLocations(); + } + Collection<TerrestrialLocation> newTerrestrialLocations = newRow.getTerrestrialLocations(); + + // Lists for boats by status + List<String> removedTerrestrialLocations = new ArrayList<String>(); + List<String> keptTerrestrialLocations = new ArrayList<String>(); + List<String> addedTerrestrialLocations = new ArrayList<String>(); + + // filling the three lists + for (TerrestrialLocation oldTerrestrialLocation : oldTerrestrialLocations) { + if ( ! newTerrestrialLocations.contains(oldTerrestrialLocation)) { + removedTerrestrialLocations.add(oldTerrestrialLocation.getDistrictCode()); + } + } + for (TerrestrialLocation newTerrestrialLocation : newTerrestrialLocations) { + if (oldTerrestrialLocations.contains(newTerrestrialLocation)) { + keptTerrestrialLocations.add(newTerrestrialLocation.getDistrictCode()); + } else { + addedTerrestrialLocations.add(newTerrestrialLocation.getDistrictCode()); + } + } + + // using the three list to add info + if ( ! removedTerrestrialLocations.isEmpty()) { addChange("Les quartiers maritimes suivants ont été dissociées : " + StringUtils.join(removedTerrestrialLocations, ", ")); } @@ -567,7 +610,7 @@ compareFishingZones(); } if (ObsProgram.OBSVENTE.equals(obsProgram)) { - compareTerrestrialLocations(); + compareTerrestrialDistricts(); comparePrograms(); comparePeriods(); compareProfession();

1 0

r1657 - in trunk: src/site/rst/obsMer src/site/rst/obsVente wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations wao-business/src/test/resources/import
by bleny＠users.forge.codelutin.com May 13, 2013

May 13, 2013

Author: bleny Date: 2013-05-13 15:58:38 +0200 (Mon, 13 May 2013) New Revision: 1657 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1657 Log: fixes #2398 always use ',' as separator for multiple values in a single column fix tests Modified: trunk/src/site/rst/obsMer/administrateur.rst trunk/src/site/rst/obsVente/administrateur.rst trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java trunk/wao-business/src/test/resources/import/echantillonnage.csv Modified: trunk/src/site/rst/obsMer/administrateur.rst =================================================================== --- trunk/src/site/rst/obsMer/administrateur.rst 2013-05-13 13:45:20 UTC (rev 1656) +++ trunk/src/site/rst/obsMer/administrateur.rst 2013-05-13 13:58:38 UTC (rev 1657) @@ -76,9 +76,9 @@ - PLAN_CODE (string) : Code de la ligne (unique, obligatoire) au format AAAA_MIIII (année, n° de ligne), exemple 2012_M0003 - SOCIETE_NOM (string) : Nom de la société -- PECHE_DIVISION (string) : Zones de pêche liés à la ligne, chaque zone est séparé par un " / " -> ex : VIIa / VIIb (obligatoire) +- PECHE_DIVISION (string) : Zones de pêche liés à la ligne, chaque zone est séparé par une virgule -> ex : VIIa,VIIb (obligatoire) - PECHE_AUTRE (string) : Autres information sur les zones de pêche pour la ligne -- METIER_CODE_DCF5 (string) : Code DCF niveau 5 du métier (obligatoire) +- METIER_CODE_DCF5 (string) : Code DCF niveau 5 du métier (obligatoire) séparés par une virgule - METIER_MAILLAGE (string) : Maillage du métier - METIER_TAILLE (string) : Taille du métier - METIER_AUTRE (string) : Autre information du métier Modified: trunk/src/site/rst/obsVente/administrateur.rst =================================================================== --- trunk/src/site/rst/obsVente/administrateur.rst 2013-05-13 13:45:20 UTC (rev 1656) +++ trunk/src/site/rst/obsVente/administrateur.rst 2013-05-13 13:58:38 UTC (rev 1657) @@ -59,9 +59,9 @@ - PLAN_CODE (string) : Code de la ligne (unique, obligatoire) au format AAAA_VIIII (année, n° de ligne), exemple 2012_V0003 - SOCIETE_NOM (string) : Nom de la société -- PECHE_DIVISION (string) : Zones de pêche liés à la ligne, chaque zone est séparé par un " / " -> ex : VIIa / VIIb (obligatoire) +- PECHE_DIVISION (string) : Zones de pêche liés à la ligne, chaque zone est séparé par une virgule -> ex : VIIa,VIIb (obligatoire) - PECHE_AUTRE (string) : Autres information sur les zones de pêche pour la ligne -- METIER_CODE_DCF5 (string) : Code DCF niveau 5 du métier (obligatoire) +- METIER_CODE_DCF5 (string) : Code DCF niveau 5 du métier (obligatoire) séparés par une virgule - METIER_MAILLAGE (string) : Maillage du métier - METIER_TAILLE (string) : Taille du métier - METIER_AUTRE (string) : Autre information du métier Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2013-05-13 13:45:20 UTC (rev 1656) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2013-05-13 13:58:38 UTC (rev 1657) @@ -37,7 +37,7 @@ public class DCF5CodesParserFormatter implements ValueParserFormatter<List<DCF5Code>> { - protected static final String DCF5_CODES_SEPARATOR = ", "; + protected static final String DCF5_CODES_SEPARATOR = ","; @Override public String format(List<DCF5Code> dcf5Codes) { Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2013-05-13 13:45:20 UTC (rev 1656) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2013-05-13 13:58:38 UTC (rev 1657) @@ -1,14 +1,14 @@ "PLAN_CODE";"SOCIETE_NOM";"PECHE_DIVISION";"PECHE_AUTRE";"METIER_CODE_DCF5";"METIER_MAILLAGE";"METIER_TAILLE";"METIER_AUTRE";"METIER_LIBELLE";"METIER_ESPECES";"PROGRAMME_CODE";"PROGRAMME_DEBUT";"PROGRAMME_FIN";"12/2009";"01/2010";"02/2010";"03/2010";"04/2010";"05/2010";"06/2010";"07/2010";"08/2010";"09/2010";"10/2010";"11/2010";"12/2010";"01/2011";"02/2011";"03/2011";"PLAN_DUREE_MOY";"PLAN_NB_OBSERV";"PLAN_COMMENT";"TAUX_COUVERTURE_APPLIQUE" -"2010_M0001";"TARTANPION";"IId / I";;"DRB_ALG";;;;;;"MA-2009";"03/2010";"01/2011";;;;0;0;0;0;0;0;0;2;0;0;4;;;"1.5";1;"Un petit commentaire";5 -"2010_M0002";"TARTANPION";"IId";;"DRH_CAT et DRH_CRU";;;;"Fileyage";"poissons tubes";"MANY";"01/2008";"12/2008";;20;0;0;21;0;0;21;0;0;21;0;0;;;;1;1;;5 -"2010_M0003";;"IId / IV";;"DRH";;;;"balottage en plein air";"divers choses visqueuses";"MA-2009";"03/2010";"01/2011";;;;0;22;0;0;25;0;0;21;0;0;25;;;2;1;;5 -"2009_M0001";;"IId / IV";;"GTR_DEF et GNS_DEF";"110-119";;;"Fileyage à poissons tubes";"poissons plats";"PPP2010";"12/2009";"10/2010";0;1;1;1;2;1;1;1;1;1;2;;;;;;1;1;;5 -"2009_M0002";;"IId";;"GTR_DEF et GNS_DEF";"9888-99";;;"Fileyage à sirènes ";"nymphes";"PPP2010";"12/2009";"10/2010";1;1;1;2;3;4;4;4;4;3;3;;;;;;1;1;;10 -"2009_M0003";"TARTANPION";"IV";;"GTR_MOL et GNS";;;;"Fileyages à baleines à bosse";"chameaux";"PPP2010";"12/2009";"10/2010";2;2;2;2;2;2;2;2;2;2;4;;;;;;1;1;;10 +"2010_M0001";"TARTANPION";"IId,I";;"DRB_ALG";;;;;;"MA-2009";"03/2010";"01/2011";;;;0;0;0;0;0;0;0;2;0;0;4;;;"1.5";1;"Un petit commentaire";5 +"2010_M0002";"TARTANPION";"IId";;"DRH_CAT,DRH_CRU";;;;"Fileyage";"poissons tubes";"MANY";"01/2008";"12/2008";;20;0;0;21;0;0;21;0;0;21;0;0;;;;1;1;;5 +"2010_M0003";;"IId,IV";;"DRH";;;;"balottage en plein air";"divers choses visqueuses";"MA-2009";"03/2010";"01/2011";;;;0;22;0;0;25;0;0;21;0;0;25;;;2;1;;5 +"2009_M0001";;"IId,IV";;"GTR_DEF,GNS_DEF";"110-119";;;"Fileyage à poissons tubes";"poissons plats";"PPP2010";"12/2009";"10/2010";0;1;1;1;2;1;1;1;1;1;2;;;;;;1;1;;5 +"2009_M0002";;"IId";;"GTR_DEF,GNS_DEF";"9888-99";;;"Fileyage à sirènes ";"nymphes";"PPP2010";"12/2009";"10/2010";1;1;1;2;3;4;4;4;4;3;3;;;;;;1;1;;10 +"2009_M0003";"TARTANPION";"IV";;"GTR_MOL,GNS";;;;"Fileyages à baleines à bosse";"chameaux";"PPP2010";"12/2009";"10/2010";2;2;2;2;2;2;2;2;2;2;4;;;;;;1;1;;10 "2009_M0004";;"IId";;"PTB_ALG";">=190";">18";;"Chalutage de fond machiavélique";"gadidés; divers";"PPP2010";"12/2009";"10/2010";1;1;1;1;1;1;1;1;1;1;2;;;;;;3;2;;10 "2009_M0005";;"IId";;"PTB_ALG";"70-1100";">1140";;"Plongeur de fond sous-marin";"gadidés; divers";"PPP2010";"12/2009";"10/2010";1;1;1;1;1;1;1;1;1;1;2;;;;;;3;2;;10 -"2009_M0006";"BIS";"I / IV";;"DRB_DEF";"70-1100";">1140";;"Leon";"poissons plats";"PPP2010";"12/2009";"10/2010";0;1;0;1;0;1;2;2;2;2;1;;;;;;3;2;; -"2010_M0004";"TARTANPION";"IId / IV";;"PTB_DEF et PTB_ALG et DRH";;;;"Chalutage de fond";"gadidés; poissons plats; divers";"BLOB";"01/2010";"12/2010";;3;0;0;3;0;0;3;0;0;3;0;0;;;;3;1;; +"2009_M0006";"BIS";"I,IV";;"DRB_DEF";"70-1100";">1140";;"Leon";"poissons plats";"PPP2010";"12/2009";"10/2010";0;1;0;1;0;1;2;2;2;2;1;;;;;;3;2;; +"2010_M0004";"TARTANPION";"IId,IV";;"PTB_DEF,PTB_ALG,DRH";;;;"Chalutage de fond";"gadidés; poissons plats; divers";"BLOB";"01/2010";"12/2010";;3;0;0;3;0;0;3;0;0;3;0;0;;;;3;1;; "2010_M0005";;"IId";;"DRB";;;;"Kamoulox";"merlu; poissons cerises; divers";"MA-2009";"03/2010";"01/2011";;;;0;5;0;0;5;0;0;6;0;0;3;;;3;1;;15 -"2010_M0010";;"I / IV";;"DRB";"70-1100";;;"Kamoulox";"merlu; poissons pommes; divers";"MA-2009";"03/2010";"01/2011";;;;0;5;0;0;5;0;0;6;0;0;3;;;3;1;;15 -"2010_M0011";;"I / IV";;"DRB_ANA";"70-1100";;;"Troubidou";"merlu; poissons cerises";"MA-2009";"03/2010";"01/2011";;;;0;5;0;0;5;0;0;6;0;0;3;;;3;1;; +"2010_M0010";;"I,IV";;"DRB";"70-1100";;;"Kamoulox";"merlu; poissons pommes; divers";"MA-2009";"03/2010";"01/2011";;;;0;5;0;0;5;0;0;6;0;0;3;;;3;1;;15 +"2010_M0011";;"I,IV";;"DRB_ANA";"70-1100";;;"Troubidou";"merlu; poissons cerises";"MA-2009";"03/2010";"01/2011";;;;0;5;0;0;5;0;0;6;0;0;3;;;3;1;;

1 0

r1656 - trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations
by bleny＠users.forge.codelutin.com May 13, 2013

May 13, 2013

Author: bleny Date: 2013-05-13 15:45:20 +0200 (Mon, 13 May 2013) New Revision: 1656 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1656 Log: fixes #2398 always use ',' as separator for multiple values in a single column Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2013-05-13 13:27:07 UTC (rev 1655) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2013-05-13 13:45:20 UTC (rev 1656) @@ -37,7 +37,7 @@ public class DCF5CodesParserFormatter implements ValueParserFormatter<List<DCF5Code>> { - protected static final String DCF5_CODES_SEPARATOR = " et "; + protected static final String DCF5_CODES_SEPARATOR = ", "; @Override public String format(List<DCF5Code> dcf5Codes) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2013-05-13 13:27:07 UTC (rev 1655) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2013-05-13 13:45:20 UTC (rev 1656) @@ -52,7 +52,7 @@ for (FishingZone fishingZone : fishingZones) { districtCodes.add(fishingZone.getDistrictCode()); } - return StringUtils.join(districtCodes, " / "); + return StringUtils.join(districtCodes, ", "); } @Override @@ -64,7 +64,7 @@ if (StringUtils.isBlank(districtCodes)) { throw new IllegalArgumentException(WaoUtils._("wao.import.sampleRow.failure.fishingZoneMissing")); } else { - String[] codes = districtCodes.split("/"); + String[] codes = districtCodes.split(","); for (String code : codes) { FishingZone fishingZone = indexedFishingZones.get(code.trim()); if (fishingZone == null) {

1 0

r1655 - trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations
by bleny＠users.forge.codelutin.com May 13, 2013

May 13, 2013

Author: bleny Date: 2013-05-13 15:27:07 +0200 (Mon, 13 May 2013) New Revision: 1655 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1655 Log: refs #2398 fix import multiple terrestrial locations on a sample row Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java 2013-04-23 09:04:36 UTC (rev 1654) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java 2013-05-13 13:27:07 UTC (rev 1655) @@ -74,6 +74,7 @@ if (district == null) { throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongDistrict", value)); } + districts.add(district); } return districts; }

1 0