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

r515 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com April 10, 2012

April 10, 2012

Author: tchemit Date: 2012-04-10 19:45:16 +0200 (Tue, 10 Apr 2012) New Revision: 515 Url: http://forge.codelutin.com/repositories/revision/echobase/515 Log: fixes #1102: La cr?\195?\169ation d'une base embarqu?\195?\169e ne fonctionne pas avec les donn?\195?\169es 2011 Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:06:05 UTC (rev 514) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:45:16 UTC (rev 515) @@ -26,10 +26,11 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.csv.EntityExportContext; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; import fr.ifremer.echobase.entities.meta.TableMeta; @@ -44,11 +45,8 @@ import org.nuiton.util.csv.ExportModel; import java.io.File; -import java.util.ArrayDeque; import java.util.Collection; -import java.util.Deque; import java.util.Map; -import java.util.Set; /** * entity visitor to export data to csv files. @@ -65,10 +63,10 @@ public static final TimeLog TIME_LOG = new TimeLog(ReplicateEntityVisitor.class); - protected Set<String> ids = Sets.newHashSetWithExpectedSize(2000000000); +// protected Set<String> ids = Sets.newHashSetWithExpectedSize(2000000000); +// +// protected Deque<String> stack = new ArrayDeque<String>(); - protected Deque<String> stack = new ArrayDeque<String>(); - public static ReplicateEntityVisitor createVisitor(ExportService service, MetaFilenameAware[] entityMetas, Multimap<EchoBaseEntityEnum, MetaFilenameAware> associations, @@ -137,16 +135,16 @@ public void start(TopiaEntity entity) { String topiaId = entity.getTopiaId(); try { - stack.push(topiaId); - boolean added = ids.add(topiaId); - if (!added) { - - // Never do me! can not accept to treat twice an object - throw new EchoBaseTechnicalException( - "Wanted to treat twice entity " + topiaId + - "\n Current stack " + stack.toString()); - - } +// stack.push(topiaId); +// boolean added = ids.add(topiaId); +// if (!added) { +// +// // Never do me! can not accept to treat twice an object +// throw new EchoBaseTechnicalException( +// "Wanted to treat twice entity " + topiaId + +// "\n Current stack " + stack.toString()); +// +// } if (log.isDebugEnabled()) { log.debug("Starts export of entity " + topiaId); } @@ -165,7 +163,7 @@ @Override public void end(TopiaEntity entity) { - stack.pop(); +// stack.pop(); try { if (log.isDebugEnabled()) { log.debug("Starts export of association of entity " + @@ -204,17 +202,35 @@ if (CollectionUtils.isNotEmpty(cValue)) { - int i = 0; - for (Object currentValue : cValue) { - TopiaEntity currentEntity = (TopiaEntity) currentValue; - visit(entity, - propertyName, - type, - collectionType, - i++, - currentEntity - ); + if (Voyage.PROPERTY_POST_CELL.equals(propertyName) + && entity instanceof Voyage) { + // special case, when visiting cells from Voyage entity, + // let's not visit cells childs (they will be visited later + // by the DataProcessing himself) + for (Object currentValue : cValue) { + ((Cell) currentValue).acceptWithNoChilds(this); + } + } else { + int i = 0; + for (Object currentValue : cValue) { + TopiaEntity currentEntity = (TopiaEntity) currentValue; + try { + currentEntity.accept(this); + } catch (TopiaException e) { + if (log.isErrorEnabled()) { + log.error("Can not visit entity " + value, e); + } + } + visit(entity, + propertyName, + type, + collectionType, + i++, + currentEntity + ); + + } } } } @@ -226,13 +242,15 @@ Class<?> collectionType, Class<?> type, int index, Object value) { - try { - ((TopiaEntity) value).accept(this); - } catch (TopiaException e) { - if (log.isErrorEnabled()) { - log.error("Can not visit entity " + value, e); - } - } + + // not used here! +// try { +// ((TopiaEntity) value).accept(this); +// } catch (TopiaException e) { +// if (log.isErrorEnabled()) { +// log.error("Can not visit entity " + value, e); +// } +// } } @Override

1 0

r514 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com April 10, 2012

April 10, 2012

