April 2014 - Echobase-commits - mailman.cloud.codelutin.com

Jenkins build is back to normal : echobase2 » EchoBase #2
by admin+ci-codelutin.com＠codelutin.com April 17, 2014

April 17, 2014

See <http://ci.codelutin.com/jenkins/job/echobase2/fr.ifremer$echobase/2/>

1 0

Jenkins build is back to normal : echobase2 » EchoBase :: Domain #2
by admin+ci-codelutin.com＠codelutin.com April 17, 2014

April 17, 2014

See <http://ci.codelutin.com/jenkins/job/echobase2/fr.ifremer.echobase$echobase-…>

1 0

r1008 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb echobase-domain/src/main/resources echobase-domain/src/main/resources/META-INF/services echobase-domain/src/main/resources/migration echobase-domain/src/main/xmi echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial
by tchemit＠users.forge.codelutin.com April 17, 2014

April 17, 2014

Author: tchemit Date: 2014-04-17 10:11:08 +0200 (Thu, 17 Apr 2014) New Revision: 1008 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1008 Log: fixes #4947 fixes #4950 Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql Modified: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion trunk/echobase-domain/src/main/resources/postgis-structure.sql trunk/echobase-domain/src/main/xmi/echobase.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java 2014-04-17 08:11:08 UTC (rev 1008) @@ -0,0 +1,44 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; +import fr.ifremer.echobase.io.EchoBaseIOUtil; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.util.Version; + +import java.util.List; + +/** + * Created on 4/16/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.7 + */ +public class MigrationCallBackForVersion2_6_1 extends MigrationCallBackForVersion { + + public static final String POSTGIS_STRUCTURE_SQL = "/migration/postgis-structure-2.6.1.sql"; + + @Override + public Version getVersion() { + return new Version("2.6.1"); + } + + @Override + protected void prepareMigrationScript(EchoBaseUserTopiaPersistenceContext tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + boolean spatialAware = tx.isSpatialAware(); + + if (spatialAware) { + + // fix add new postigs view (see https://forge.codelutin.com/issues/4194) + updatePostgis(queries); + } + } + + protected void updatePostgis(List<String> queries) { + queries.add(EchoBaseIOUtil.loadScript(POSTGIS_STRUCTURE_SQL)); + } + +} \ No newline at end of file Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2014-04-05 17:08:15 UTC (rev 1007) +++ trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2014-04-17 08:11:08 UTC (rev 1008) @@ -1,3 +1,4 @@ fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_2 fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_5_1 -fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_6 \ No newline at end of file +fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_6 +fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_6_1 \ No newline at end of file Added: trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql (rev 0) +++ trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql 2014-04-17 08:11:08 UTC (rev 1008) @@ -0,0 +1,102 @@ +CREATE OR REPLACE FUNCTION echobase_delete_cell() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete cell % , delete cascade in echobase_cell_spatial_table', OLD.topiaid; + + DELETE FROM echobase_cell_spatial_temp WHERE cellid = OLD.topiaid; + DELETE FROM echobase_cell_spatial WHERE cellid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE OR REPLACE FUNCTION echobase_delete_operation() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete operation % , delete cascade in echobase_operation_spatial_table', OLD.topiaid; + + DELETE FROM echobase_operation_spatial_temp WHERE operationid = OLD.topiaid; + DELETE FROM echobase_operation_spatial WHERE operationid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE OR REPLACE FUNCTION echobase_create_echobase_operation_spatial_row( + operation_id VARCHAR, + coordinateText VARCHAR) + RETURNS VOID AS $$ +DECLARE + operationSpatialRow RECORD; + voyageId VARCHAR; + voyageName VARCHAR; + transitId VARCHAR; + transitName VARCHAR; + transectId VARCHAR; + transectName VARCHAR; + operationId VARCHAR; + operationName VARCHAR; + operationRow RECORD; + coordinateData GEOMETRY; +BEGIN + IF coordinateText IS NULL + THEN + RAISE DEBUG 'Could not find spatial data for operation %', operation_id; + RETURN; + END IF; + BEGIN + coordinateData = ST_GeomFromEWKT(coordinateText); + EXCEPTION WHEN internal_error + THEN + RAISE LOG 'Could not create coordinate operation spatial data %', coordinateText; + RETURN; + END; + + SELECT * INTO operationSpatialRow FROM echobase_operation_spatial os + WHERE os.operationid = operation_id; + IF NOT FOUND + THEN +-- create row + RAISE DEBUG 'Will create spatial operation %', operation_id; +-- get operation infos + SELECT op.id, op.topiaid + INTO operationName, operationId + FROM operation op + WHERE op.topiaid = operation_id; +-- get transect infos + SELECT + t.topiaid, + t.vessel + INTO transectId, transitName + FROM transect t, operation op + WHERE op.topiaid = operation_id AND t.topiaid = op.transect; +-- get transit infos + SELECT + t.topiaid, + (t.starttime || ' - ' || t.endtime) + INTO transitId, transitName + FROM transit t, transect tt + WHERE tt.topiaid = transectId AND t.topiaid = tt.transit; +-- get voyage infos + SELECT + v.topiaid, + v.name + INTO voyageId, voyageName + FROM voyage v, transit t + WHERE t.topiaid = transitId AND v.topiaid = t.voyage; + + INSERT INTO echobase_operation_spatial (lastUpdateDate, voyageid, voyagename, transitid, transitname, transectid, transectname, operationid, operationname, coordinate) + VALUES (now(), voyageId, voyageName, transitId, transitName, transectId, transectName, operationId, operationName, coordinateData); + ELSE +-- update row + RAISE DEBUG 'Will update spatial operation % ', operation_id; + UPDATE echobase_operation_spatial + SET coordinate = coordinateData + WHERE operationid = operation_id; + END IF; +END +$$ LANGUAGE plpgsql; \ No newline at end of file Modified: trunk/echobase-domain/src/main/resources/postgis-structure.sql =================================================================== --- trunk/echobase-domain/src/main/resources/postgis-structure.sql 2014-04-05 17:08:15 UTC (rev 1007) +++ trunk/echobase-domain/src/main/resources/postgis-structure.sql 2014-04-17 08:11:08 UTC (rev 1008) @@ -239,6 +239,7 @@ RAISE DEBUG 'Delete cell % , delete cascade in echobase_cell_spatial_table', OLD.topiaid; + DELETE FROM echobase_cell_spatial_temp WHERE cellid = OLD.topiaid; DELETE FROM echobase_cell_spatial WHERE cellid = OLD.topiaid; RETURN OLD; @@ -967,6 +968,7 @@ RAISE DEBUG 'Delete operation % , delete cascade in echobase_operation_spatial_table', OLD.topiaid; + DELETE FROM echobase_operation_spatial_temp WHERE operationid = OLD.topiaid; DELETE FROM echobase_operation_spatial WHERE operationid = OLD.topiaid; RETURN OLD; @@ -1108,9 +1110,9 @@ ELSE -- update row RAISE DEBUG 'Will update spatial operation % ', operation_id; - UPDATE echobase_operation_spatial eos - SET eos.coordinate = coordinateData - WHERE eos.operationid = operation_id; + UPDATE echobase_operation_spatial + SET coordinate = coordinateData + WHERE operationid = operation_id; END IF; END $$ LANGUAGE plpgsql; Modified: trunk/echobase-domain/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase.properties 2014-04-05 17:08:15 UTC (rev 1007) +++ trunk/echobase-domain/src/main/xmi/echobase.properties 2014-04-17 08:11:08 UTC (rev 1008) @@ -22,7 +22,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=2.6 +model.tagValue.version=2.6.1 model.tagValue.noPCS=true model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true @@ -271,6 +271,12 @@ fr.ifremer.echobase.entities.data.Category.attribute.echotype.tagValue.naturalId=true fr.ifremer.echobase.entities.data.Category.attribute.speciesCategory.tagValue.naturalId=true +#fr.ifremer.echobase.entities.data.Cell.class.tagValue.naturalIdMutable=true +#fr.ifremer.echobase.entities.data.Cell.attribute.name.tagValue.naturalId=true +#fr.ifremer.echobase.entities.data.Cell.attribute.parentCell.tagValue.naturalId=true +#fr.ifremer.echobase.entities.data.Cell.attribute.dataProcessing.tagValue.naturalId=true +#fr.ifremer.echobase.entities.data.Cell.attribute.voyage.tagValue.naturalId=true + fr.ifremer.echobase.entities.data.Voyage.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.data.Voyage.attribute.name.tagValue.naturalId=true @@ -282,6 +288,10 @@ fr.ifremer.echobase.entities.data.Category.attribute.echotype.tagValue.notNull=false fr.ifremer.echobase.entities.data.Category.attribute.speciesCategory.tagValue.notNull=false +#fr.ifremer.echobase.entities.data.Cell.attribute.parentCell.tagValue.notNull=false +#fr.ifremer.echobase.entities.data.Cell.attribute.dataProcessing.tagValue.notNull=false +#fr.ifremer.echobase.entities.data.Cell.attribute.voyage.tagValue.notNull=false + fr.ifremer.echobase.entities.data.Cell.attribute.cellType.tagValue.notNull=true fr.ifremer.echobase.entities.data.Cell.attribute.name.tagValue.notNull=true Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-04-05 17:08:15 UTC (rev 1007) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-04-17 08:11:08 UTC (rev 1008) @@ -113,9 +113,7 @@ persistenceService.executeSQL("SELECT echobase_fill_cell_spatial_table();"); persistenceService.commit(); } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Could not compute spatial data", e); - } + throw new EchoBaseTechnicalException("Could not compute spatial data", e); } } } @@ -137,9 +135,7 @@ persistenceService.executeSQL("SELECT echobase_refresh_views();"); persistenceService.commit(); } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Could not refresh spatial views", e); - } + throw new EchoBaseTechnicalException("Could not refresh spatial views", e); } } }

