Author: tchemit Date: 2012-09-12 14:45:13 +0200 (Wed, 12 Sep 2012) New Revision: 653 Url: http://forge.codelutin.com/repositories/revision/echobase/653 Log: add missing svn properties fix result for some long action (was null) add remove import first doc Added: trunk/src/site/rst/removeimports.rst Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java trunk/echobase-tools/src/test/baracouda.mdb trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_childs.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_data.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataAcquisition_dataProcessing.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataProcessing_cell.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_gearMetadataValue.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_operationMetadataValue.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_sample.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Sample_sampleData.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_dataAcquisition.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_operation.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transit_transect.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv2 trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthAgeKey.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthWeightKey.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_postCell.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_transit.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Cell.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataAcquisition.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata2.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataProcessing.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data_backup.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/GearMetadataValue.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthAgeKey.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthWeightKey.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Operation.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/OperationMetadataValue.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Sample.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SampleData.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SpeciesCategory.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transect.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transit.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Voyage.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AcousticInstrument.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AgeCategory.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AreaOfOperation.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellMethod.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellType.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataMetadata.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataQuality.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataType.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DepthStratum.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/EchotypeCategory.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Gear.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/GearMetadata.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Mission.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationEvent.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationMetadata.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatum.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatumType.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleDataType.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleType.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SexCategory.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SizeCategory.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Species.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Strata.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/TSParameters.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Vessel.csv trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/VesselType.csv trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java 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/includes/actionResult.jsp trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2012-09-12 11:03:43 UTC (rev 652) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2012-09-12 12:45:13 UTC (rev 653) @@ -41,6 +41,8 @@ private Exception error; + private String resultMessage; + protected AbstractEchobaseActionConfiguration() { progressionModel = new DefaultProgressionModel(); } @@ -106,6 +108,14 @@ return error != null; } + public String getResultMessage() { + return resultMessage; + } + + public void setResultMessage(String resultMessage) { + this.resultMessage = resultMessage; + } + @Override public String getActionTime() { return progressionModel.getActionTime(); Property changes on: trunk/echobase-tools/src/test/baracouda.mdb ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_childs.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_data.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataAcquisition_dataProcessing.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataProcessing_cell.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_gearMetadataValue.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_operationMetadataValue.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_sample.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Sample_sampleData.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_dataAcquisition.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_operation.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transit_transect.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv2 ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthAgeKey.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthWeightKey.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_postCell.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_transit.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Cell.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataAcquisition.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata2.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataProcessing.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data_backup.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/GearMetadataValue.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthAgeKey.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthWeightKey.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Operation.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/OperationMetadataValue.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Sample.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SampleData.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SpeciesCategory.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transect.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transit.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Voyage.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AcousticInstrument.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AgeCategory.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AreaOfOperation.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellMethod.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellType.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataMetadata.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataQuality.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataType.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DepthStratum.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/EchotypeCategory.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Gear.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/GearMetadata.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Mission.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationEvent.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationMetadata.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatum.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatumType.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleDataType.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleType.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SexCategory.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SizeCategory.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Species.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Strata.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/TSParameters.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Vessel.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/VesselType.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2012-09-12 11:03:43 UTC (rev 652) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2012-09-12 12:45:13 UTC (rev 653) @@ -25,7 +25,6 @@ import fr.ifremer.echobase.services.importdata.AbstractImportConfiguration; import fr.ifremer.echobase.services.importdata.AbstractImportDataService; -import fr.ifremer.echobase.services.importdb.ImportDbConfiguration; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -60,7 +59,7 @@ @Override protected String getResultMessage(M model) { String message = _("echobase.message.importData.result", - model.getActionTime(), result); + model.getActionTime(), model.getResultMessage()); if (log.isInfoEnabled()) { log.info("Result: " + message); } @@ -72,15 +71,14 @@ return _("echobase.legend.importData.result.resume"); } - private String result; - @Override protected void startAction(S service, M model) throws Exception { if (log.isInfoEnabled()) { log.info("Start imports for " + getModel()); } - result = service.doImport(model, getEchoBaseSession().getUser()); + model.setResultMessage( + service.doImport(model, getEchoBaseSession().getUser())); } @Override Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java 2012-09-12 11:03:43 UTC (rev 652) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java 2012-09-12 12:45:13 UTC (rev 653) @@ -59,7 +59,7 @@ @Override protected String getResultMessage(RemoveDataConfiguration model) { String message = _("echobase.message.removeData.result", - model.getActionTime(), result); + model.getActionTime(), model.getResultMessage()); if (log.isInfoEnabled()) { log.info("Result: " + message); } @@ -71,8 +71,6 @@ return _("echobase.legend.removeData.resume"); } - private String result; - @Override protected void startAction(RemoveDataService service, RemoveDataConfiguration model) throws Exception { @@ -81,7 +79,8 @@ log.info("Will remove importLog : " + model.getImportLogId()); } - result = service.removeImport(model, getEchoBaseSession().getUser()); + model.setResultMessage( + service.removeImport(model, getEchoBaseSession().getUser())); } @Override 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-09-12 11:03:43 UTC (rev 652) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-12 12:45:13 UTC (rev 653) @@ -321,7 +321,7 @@ echobase.menu.viewData=Display data echobase.message.createEmbedded.result=Portable application was successful in %s. echobase.message.download.link=If download did not start by itself, you can start it manually from this link\: -echobase.message.exportDb.result=Export of database was successful in %s. +echobase.message.exportDb.result=Export of database (mode %s) was successful (file %s) in %s. echobase.message.importData.result=Data import successful in %s \:\n%s echobase.message.no.row.selected=No data selected echobase.message.noEntrySelection=No field selected 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-09-12 11:03:43 UTC (rev 652) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-12 12:45:13 UTC (rev 653) @@ -321,7 +321,7 @@ echobase.menu.viewData=Visualiser les données echobase.message.createEmbedded.result=La création de l'application embarqué a réussi en %s echobase.message.download.link=Si le téléchargement n'a pas démarré automatiquement, suivez ce lien \: -echobase.message.exportDb.result=L'export de la base a réussi en %s +echobase.message.exportDb.result=L'export de la base (mode %s) a réussi (fichier %s) en %s echobase.message.importData.result=Import de données réussi en %s \:\n%s echobase.message.no.row.selected=Aucune donnée sélectionnée echobase.message.noEntrySelection=Pas de champ sélectionné Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/actionResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/actionResult.jsp 2012-09-12 11:03:43 UTC (rev 652) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/actionResult.jsp 2012-09-12 12:45:13 UTC (rev 653) @@ -3,7 +3,7 @@ EchoBase :: UI $Id$ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/webap... $ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/actionResult.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Added: trunk/src/site/rst/removeimports.rst =================================================================== --- trunk/src/site/rst/removeimports.rst (rev 0) +++ trunk/src/site/rst/removeimports.rst 2012-09-12 12:45:13 UTC (rev 653) @@ -0,0 +1,201 @@ +.. - +.. * #%L +.. * EchoBase +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 - 2012 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% +.. - + +======================= +Suppression des imports +======================= + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +-------- + +Ce document décrit ce qui se passe lors la suppresion des imports. + +Import Voyage / Transit / Transect +---------------------------------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Le voyage en question et tout ce qui y est rattaché et aussi : + +- category +- echotype +- lengthAgeKey +- lengthWeightKey + +Import retirés +~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Transect +- import Operation +- import Catches +- import Acoustic +- import Résultats Voyage +- import Résultats Esdu +- import Region +- import Map + +Import Transect +--------------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Le transect en question et tout ce qui y est rattaché, ainsi que les *postCell* +et leur résultats. + +Import retirés +~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Operation +- import Catches +- import Acoustic +- import Résultats Esdu +- import Region +- import Map + +Import Operation +---------------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Les opérations de pêche et tout ce qui y est rattaché (OperationMetadata et +GearMetadata et Sample). + +Import retirés +~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Catches + +Import Catches +-------------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Les échantillons captures en question et tout ce qui y est rattaché. + +Import retirés +~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Acoustic +--------------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Les données acoustiques et tout ce qui y est rattaché (DataAcquisition, Cell, Result), +ainsi que les *postCell* et leur résultats. + +Import retirés +~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué sur ce voyage, à savoir : + +- import Résultats Esdu +- import Region +- import Map + +Import Résultats voyage +----------------------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Les données rattachés à un voyage après-coup, à savoir : + +- echotype +- lengthageKey +- lengthWeightKey + +Mais aussi tous les résultats (car il peuvent dépendre des données précédentes). + +Import retirés +~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Résultats Esdu +- import Region +- import Map + +Immort Résultats Esdu +--------------------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Les résultats attachés aux cellules de type *ESDU*. + +Import retirés +~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Region +------------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Les postCells de type *Region* et tout ce qui y est rattaché (Result) + +Import retirés +~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Map +---------- + +Données supprimées +~~~~~~~~~~~~~~~~~~ + +Les postCells de type *Map* et tout ce qui y est rattaché (Result) + +Import retirés +~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. \ No newline at end of file Property changes on: trunk/src/site/rst/removeimports.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-09-12 11:03:43 UTC (rev 652) +++ trunk/src/site/site_en.xml 2012-09-12 12:45:13 UTC (rev 653) @@ -103,6 +103,7 @@ <item name="Portable Application" href="embedded.html"/> <item name="Imports" href="imports.html"/> <item name="Import/Export with EchoBase format" href="importDb.html"/> + <item name="Remove imports" href="removeimports.html"/> <item name="Download" href="http://forge.codelutin.com/projects/echobase/files"/> </menu> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-12 11:03:43 UTC (rev 652) +++ trunk/src/site/site_fr.xml 2012-09-12 12:45:13 UTC (rev 653) @@ -104,6 +104,7 @@ <item name="Application embarquée" href="embedded.html"/> <item name="Imports" href="imports.html"/> <item name="Import/Export au format EchoBase" href="importDb.html"/> + <item name="Suppression des imports" href="removeimports.html"/> <item name="Téléchargement" href="http://forge.codelutin.com/projects/echobase/files"/> </menu>