Author: tchemit Date: 2012-04-10 19:06:05 +0200 (Tue, 10 Apr 2012) New Revision: 514 Url: http://forge.codelutin.com/repositories/revision/echobase/514 Log: try to find out what is the export db problem... Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:05:13 UTC (rev 513) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:06:05 UTC (rev 514) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.csv.EntityExportContext; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; @@ -43,8 +44,11 @@ import org.nuiton.util.csv.ExportModel; import java.io.File; +import java.util.ArrayDeque; import java.util.Collection; +import java.util.Deque; import java.util.Map; +import java.util.Set; /** * entity visitor to export data to csv files. @@ -61,6 +65,10 @@ public static final TimeLog TIME_LOG = new TimeLog(ReplicateEntityVisitor.class); + protected Set<String> ids = Sets.newHashSetWithExpectedSize(2000000000); + + protected Deque<String> stack = new ArrayDeque<String>(); + public static ReplicateEntityVisitor createVisitor(ExportService service, MetaFilenameAware[] entityMetas, Multimap<EchoBaseEntityEnum, MetaFilenameAware> associations, @@ -127,9 +135,20 @@ @Override public void start(TopiaEntity entity) { + String topiaId = entity.getTopiaId(); try { + stack.push(topiaId); + boolean added = ids.add(topiaId); + if (!added) { + + // Never do me! can not accept to treat twice an object + throw new EchoBaseTechnicalException( + "Wanted to treat twice entity " + topiaId + + "\n Current stack " + stack.toString()); + + } if (log.isDebugEnabled()) { - log.debug("Starts export of entity " + entity.getTopiaId()); + log.debug("Starts export of entity " + topiaId); } EntityExportContext entityExporter = entityExporters.get(entity.getClass()); @@ -139,13 +158,14 @@ "Could not export entity " + entity, e); } finally { if (log.isDebugEnabled()) { - log.debug("Ends export of entity " + entity.getTopiaId()); + log.debug("Ends export of entity " + topiaId); } } } @Override public void end(TopiaEntity entity) { + stack.pop(); try { if (log.isDebugEnabled()) { log.debug("Starts export of association of entity " +

1 0

r513 - trunk/echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com April 10, 2012

April 10, 2012

Author: tchemit Date: 2012-04-10 19:05:13 +0200 (Tue, 10 Apr 2012) New Revision: 513 Url: http://forge.codelutin.com/repositories/revision/echobase/513 Log: add unique on cells Modified: trunk/echobase-entities/src/main/xmi/echobase.properties Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-04-10 14:33:12 UTC (rev 512) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-04-10 17:05:13 UTC (rev 513) @@ -48,6 +48,7 @@ ############################################################################### fr.ifremer.echobase.entities.data.Voyage.attribute.echotype.stereotype=unique +fr.ifremer.echobase.entities.data.Cell.attribute.cell.stereotype=unique ############################################################################### ### Big Text attributes #######################################################

1 0

r512 - in trunk/echobase-services/src/main: java/fr/ifremer/echobase/services/importdata java/fr/ifremer/echobase/services/importdata/csv resources/i18n
by tchemit＠users.forge.codelutin.com April 10, 2012

April 10, 2012