1 0

Jenkins build is back to normal : echobase-nightly » EchoBase :: Services #30
by admin+ci-codelutin.com＠codelutin.com April 5, 2014

April 5, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>

1 0

Jenkins build is back to normal : echobase-nightly » EchoBase :: Domain #30
by admin+ci-codelutin.com＠codelutin.com April 5, 2014

April 5, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>

1 0

Jenkins build is back to normal : echobase-nightly » EchoBase :: UI #30
by admin+ci-codelutin.com＠codelutin.com April 5, 2014

April 5, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>

1 0

Jenkins build is back to normal : echobase-nightly » EchoBase #30
by admin+ci-codelutin.com＠codelutin.com April 5, 2014

April 5, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer$echobase/30/>

1 0

r1007 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser
by tchemit＠users.forge.codelutin.com April 5, 2014

April 5, 2014

Author: tchemit Date: 2014-04-05 19:08:15 +0200 (Sat, 05 Apr 2014) New Revision: 1007 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1007 Log: fix typos Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java 2014-04-05 17:06:12 UTC (rev 1006) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java 2014-04-05 17:08:15 UTC (rev 1007) @@ -171,8 +171,6 @@ } } } - - } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java 2014-04-05 17:06:12 UTC (rev 1006) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java 2014-04-05 17:08:15 UTC (rev 1007) @@ -73,7 +73,7 @@ protected Integer age; - protected String maturite = "NA"; + protected String maturite; public Voyage getVoyage() { return voyage;

1 0

r1006 - trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references
by tchemit＠users.forge.codelutin.com April 5, 2014

April 5, 2014

Author: tchemit Date: 2014-04-05 19:06:12 +0200 (Sat, 05 Apr 2014) New Revision: 1006 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1006 Log: remove SpeciesImpl Removed: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java Deleted: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java 2014-04-05 16:58:54 UTC (rev 1005) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java 2014-04-05 17:06:12 UTC (rev 1006) @@ -1,28 +0,0 @@ -package fr.ifremer.echobase.entities.references; - -/* - * #%L - * EchoBase :: Domain - * %% - * Copyright (C) 2011 - 2014 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * 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% - */ - -public class SpeciesImpl extends SpeciesAbstract { - - private static final long serialVersionUID = 1L; - -}

1 0

r1005 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/csv echobase-domain/src/main/java/fr/ifremer/echobase/entities/references echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com April 5, 2014

April 5, 2014

Author: tchemit Date: 2014-04-05 18:58:54 +0200 (Sat, 05 Apr 2014) New Revision: 1005 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1005 Log: refs #4704 fix species code Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/CommunityIndicatorExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/CommunityIndicatorExportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/PopulationIndicatorExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/PopulationIndicatorExportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportModel.java trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -25,6 +25,8 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.entities.references.Species; +import org.nuiton.csv.ValueFormatter; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ValueParserFormatter; import org.nuiton.csv.ValueSetter; @@ -48,6 +50,12 @@ public static final ValueParser<Date> IMPORT_DAY_TIME_ECHOBASE2 = new DateValue("dd/MM/yyyy HH:mm:ss.SSSS"); + public static final ValueFormatter<Species> SPECIES_TO_COSER_CODE = new ValueFormatter<Species>() { + @Override + public String format(Species value) { + return value.getBaracoudaCode().replaceAll("_", ""); + } + }; public static final ValueParser<Boolean> INT_TO_BOOLEAN_PARSER = new ValueParser<Boolean>() { @@ -124,9 +132,6 @@ public static final String DEPTH_STRATUM_ID = "depthStratumId"; - public static final ValueParserFormatter<Date> YEAR = - new DateValue("yyyy"); - protected EchoBaseCsvUtil() { // avoid instanciation on helper class } Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -25,8 +25,4 @@ private static final long serialVersionUID = 1L; - // used for coser species export - public String getTaxaCode() { - return ""; - } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/CommunityIndicatorExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/CommunityIndicatorExportModel.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/CommunityIndicatorExportModel.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -36,7 +36,7 @@ super(separator); newColumnForExport("Campagne", EchoBaseCsvUtil.<CommunityIndicatorExportRow, String>newBeanProperty(CommunityIndicatorExportRow.PROPERTY_MISSION_NAME)); newColumnForExport("Indicateur", EchoBaseCsvUtil.<CommunityIndicatorExportRow, String>newBeanProperty(CommunityIndicatorExportRow.PROPERTY_INDICATOR_NAME)); - newColumnForExport("Espece", EchoBaseCsvUtil.<CommunityIndicatorExportRow, String>newBeanProperty(CommunityIndicatorExportRow.PROPERTY_SPECIES_NAME)); + newColumnForExport("Espece", CommunityIndicatorExportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_TO_COSER_CODE); newColumnForExport("Strate", CommunityIndicatorExportRow.PROPERTY_STRATUM); newColumnForExport("Annee", CommunityIndicatorExportRow.PROPERTY_DATE, EchoBaseCsvUtil.YEAR); newColumnForExport("Estimation", CommunityIndicatorExportRow.PROPERTY_ESTIMATION); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/CommunityIndicatorExportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/CommunityIndicatorExportRow.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/CommunityIndicatorExportRow.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -35,11 +35,11 @@ */ public class CommunityIndicatorExportRow { - public static final String PROPERTY_MISSION_NAME = "mission.name"; + public static final String PROPERTY_MISSION_NAME = "mission." + Mission.PROPERTY_NAME; - public static final String PROPERTY_INDICATOR_NAME = "indicator.name"; + public static final String PROPERTY_INDICATOR_NAME = "indicator." + DataMetadata.PROPERTY_NAME; - public static final String PROPERTY_SPECIES_NAME = "species.codeMemo"; + public static final String PROPERTY_SPECIES = "species"; public static final String PROPERTY_STRATUM = "stratum"; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -513,12 +513,17 @@ //------------------------------------------------------------------------// protected void extractSpeciesFile(EchoBaseProject project) { - File speciesFile = project.getSpeciesDefinitionFile(); - SpeciesExportModel speciesExportModel = new SpeciesExportModel(getCsvSeparator()); + File file = project.getSpeciesDefinitionFile(); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + SpeciesExportModel exportModel = new SpeciesExportModel(getCsvSeparator()); + List<Species> speciesList = persistenceService.getSpecies(); + List<SpeciesExportRow> rows = exportModel.toRows(speciesList); try { - Export.exportToFile(speciesExportModel, persistenceService.getSpecies(), speciesFile); + Export.exportToFile(exportModel, rows, file); } catch (Exception e) { - throw new EchoBaseTechnicalException("Could not export species list to " + speciesFile, e); + throw new EchoBaseTechnicalException("Could not export species list to " + file, e); } } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/PopulationIndicatorExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/PopulationIndicatorExportModel.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/PopulationIndicatorExportModel.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -36,7 +36,7 @@ super(separator); newColumnForExport("Campagne", EchoBaseCsvUtil.<PopulationIndicatorExportRow, String>newBeanProperty(PopulationIndicatorExportRow.PROPERTY_MISSION_NAME)); newColumnForExport("Indicateur", EchoBaseCsvUtil.<PopulationIndicatorExportRow, String>newBeanProperty(PopulationIndicatorExportRow.PROPERTY_INDICATOR_NAME)); - newColumnForExport("Espece", EchoBaseCsvUtil.<PopulationIndicatorExportRow, String>newBeanProperty(PopulationIndicatorExportRow.PROPERTY_SPECIES_NAME)); + newColumnForExport("Espece", PopulationIndicatorExportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_TO_COSER_CODE); newColumnForExport("Strate", PopulationIndicatorExportRow.PROPERTY_STRATUM); newColumnForExport("Annee", PopulationIndicatorExportRow.PROPERTY_DATE, EchoBaseCsvUtil.YEAR); newColumnForExport("Estimation", PopulationIndicatorExportRow.PROPERTY_ESTIMATION); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/PopulationIndicatorExportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/PopulationIndicatorExportRow.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/PopulationIndicatorExportRow.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -35,11 +35,11 @@ */ public class PopulationIndicatorExportRow { - public static final String PROPERTY_MISSION_NAME = "mission.name"; + public static final String PROPERTY_MISSION_NAME = "mission." + Mission.PROPERTY_NAME; - public static final String PROPERTY_INDICATOR_NAME = "indicator.name"; + public static final String PROPERTY_INDICATOR_NAME = "indicator." + DataMetadata.PROPERTY_NAME; - public static final String PROPERTY_SPECIES_NAME = "species.codeMemo"; + public static final String PROPERTY_SPECIES = "species"; public static final String PROPERTY_STRATUM = "stratum"; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportModel.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportModel.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -83,7 +83,7 @@ newColumnForExport("Campagne", EchoBaseCsvUtil.<RawDataCatchExportRow, String>newBeanProperty(RawDataCatchExportRow.PROPERTY_VOYAGE_NAME)); newColumnForExport("Annee", EchoBaseCsvUtil.<RawDataCatchExportRow, Date>newBeanProperty(RawDataCatchExportRow.PROPERTY_VOYAGE_YEAR), EchoBaseCsvUtil.YEAR); newColumnForExport("Trait", EchoBaseCsvUtil.<RawDataCatchExportRow, String>newBeanProperty(RawDataCatchExportRow.PROPERTY_OPERATION_ID)); - newColumnForExport("Espece", EchoBaseCsvUtil.<RawDataCatchExportRow, String>newBeanProperty(RawDataCatchExportRow.PROPERTY_SPECIES_CODE)); + newColumnForExport("Espece", RawDataCatchExportRow.PROPERTY_SPECIES,EchoBaseCsvUtil.SPECIES_TO_COSER_CODE); newColumnForExport("Nombre", RawDataCatchExportRow.PROPERTY_OPERATION_NUMBER, EchoBaseCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("Poids", RawDataCatchExportRow.PROPERTY_OPERATION_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportRow.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportRow.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -33,15 +33,13 @@ */ public class RawDataCatchExportRow { - public static final String PROPERTY_VOYAGE = "voyage"; + public static final String PROPERTY_SPECIES = "species"; - public static final String PROPERTY_SPECIES_CODE = "species." + Species.PROPERTY_CODE_MEMO; - public static final String PROPERTY_OPERATION_ID = "operation." + Operation.PROPERTY_ID; - public static final String PROPERTY_VOYAGE_NAME = PROPERTY_VOYAGE + "." + Voyage.PROPERTY_NAME; + public static final String PROPERTY_VOYAGE_NAME = "voyage." + Voyage.PROPERTY_NAME; - public static final String PROPERTY_VOYAGE_YEAR = PROPERTY_VOYAGE + "." + Voyage.PROPERTY_START_DATE; + public static final String PROPERTY_VOYAGE_YEAR = "voyage." + Voyage.PROPERTY_START_DATE; public static final String PROPERTY_OPERATION_NUMBER = "number"; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -104,7 +104,7 @@ newColumnForExport("Campagne", EchoBaseCsvUtil.<RawDataSizeExportRow, String>newBeanProperty(RawDataSizeExportRow.PROPERTY_VOYAGE_NAME)); newColumnForExport("Annee", EchoBaseCsvUtil.<RawDataSizeExportRow, Date>newBeanProperty(RawDataSizeExportRow.PROPERTY_VOYAGE_YEAR), EchoBaseCsvUtil.YEAR); newColumnForExport("Trait", EchoBaseCsvUtil.<RawDataSizeExportRow, String>newBeanProperty(RawDataSizeExportRow.PROPERTY_OPERATION_ID)); - newColumnForExport("Espece", EchoBaseCsvUtil.<RawDataSizeExportRow, String>newBeanProperty(RawDataSizeExportRow.PROPERTY_SPECIES_CODE)); + newColumnForExport("Espece", RawDataSizeExportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_TO_COSER_CODE); newColumnForExport("Sexe", RawDataSizeExportRow.PROPERTY_SEX_CATEGORY, new ValueFormatter<SexCategory>() { @Override public String format(SexCategory value) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -35,15 +35,13 @@ */ public class RawDataSizeExportRow { - public static final String PROPERTY_VOYAGE = "voyage"; + public static final String PROPERTY_SPECIES = "species"; - public static final String PROPERTY_SPECIES_CODE = "species." + Species.PROPERTY_CODE_MEMO; - public static final String PROPERTY_OPERATION_ID = "operation." + Operation.PROPERTY_ID; - public static final String PROPERTY_VOYAGE_NAME = PROPERTY_VOYAGE + "." + Voyage.PROPERTY_NAME; + public static final String PROPERTY_VOYAGE_NAME = "voyage." + Voyage.PROPERTY_NAME; - public static final String PROPERTY_VOYAGE_YEAR = PROPERTY_VOYAGE + "." + Voyage.PROPERTY_START_DATE; + public static final String PROPERTY_VOYAGE_YEAR = "voyage." + Voyage.PROPERTY_START_DATE; public static final String PROPERTY_SEX_CATEGORY = "sexCategory"; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportModel.java 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportModel.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -21,27 +21,40 @@ * #L% */ +import com.google.common.collect.Lists; +import fr.ifremer.echobase.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.entities.references.Species; import org.nuiton.csv.ext.AbstractExportModel; +import java.util.List; + /** * Created on 3/5/14. * * @author Tony Chemit <chemit(a)codelutin.com> - * @since XXX + * @since 2.6 */ -public class SpeciesExportModel extends AbstractExportModel<Species> { +public class SpeciesExportModel extends AbstractExportModel<SpeciesExportRow> { public SpeciesExportModel(char separator) { super(separator); newColumnForExport("C_Perm", Species.PROPERTY_TAXON_CODE); newColumnForExport("NumSys", Species.PROPERTY_TAXON_SYSTEMATIC_ORDER); newColumnForExport("NivSys", Species.PROPERTY_TAXON_SYSTEMATIC_LEVEL); - newColumnForExport("C_VALIDE", Species.PROPERTY_CODE_MEMO); + newColumnForExport("C_VALIDE", EchoBaseCsvUtil.<SpeciesExportRow, Species>newBeanProperty(SpeciesExportRow.PROPERTY_SPECIES), EchoBaseCsvUtil.SPECIES_TO_COSER_CODE); newColumnForExport("L_VALIDE", Species.PROPERTY_GENUS_SPECIES); newColumnForExport("AA_VALIDE", Species.PROPERTY_AUTHOR_REFERENCE); newColumnForExport("C_TxPère", Species.PROPERTY_TAXON_FATHER_MEMOCODE); newColumnForExport("Taxa", "taxaCode"); } + public List<SpeciesExportRow> toRows(List<Species> speciesList) { + List<SpeciesExportRow> rows = Lists.newArrayList(); + for (Species species : speciesList) { + SpeciesExportRow row = new SpeciesExportRow(); + row.setSpecies(species); + rows.add(row); + } + return rows; + } } Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java 2014-04-05 16:58:54 UTC (rev 1005) @@ -0,0 +1,52 @@ +package fr.ifremer.echobase.services.service.exportCoser; + +import fr.ifremer.echobase.entities.references.Species; + +/** + * Created on 4/5/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class SpeciesExportRow { + + public static final String PROPERTY_SPECIES = "species"; + + protected Species species; + + public Species getSpecies() { + return species; + } + + public String getTaxaCode() { + return ""; + } + + public String getGenusSpecies() { + return species.getGenusSpecies(); + } + + public String getTaxonCode() { + return species.getTaxonCode(); + } + + public String getTaxonSystematicOrder() { + return species.getTaxonSystematicOrder(); + } + + public String getTaxonSystematicLevel() { + return species.getTaxonSystematicLevel(); + } + + public String getTaxonFatherMemocode() { + return species.getTaxonFatherMemocode(); + } + + public String getAuthorReference() { + return species.getAuthorReference(); + } + + public void setSpecies(Species species) { + this.species = species; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2014-04-05 13:02:18 UTC (rev 1004) +++ trunk/echobase-ui/src/main/resources/struts.xml 2014-04-05 16:58:54 UTC (rev 1005) @@ -124,8 +124,8 @@ <interceptor-ref name="exception"/> <interceptor-ref name="alias"/> <interceptor-ref name="servletConfig"/> + <interceptor-ref name="i18n"/> <interceptor-ref name="echobaseInjector"/> - <interceptor-ref name="i18n"/> <interceptor-ref name="prepare"/> <interceptor-ref name="chain"/> <interceptor-ref name="scopedModelDriven"/>

1 0