Author: tchemit Date: 2012-04-10 16:33:12 +0200 (Tue, 10 Apr 2012) New Revision: 512 Url: http://forge.codelutin.com/repositories/revision/echobase/512 Log: improve import progression Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -262,6 +262,27 @@ } } + protected String getImportMessage(InputFile inputFile) { + String message = l_(getLocale(), "echobase.importLabel.withFile", + getImportLabel(), inputFile.getFileName()); + return message; + } + + protected final void doFlushTransaction(int rowNumber, InputFile inputFile) { + if (rowNumber % 1000 == 0) { + // flush each 1000 imported rows + String message = getImportMessage(inputFile); + try { + long s0 = TimeLog.getTime(); + flushTransaction(); + TIME_LOG.log(s0, message); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException( + "Could not flush transaction " + message, e); + } + } + } + protected Map<String, SpeciesCategory> speciesCategories = Maps.newTreeMap(); protected SpeciesCategory getSpeciesCategory( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -150,8 +150,7 @@ InputFile inputFile = configuration.getMoviesFile(); if (log.isInfoEnabled()) { - log.info("Starts import of acoustic datas from file " + - inputFile.getFileName()); + log.info("Starts " + getImportMessage(inputFile)); } CsvFileImportResult importResult = new CsvFileImportResult( @@ -199,6 +198,8 @@ configuration.incrementsProgression(); for (AcousticImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); + configuration.incrementsProgression(); if (dataProcessingId == null) { @@ -210,7 +211,7 @@ } Date startDate = row.getCellDateStart(); - Date endDate = row.getCellDateEnd(); + Date endDate = row.getCellDateEnd(); // get transect to use Transit transit = voyage.getTransit(startDate); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -194,9 +194,11 @@ Import<TotalSampleImportRow> importer = EchoBaseImport.newImport(csvModel, reader); + int rowNumber=0; configuration.incrementsProgression(); for (TotalSampleImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -361,8 +363,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (SubSampleImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -477,8 +481,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (BiometrySampleImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -161,9 +161,11 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (OperationImportRow row : importer) { configuration.incrementsProgression(); + doFlushTransaction(++rowNumber, inputFile); Vessel vessel = row.getVessel(); Operation operation = row.getOperation(); @@ -224,9 +226,11 @@ Import<OperationMetadataValueImportRow> importer = EchoBaseImport.newImport(csvModel, reader); + int rowNumber=0; configuration.incrementsProgression(); for (OperationMetadataValueImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -281,9 +285,11 @@ Import<GearMetadataValueImportRow> importer = EchoBaseImport.newImport(csvModel, reader); + int rowNumber=0; configuration.incrementsProgression(); for (GearMetadataValueImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -242,8 +242,11 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; + for (EsduResultByEchotypeImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); @@ -320,8 +323,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; for (EsduResultByEchotypeAndSpeciesCategoryImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); @@ -401,8 +406,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; for (EsduResultBySpeciesAndSizeCategoryImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); @@ -502,8 +509,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; for (EsduResultBySpeciesAndAgeCategoryImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -191,8 +191,10 @@ configuration.incrementsProgression(); + int rowNumber=0; for (MapCellImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = create(dao, row.getCell()); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -166,9 +166,13 @@ Cell cell = null; configuration.incrementsProgression(); + int rowNumber = 0; for (RegionCellImportRow row : importer) { configuration.incrementsProgression(); + rowNumber++; + doFlushTransaction(rowNumber, inputFile); + if (cell == null || !row.getName().equals(cell.getName())) { cell = create(dao, @@ -240,8 +244,11 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (RegionCellAssociationImportRow row : importer) { + rowNumber++; + doFlushTransaction(rowNumber, inputFile); configuration.incrementsProgression(); Cell regionCell = row.getRegionCell(); @@ -328,8 +335,11 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (RegionCellResultImportRow row : importer) { + rowNumber++; + doFlushTransaction(rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -182,8 +182,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; for (LengthWeightKeyImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Voyage voyage = row.getVoyage(); @@ -249,8 +251,10 @@ configuration.incrementsProgression(); + int rowNumber = 0; for (LengthAgeKeyImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Voyage voyage = row.getVoyage(); @@ -304,8 +308,10 @@ configuration.incrementsProgression(); + int rowNumber = 0; for (EchotypeImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Voyage voyage = row.getVoyage(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-04-10 14:33:12 UTC (rev 512) @@ -50,7 +50,8 @@ Species.PROPERTY_BARACOUDA_CODE, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SIZE_CATEGORY, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_ECHOTYPE, - EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_DATA_QUALITY + EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_DATA_QUALITY, + EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_VOYAGE }; public EsduResultByEchotypeAndSpeciesCategoryImportModel( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-04-10 14:33:12 UTC (rev 512) @@ -46,7 +46,8 @@ public static final String[] COLUMN_NAMES_TO_EXCLUDE = { CELL_NAME, EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE, - EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY + EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY, + EsduResultByEchotypeImportRow.PROPERTY_VOYAGE }; public EsduResultByEchotypeImportModel( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-04-10 14:33:12 UTC (rev 512) @@ -48,7 +48,8 @@ Species.PROPERTY_BARACOUDA_CODE, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING, - EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_DATA_QUALITY + EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_DATA_QUALITY, + EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_VOYAGE }; public EsduResultBySpeciesAndAgeCategoryImportModel( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-04-10 14:33:12 UTC (rev 512) @@ -48,7 +48,8 @@ Species.PROPERTY_BARACOUDA_CODE, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING, - EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_DATA_QUALITY + EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_DATA_QUALITY, + EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE }; public EsduResultBySpeciesAndSizeCategoryImportModel( Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-04-10 14:33:12 UTC (rev 512) @@ -43,6 +43,7 @@ echobase.importError.no.voyage.imported= echobase.importError.transect.notfound= echobase.importError.transit.notfound= +echobase.importLabel.withFile=%s with file %s echobase.info.modifiedProperty=Property '%s', old value\: '%s', new value\: '%s' echobase.info.onePropertyModified=One property was modified\: echobase.info.somePropertiesModified=%s properties were modified\: Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-04-10 14:33:12 UTC (rev 512) @@ -43,6 +43,7 @@ echobase.importError.no.voyage.imported=Aucun voyage importé echobase.importError.transect.notfound=Transit non trouvé pour la campagne %s et la date %s et le navire %s (ligne %s) echobase.importError.transit.notfound=Transit non trouvé pour la campagne %s et la date %s (ligne %s) +echobase.importLabel.withFile=%s avec le fichier %s echobase.info.modifiedProperty=Propriété '%s', ancienne valeur \: '%s', nouvelle valeur \: '%s' echobase.info.newEntityCreated=Une nouvelle entité a été créée %s echobase.info.onePropertyModified=Une propriété a été modifiée \:

1 0

r511 - trunk/echobase-services/src/main/resources/embedded
by tchemit＠users.forge.codelutin.com April 10, 2012

April 10, 2012

Author: tchemit Date: 2012-04-10 10:41:08 +0200 (Tue, 10 Apr 2012) New Revision: 511 Url: http://forge.codelutin.com/repositories/revision/echobase/511 Log: fix embedded configuration Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-10 08:27:03 UTC (rev 510) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-10 08:41:08 UTC (rev 511) @@ -33,3 +33,10 @@ # where to find war war.directory=${data.directory} + +# Database configuration +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase

1 0

r510 - trunk/echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com April 10, 2012

April 10, 2012

Author: tchemit Date: 2012-04-10 10:27:03 +0200 (Tue, 10 Apr 2012) New Revision: 510 Url: http://forge.codelutin.com/repositories/revision/echobase/510 Log: i18n Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-10 08:26:30 UTC (rev 509) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-10 08:27:03 UTC (rev 510) @@ -4,6 +4,7 @@ echobase.action.newLibreOfficeQuery=New Libre office request echobase.action.newQuery=New request echobase.action.saveSqlQuery=Update query +echobase.action.show.import.documentation=Show import documentation echobase.action.toEnglish=Use english version echobase.action.toFrench=Use the french version echobase.action.usingEnglish=English version used @@ -58,4 +59,3 @@ echobase.title.confirm.deleteQuery=Delete a export query echobase.title.dbEditor.read=Visualisation des données echobase.title.newLibreOfficeQuery=Import a new "Libre-Office" request -echobase.action.show.import.documentation=Show import documentation Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-10 08:26:30 UTC (rev 509) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-10 08:27:03 UTC (rev 510) @@ -29,6 +29,7 @@ echobase.action.return=Retour echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Mettre à jour +echobase.action.show.import.documentation=Accéder à la documentation de l'import echobase.action.toEnglish=Utiliser la version anglaise echobase.action.toFrench=Utiliser la version française echobase.action.usingEnglish=Version anglaise utilisé @@ -264,4 +265,3 @@ echobase.title.newLibreOfficeQuery=Importer une requète Libre-office echobase.title.users=Adminitration des utilisateurs echobase.title.welcome=Bienvenue dans EchoBase -echobase.action.show.import.documentation=Accéder à la documentation de l'import

1 0

r509 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com April 10, 2012

April 10, 2012

Author: tchemit Date: 2012-04-10 10:26:30 +0200 (Tue, 10 Apr 2012) New Revision: 509 Url: http://forge.codelutin.com/repositories/revision/echobase/509 Log: rollback transaction if something was wrong Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-04-06 20:36:22 UTC (rev 508) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-04-10 08:26:30 UTC (rev 509) @@ -95,9 +95,10 @@ TopiaContext rootContext = new EchoBaseTopiaRootContextFactory().newEmbeddedDatabase(dir); + TopiaContext topiaContext = null; try { - TopiaContext topiaContext = rootContext.beginTransaction(); + topiaContext = rootContext.beginTransaction(); model.incrementsProgression(); @@ -118,6 +119,9 @@ } catch (Exception eee) { + rollbackTransaction( + topiaContext, + "Could not rollback h2 embedded database at " + dir); throw new EchoBaseTechnicalException( "Could not create h2 embedded database at " + dir, eee); } finally { @@ -151,6 +155,18 @@ } } + protected void rollbackTransaction(TopiaContext tx, String message) { + try { + if (tx!=null) { + tx.rollbackTransaction(); + } + } catch (TopiaException eee) { + if (log.isErrorEnabled()) { + log.error(message, eee); + } + } + } + protected int computeNbSteps(EmbeddedApplicationConfiguration model) { int nbSteps = 4; @@ -205,6 +221,16 @@ ExportDbService exportDbService = serviceContext.newService(ExportDbService.class); exportDbService.exportPartialDb(exportconfiguration, false); + } catch (IOException eee) { + rollbackTransaction( + newTx, + "Could not rollback transaction on db"); + throw eee; + } catch (RuntimeException eee) { + rollbackTransaction( + newTx, + "Could not rollback transaction on db"); + throw eee; } finally { serviceContext.setTransaction(transaction); closeContext(newTx, "Could not close transaction on main db");

1 0

r508 - in trunk/echobase-ui/src/main: resources/i18n webapp/WEB-INF/jsp/importData webapp/css webapp/images
by tchemit＠users.forge.codelutin.com April 6, 2012

April 6, 2012

Author: tchemit Date: 2012-04-06 22:36:22 +0200 (Fri, 06 Apr 2012) New Revision: 508 Url: http://forge.codelutin.com/repositories/revision/echobase/508 Log: refs #1092 (ajout des liens vers la documentation des imports + am?\195?\169lioration du style) Added: trunk/echobase-ui/src/main/webapp/images/help.png Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-06 19:51:27 UTC (rev 507) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-06 20:36:22 UTC (rev 508) @@ -11,8 +11,8 @@ echobase.common.importError=Message d'erreur echobase.common.importFileName=Nom du fichier importé echobase.common.jdbcDriver=Jdbc Driver name +echobase.common.jdbcPilotPath=Path to jdbc pilot echobase.common.nbCreatedObjects=Nombre d'objets crées -echobase.common.jdbcPilotPath=Path to jdbc pilot echobase.common.resultLabel=Result label echobase.confirm.delete.query=Confirm to delete export query echobase.error.bad.password=Bad password @@ -23,8 +23,8 @@ echobase.error.export.sqlQuery.forbidden.insert.word=Export query contains a forbidden word 'INSERT' echobase.error.export.sqlQuery.forbidden.update.word=Export query contains a forbidden word 'UPDATE' echobase.error.import.esduByEchotypeAndSpeciesFile.required=Import file is mandatory +echobase.error.import.esduByEchotypeFile.required=Import file is mandatory echobase.error.import.oneImportFile.required=At least one import file is mandatory -echobase.error.import.esduByEchotypeFile.required=Import file is mandatory echobase.error.import.resultLabel.required=ResultLabel is required echobase.error.invalid.sql=Invalid request \: %s echobase.error.login.unknown=Unkwon login @@ -50,7 +50,6 @@ echobase.info.user.update= echobase.information.mission.created= echobase.label.exportAsSeen=Export as seen on screen -echobase.legend.connectionToDb.libreOffice=Utilisation dans LibreOffice echobase.legend.dbeditor.show=Detail of '%s' echobase.legend.importData.result.resume=Résultat echobase.legend.libreOfficeQuery=Requète "libre office" @@ -59,3 +58,4 @@ echobase.title.confirm.deleteQuery=Delete a export query echobase.title.dbEditor.read=Visualisation des données echobase.title.newLibreOfficeQuery=Import a new "Libre-Office" request +echobase.action.show.import.documentation=Show import documentation Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-06 19:51:27 UTC (rev 507) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-06 20:36:22 UTC (rev 508) @@ -25,8 +25,6 @@ echobase.action.newLibreOfficeQuery=Nouvelle requète Libre office echobase.action.newQuery=Nouvelle requète echobase.action.reloadSqlQuery=Recharger -echobase.information.one.file.required=Veuillez renseigner l'un des fichiers à importer - echobase.action.reset=Annuler echobase.action.return=Retour echobase.action.save=Sauvegarder @@ -56,6 +54,7 @@ echobase.common.jdbcDriver=Nom du pilote jdbc echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe +echobase.common.jdbcPilotPath=Chemin du pilote jdbc echobase.common.jdbcUrl=Url de connexion echobase.common.loggedDataDatatype=loggedDataDatatype echobase.common.loggedDataFormat=loggedDataFormat @@ -98,7 +97,6 @@ echobase.error.import.digitThreshold.required=digitThreshold non renseigné echobase.error.import.echosounderSoundSpeed.required=echosounderSoundSpeed non renseigné echobase.error.import.echotypeFile.required=La sélection d'un fichier Echotype est obligatoire -echobase.error.import.oneImportFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduByEchotypeAndSpeciesCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduBySpeciesAndAgeCategoryFile.required=La sélection d'un fichier d'import est obligatoire @@ -115,6 +113,7 @@ echobase.error.import.missionName.required=Le nom de la mission est obligatoire echobase.error.import.moviesFile.required=La sélection d'un fichier Movies est obligatoire echobase.error.import.notes.required=Note des DataProcessing non renseigné +echobase.error.import.oneImportFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.operationFile.required=La sélection d'un fichier Operation est obligatoire echobase.error.import.operationMetadataFile.required=La sélection d'un fichier OperationMetadata est obligatoire echobase.error.import.pingDutyCycle.required=pingDutyCycle non renseigné @@ -172,6 +171,7 @@ echobase.info.user.update=L'utilisateur '%s' a été mis à jour echobase.information.create.mission=Si la mission n'existe, suivez le lien pour en créer une nouvelle. echobase.information.mission.created=La mission %s a été créée +echobase.information.one.file.required=Veuillez renseigner l'un des fichiers à importer echobase.label.admin.user.create=Création d'un utilisateur echobase.label.admin.user.delete=Suppression d'un utilisateur echobase.label.admin.user.edit=Mise à jour d'un utilisateur @@ -220,7 +220,6 @@ echobase.legend.libreOfficeQuery=Requète "libre office" echobase.legend.sqlQuery.configuration=Configuration de la requète echobase.legend.sqlQuery.result=Résultats de la requète -echobase.common.jdbcPilotPath=Chemin du pilote jdbc echobase.menu.connectToDbInformations=Informations de connection à la base de données echobase.menu.createEmbeddedApplication=Créer une application embarquée echobase.menu.editData=Modifier les données @@ -265,3 +264,4 @@ echobase.title.newLibreOfficeQuery=Importer une requète Libre-office echobase.title.users=Adminitration des utilisateurs echobase.title.welcome=Bienvenue dans EchoBase +echobase.action.show.import.documentation=Accéder à la documentation de l'import Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-04-06 19:51:27 UTC (rev 507) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-04-06 20:36:22 UTC (rev 508) @@ -52,6 +52,14 @@ <s:text name="echobase.legend.importData.configure"/> </legend> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Acoustic" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-04-06 19:51:27 UTC (rev 507) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-04-06 20:36:22 UTC (rev 508) @@ -45,6 +45,14 @@ <s:text name="echobase.legend.importData.configure"/> </legend> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#TotalSample__Su…" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-04-06 19:51:27 UTC (rev 507) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-04-06 20:36:22 UTC (rev 508) @@ -61,6 +61,14 @@ <s:text name="echobase.legend.importData.configure"/> </legend> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Voyage__Transit…" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:select key="model.missionId" required="true" label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> @@ -122,6 +130,14 @@ <s:hidden key="model.importMode" value="TRANSECT" label=''/> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Voyage__Transit…" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-04-06 19:51:27 UTC (rev 507) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-04-06 20:36:22 UTC (rev 508) @@ -39,6 +39,14 @@ name="echobase.legend.importData.configure"/> </legend> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Operation__Oper…" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-04-06 19:51:27 UTC (rev 507) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-04-06 20:36:22 UTC (rev 508) @@ -69,6 +69,14 @@ <s:text name="echobase.legend.importData.configure"/> </legend> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Rsultats_voyage" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:hidden key="model.importMode" value="VOYAGE" label=''/> <s:select key="model.voyageId" required="true" @@ -102,6 +110,14 @@ <s:text name="echobase.legend.importData.configure"/> </legend> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Rsultats_Esdu" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:hidden key="model.importMode" value="ESDU" label=''/> <s:select id='voyageSelectBox' key="model.voyageId" required="true" @@ -145,6 +161,14 @@ <s:text name="echobase.legend.importData.configure"/> </legend> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Region" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:hidden key="model.importMode" value="REGION" label=''/> <s:select key="model.voyageId" required="true" @@ -178,6 +202,14 @@ <s:text name="echobase.legend.importData.configure"/> </legend> + <div class="cleanBoth help"> + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Map" + target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + <s:hidden key="model.importMode" value="MAP" label=''/> <s:select key="model.voyageId" required="true" Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-06 19:51:27 UTC (rev 507) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-06 20:36:22 UTC (rev 508) @@ -96,7 +96,7 @@ background:url(../images/left_success.png) no-repeat 0 0; padding-left:42px; margin-bottom: 5px; - width: 800px; + /*width: 800px;*/ } .info_success ul { margin-bottom: 5px; @@ -123,7 +123,7 @@ } .info_error{ margin-bottom: 5px; - width: 800px; + /*width: 800px;*/ background:url(../images/left_error.png) no-repeat 0 0; padding-left:50px; } @@ -329,6 +329,11 @@ margin-left: 0; padding-left: 25px; } + +.help { + background:url(../images/help.png) no-repeat; + padding-left: 25px; +} /* MYcss*/ body{ background:url(../images/background.jpg) repeat 0 0; Added: trunk/echobase-ui/src/main/webapp/images/help.png =================================================================== (Binary files differ) Property changes on: trunk/echobase-ui/src/main/webapp/images/help.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r507 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/importdata echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/importData
by tchemit＠users.forge.codelutin.com April 6, 2012

April 6, 2012

Author: tchemit Date: 2012-04-06 21:51:27 +0200 (Fri, 06 Apr 2012) New Revision: 507 Url: http://forge.codelutin.com/repositories/revision/echobase/507 Log: refs #1087 (mieux indiquer lorsque les fichiers ne sont pas tous obligatoires, rendre optionnel sur import p?\195?\170che les fichiers) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java 2012-04-06 19:51:27 UTC (rev 507) @@ -80,6 +80,12 @@ return biometrySampleFile; } + public boolean isOneImportFile() { + return totalSampleFile.hasFile() || + subSampleFile.hasFile() || + biometrySampleFile.hasFile(); + } + @Override public InputFile[] getInputFiles() { return new InputFile[]{totalSampleFile, subSampleFile, biometrySampleFile}; Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml 2012-04-06 19:51:27 UTC (rev 507) @@ -33,23 +33,9 @@ <field name="totalSampleFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.totalSampleFile.file!=null</param> - <message key="echobase.error.import.totalSampleFile.required"/> + <param name="expression">model.oneImportFile</param> + <message key="echobase.error.import.oneImportFile.required"/> </field-validator> </field> - <field name="subSampleFile"> - <field-validator type="nfieldexpression"> - <param name="expression">model.subSampleFile.file!=null</param> - <message key="echobase.error.import.subSampleFile.required"/> - </field-validator> - </field> - - <field name="biometrySampleFile"> - <field-validator type="nfieldexpression"> - <param name="expression">model.biometrySampleFile.file!=null</param> - <message key="echobase.error.import.biometrySampleFile.required"/> - </field-validator> - </field> - </validators> \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-06 19:51:27 UTC (rev 507) @@ -23,6 +23,7 @@ echobase.error.export.sqlQuery.forbidden.insert.word=Export query contains a forbidden word 'INSERT' echobase.error.export.sqlQuery.forbidden.update.word=Export query contains a forbidden word 'UPDATE' echobase.error.import.esduByEchotypeAndSpeciesFile.required=Import file is mandatory +echobase.error.import.oneImportFile.required=At least one import file is mandatory echobase.error.import.esduByEchotypeFile.required=Import file is mandatory echobase.error.import.resultLabel.required=ResultLabel is required echobase.error.invalid.sql=Invalid request \: %s Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-06 19:51:27 UTC (rev 507) @@ -25,6 +25,8 @@ echobase.action.newLibreOfficeQuery=Nouvelle requète Libre office echobase.action.newQuery=Nouvelle requète echobase.action.reloadSqlQuery=Recharger +echobase.information.one.file.required=Veuillez renseigner l'un des fichiers à importer + echobase.action.reset=Annuler echobase.action.return=Retour echobase.action.save=Sauvegarder @@ -96,6 +98,7 @@ echobase.error.import.digitThreshold.required=digitThreshold non renseigné echobase.error.import.echosounderSoundSpeed.required=echosounderSoundSpeed non renseigné echobase.error.import.echotypeFile.required=La sélection d'un fichier Echotype est obligatoire +echobase.error.import.oneImportFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduByEchotypeAndSpeciesCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduBySpeciesAndAgeCategoryFile.required=La sélection d'un fichier d'import est obligatoire Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-04-06 19:51:27 UTC (rev 507) @@ -49,13 +49,16 @@ label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:file key="totalSampleFile" required="true" + <s:label key="echobase.information.one.file.required" required="true" + value=''/> + + <s:file key="totalSampleFile" label='%{getText("echobase.common.totalSampleFile")}'/> - <s:file key="subSampleFile" required="true" + <s:file key="subSampleFile" label='%{getText("echobase.common.subSampleFile")}'/> - <s:file key="biometrySampleFile" required="true" + <s:file key="biometrySampleFile" label='%{getText("echobase.common.biometrySampleFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-04-06 19:51:27 UTC (rev 507) @@ -75,13 +75,16 @@ label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:file key="lengthAgeKeyFile" required="true" + <s:label key="echobase.information.one.file.required" required="true" + value=''/> + + <s:file key="lengthAgeKeyFile" label='%{getText("echobase.common.lengthAgeKeyFile")}'/> - <s:file key="lengthWeightKeyFile" required="true" + <s:file key="lengthWeightKeyFile" label='%{getText("echobase.common.lengthWeightKeyFile")}'/> - <s:file key="echotypeFile" required="true" + <s:file key="echotypeFile" label='%{getText("echobase.common.echotypeFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" @@ -112,16 +115,19 @@ <s:textfield key="model.resultLabel" size="40" required="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:file key="esduByEchotypeFile" required="true" + <s:label key="echobase.information.one.file.required" required="true" + value=''/> + + <s:file key="esduByEchotypeFile" label='%{getText("echobase.common.esduByEchotypeFile")}'/> - <s:file key="esduByEchotypeAndSpeciesCategoryFile" required="true" + <s:file key="esduByEchotypeAndSpeciesCategoryFile" label='%{getText("echobase.common.esduByEchotypeAndSpeciesCategoryFile")}'/> - <s:file key="esduBySpeciesAndSizeCategoryFile" required="true" + <s:file key="esduBySpeciesAndSizeCategoryFile" label='%{getText("echobase.common.esduBySpeciesAndSizeCategoryFile")}'/> - <s:file key="esduBySpeciesAndAgeCategoryFile" required="true" + <s:file key="esduBySpeciesAndAgeCategoryFile" label='%{getText("echobase.common.esduBySpeciesAndAgeCategoryFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5"

1 0

r506 - in trunk/echobase-tools: . src/test/java/fr/ifremer/echobase/tools
by tchemit＠users.forge.codelutin.com April 6, 2012

April 6, 2012

Author: tchemit Date: 2012-04-06 21:42:53 +0200 (Fri, 06 Apr 2012) New Revision: 506 Url: http://forge.codelutin.com/repositories/revision/echobase/506 Log: prepare new db Modified: trunk/echobase-tools/pom.xml trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-06 19:42:17 UTC (rev 505) +++ trunk/echobase-tools/pom.xml 2012-04-06 19:42:53 UTC (rev 506) @@ -211,14 +211,14 @@ <profile> <activation> <file> - <exists>src/test/private/echobase-2012-03-28</exists> + <exists>src/test/private/echobase-2012-04-06</exists> </file> </activation> <id>echobase-csv-inputs</id> <build> <testResources> <testResource> - <directory>src/test/private/echobase-2012-03-28</directory> + <directory>src/test/private/echobase-2012-04-06</directory> <includes> <include>**/*.csv</include> </includes> Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-04-06 19:42:17 UTC (rev 505) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-04-06 19:42:53 UTC (rev 506) @@ -57,7 +57,7 @@ protected static final long timestamp = System.currentTimeMillis(); /** La version du jeux de données utilisé. */ - public static final String ECHOBASE_CSV_VERSION = "2012-03-28"; + public static final String ECHOBASE_CSV_VERSION = "2012-04-06"; public static File getBasedir() { if (basedir == null) {

1 0