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

r691 - in trunk/echobase-services/src: main/java/fr/ifremer/echobase/services/importdata main/java/fr/ifremer/echobase/services/removedata/strategy test/java/fr/ifremer/echobase/services test/java/fr/ifremer/echobase/ui/actions/removedata test/resources/import-data
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 17:25:32 +0200 (Sat, 22 Sep 2012) New Revision: 691 Url: http://forge.codelutin.com/repositories/revision/echobase/691 Log: fixes #1521: Change Echotype relation type (no more *-*) (impact sur les suppression d'import et mise ?\195?\160 jour des tests) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java trunk/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz 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-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-22 15:25:32 UTC (rev 691) @@ -138,7 +138,7 @@ StringBuilder buffer = new StringBuilder(); if (StringUtils.isNotEmpty(configuration.getImportNotes())) { - buffer.append("Notes :").append(configuration.getImportNotes()); + buffer.append("Notes :").append(configuration.getImportNotes()).append('\n'); } List<String> importIds = Lists.newArrayList(); @@ -165,7 +165,7 @@ description.append("]"); } } - buffer.append('\n').append(description.toString()); + buffer.append(description.toString()); } String importText = buffer.toString(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-22 15:25:32 UTC (rev 691) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; @@ -58,7 +57,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -197,6 +195,12 @@ List<Category> allByEchotype = categoryDAO.findAllByEchotype(echotype); categoryDAO.deleteAll(allByEchotype); + if (entity != null) { + + // remove it from the voyage + entity.removeEchotype(echotype); + } + // delete echotype echotypeDAO.delete(echotype); @@ -217,26 +221,6 @@ incrementOp("Remove postCell " + cell.getTopiaId()); } - protected void removeVoyage(Voyage entity) throws TopiaException { - - Set<Echotype> echotypes = CollectionUtils.isEmpty(entity.getEchotype()) ? - Collections.<Echotype>emptySet() : - Sets.newHashSet(entity.getEchotype()); - - // clean this data - entity.clearEchotype(); - - // delete voyage - delete(voyageDao, entity); - - flushTransaction("Could not flush voyage deletion"); - - // delete all echotypes - for (Echotype echotype : echotypes) { - removeEchotype(null, echotype); - } - } - protected void removeVoyagePostCell(Voyage entity) throws TopiaException { if (CollectionUtils.isNotEmpty(entity.getPostCell())) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-22 15:25:32 UTC (rev 691) @@ -59,9 +59,6 @@ long result = importLog.sizeImportId(); - // add all echotype - result += voyage.sizeEchotype(); - // add all orphan cells result += countVoyageOrphanCells(voyage); return result; @@ -76,7 +73,7 @@ Voyage entity = voyageDao.findByTopiaId(id); // delete it - removeVoyage(entity); + delete(voyageDao, entity); if (log.isDebugEnabled()) { log.debug(entity.getTopiaId() + " was removed"); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-22 15:25:32 UTC (rev 691) @@ -59,12 +59,6 @@ long result = importLog.sizeImportId(); - // add all cell results - result += countVoyageCellResults(voyage); - - // add all postCell - result += voyage.sizePostCell(); - // add all orphan cells result += countVoyageOrphanCells(voyage); return result; @@ -79,7 +73,7 @@ Voyage entity = voyageDao.findByTopiaId(id); // delete it - removeVoyage(entity); + delete(voyageDao, entity); if (log.isDebugEnabled()) { log.debug(entity.getTopiaId() + " was removed"); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java 2012-09-22 15:25:32 UTC (rev 691) @@ -32,28 +32,28 @@ public class EchoBaseServiceFixtures { public String IMPORT_DATA_ECHOBASE_NO_DATA() { - return "/import-data/echobase-" + dbVersion() + "-nodata.h2.db.gz"; + return "/import-data/echobase-nodata.h2.db.gz"; } public String IMPORT_DATA_ECHOBASE_COMMON_DATA() { - return "/import-data/echobase-" + dbVersion() + "-commonData.h2.db.gz"; + return "/import-data/echobase-commonData.h2.db.gz"; } public String IMPORT_DATA_ECHOBASE_OPERATION() { - return "/import-data/echobase-" + dbVersion() + "-operation.h2.db.gz"; + return "/import-data/echobase-operation.h2.db.gz"; } public String IMPORT_DATA_ECHOBASE_CATCHES() { - return "/import-data/echobase-" + dbVersion() + "-catches.h2.db.gz"; + return "/import-data/echobase-catches.h2.db.gz"; } public String IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT() { - return "/import-data/echobase-" + dbVersion() + "-catches-and-voyage-result.h2.db.gz"; + return "/import-data/echobase-catches-and-voyage-result.h2.db.gz"; } -// public String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-" + dbVersion()+ "-catches-and-acoustic.h2.db.gz"; +// public String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-catches-and-acoustic.h2.db.gz"; -// public String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-" + dbVersion()+ "-catches-and-acoustic-and-voyage-result.h2.db.gz"; +// public String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-catches-and-acoustic-and-voyage-result.h2.db.gz"; public String VESSEL_ID() { return "fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855"; @@ -67,13 +67,8 @@ return "fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622"; } - - public String dbVersion() { - return "1.2"; - } - public String importDbReferentialPath() { - return "/echobase-" + dbVersion() + "-importDb-referentiel.zip"; + return "/echobase-importDb-referentiel.zip"; } public int NB_VOYAGE() { Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2012-09-22 15:25:32 UTC (rev 691) @@ -396,13 +396,13 @@ Voyage voyage = create(voyageDao, TopiaEntity.TOPIA_ID, voyage2Id, Voyage.PROPERTY_MISSION, getFirstEntity(Mission.class), - Voyage.PROPERTY_NAME, "voyage1", + Voyage.PROPERTY_NAME, "voyage2", Voyage.PROPERTY_START_DATE, newDate(), Voyage.PROPERTY_END_DATE, newDate(), - Voyage.PROPERTY_START_PORT, "voyage1StartPort", - Voyage.PROPERTY_END_PORT, "voyage1EndPort", - Voyage.PROPERTY_DESCRIPTION, "voyage1Description", - Voyage.PROPERTY_DATUM, "voyage1Datum" + Voyage.PROPERTY_START_PORT, "voyage2StartPort", + Voyage.PROPERTY_END_PORT, "voyage2EndPort", + Voyage.PROPERTY_DESCRIPTION, "voyage2Description", + Voyage.PROPERTY_DATUM, "voyage2Datum" ); // create transit @@ -410,19 +410,19 @@ TopiaEntity.TOPIA_ID, transit2Id, Transit.PROPERTY_START_TIME, newDate(), Transit.PROPERTY_END_TIME, newDate(), - Transit.PROPERTY_START_LOCALITY, "transit1tartLocality", - Transit.PROPERTY_END_LOCALITY, "transit1EndLocality", - Transit.PROPERTY_DESCRIPTION, "transit1Description", - Transit.PROPERTY_RELATED_ACTIVITY, "transit1RelatedActivity" + Transit.PROPERTY_START_LOCALITY, "transit2StartLocality", + Transit.PROPERTY_END_LOCALITY, "transit2EndLocality", + Transit.PROPERTY_DESCRIPTION, "transit2Description", + Transit.PROPERTY_RELATED_ACTIVITY, "transit2RelatedActivity" ); voyage.addTransit(transit); // create transect Transect transect = create(transectDAO, TopiaEntity.TOPIA_ID, transect2Id, - Transect.PROPERTY_TITLE, "transect1Title", + Transect.PROPERTY_TITLE, "transect2Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), - Transect.PROPERTY_STRATUM, "transect1Stratum" + Transect.PROPERTY_STRATUM, "transect2Stratum" ); transit.addTransect(transect); @@ -444,9 +444,9 @@ // create transect Transect transect = create(transectDAO, TopiaEntity.TOPIA_ID, transect1_2Id, - Transect.PROPERTY_TITLE, "transect2Title", + Transect.PROPERTY_TITLE, "transect12Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), - Transect.PROPERTY_STRATUM, "transect2Stratum" + Transect.PROPERTY_STRATUM, "transect12Stratum" ); voyage.getTransit().get(0).addTransect(transect); @@ -468,9 +468,9 @@ // create transect Transect transect = create(transectDAO, TopiaEntity.TOPIA_ID, transect2_2Id, - Transect.PROPERTY_TITLE, "transect2Title", + Transect.PROPERTY_TITLE, "transect22Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), - Transect.PROPERTY_STRATUM, "transect2Stratum" + Transect.PROPERTY_STRATUM, "transect22Stratum" ); voyage.getTransit().get(0).addTransect(transect); Modified: trunk/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz =================================================================== (Binary files differ)

1 0

r690 - trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 16:59:11 +0200 (Sat, 22 Sep 2012) New Revision: 690 Url: http://forge.codelutin.com/repositories/revision/echobase/690 Log: remove old file Removed: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv2 Deleted: 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_echotype.csv2 2012-09-22 14:56:11 UTC (rev 689) +++ trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv2 2012-09-22 14:59:11 UTC (rev 690) @@ -1,22 +0,0 @@ -topiaId;echotype -fr.ifremer.echobase.entities.data.Voyage#1323685058169#0.25138614679500093;fr.ifremer.echobase.entities.data.Echotype#1326209638995#0.013474393359389158|fr.ifremer.echobase.entities.data.Echotype#1326209639308#0.9920947760656503; -fr.ifremer.echobase.entities.data.Voyage#1323685058171#0.2577616021164396;fr.ifremer.echobase.entities.data.Echotype#1326209638995#0.013474393359389158|fr.ifremer.echobase.entities.data.Echotype#1326209639308#0.9920947760656503; -fr.ifremer.echobase.entities.data.Voyage#1323685058172#0.3833555805885066;fr.ifremer.echobase.entities.data.Echotype#1326209638923#0.9969392079425647|fr.ifremer.echobase.entities.data.Echotype#1326209639308#0.9920947760656503|fr.ifremer.echobase.entities.data.Echotype#1326209639445#0.21949955065818227; -fr.ifremer.echobase.entities.data.Voyage#1323685058174#0.1724416358466888;fr.ifremer.echobase.entities.data.Echotype#1326209638995#0.013474393359389158|fr.ifremer.echobase.entities.data.Echotype#1326209639308#0.9920947760656503; -fr.ifremer.echobase.entities.data.Voyage#1323685058177#0.15893398952913673;fr.ifremer.echobase.entities.data.Echotype#1326209638995#0.013474393359389158|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515; -fr.ifremer.echobase.entities.data.Voyage#1323685058195#0.17157784198859738;fr.ifremer.echobase.entities.data.Echotype#1326209638995#0.013474393359389158|fr.ifremer.echobase.entities.data.Echotype#1326209639308#0.9920947760656503; -fr.ifremer.echobase.entities.data.Voyage#1323685058204#0.4755118254371812;fr.ifremer.echobase.entities.data.Echotype#1326209638069#0.9662184102679419|fr.ifremer.echobase.entities.data.Echotype#1326209639108#0.38622650440132367|fr.ifremer.echobase.entities.data.Echotype#1326209639521#0.37143528966608763|fr.ifremer.echobase.entities.data.Echotype#1326209639763#0.06623621504984178|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209640496#0.47244524272947974; -fr.ifremer.echobase.entities.data.Voyage#1323685058206#0.29941400676909014;fr.ifremer.echobase.entities.data.Echotype#1326209638255#0.3037483064381461|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639568#0.21751757003870587|fr.ifremer.echobase.entities.data.Echotype#1326209639800#0.8307443496436646|fr.ifremer.echobase.entities.data.Echotype#1326209640193#0.3880185659588359|fr.ifremer.echobase.entities.data.Echotype#1326209640560#0.06315339613478543|fr.ifremer.echobase.entities.data.Echotype#1326209640665#0.6520747780971299; -fr.ifremer.echobase.entities.data.Voyage#1323685058221#0.8275733324054522;fr.ifremer.echobase.entities.data.Echotype#1326209638923#0.9969392079425647|fr.ifremer.echobase.entities.data.Echotype#1326209639308#0.9920947760656503|fr.ifremer.echobase.entities.data.Echotype#1326209639383#0.4450507627718332; -fr.ifremer.echobase.entities.data.Voyage#1323685058222#0.9096286077920043;fr.ifremer.echobase.entities.data.Echotype#1326209638923#0.9969392079425647|fr.ifremer.echobase.entities.data.Echotype#1326209639308#0.9920947760656503|fr.ifremer.echobase.entities.data.Echotype#1326209639445#0.21949955065818227; -fr.ifremer.echobase.entities.data.Voyage#1323685058223#0.9262728463704;fr.ifremer.echobase.entities.data.Echotype#1326209638923#0.9969392079425647|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639890#0.510854995359969|fr.ifremer.echobase.entities.data.Echotype#1326209640274#0.32975949409692495; -fr.ifremer.echobase.entities.data.Voyage#1323685058224#0.6387494393359919;fr.ifremer.echobase.entities.data.Echotype#1326209638923#0.9969392079425647|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639951#0.5844408998127176|fr.ifremer.echobase.entities.data.Echotype#1326209640122#0.9844657548061281; -fr.ifremer.echobase.entities.data.Voyage#1323685058226#0.2257277620375573;fr.ifremer.echobase.entities.data.Echotype#1326209638965#0.02441517607077026|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639951#0.5844408998127176|fr.ifremer.echobase.entities.data.Echotype#1326209640038#0.09814274366002829; -fr.ifremer.echobase.entities.data.Voyage#1323685058234#0.307992401450666;fr.ifremer.echobase.entities.data.Echotype#1326209638255#0.3037483064381461|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639697#0.6503602476196935|fr.ifremer.echobase.entities.data.Echotype#1326209640066#0.8225728528177867|fr.ifremer.echobase.entities.data.Echotype#1326209640274#0.32975949409692495; -fr.ifremer.echobase.entities.data.Voyage#1323685058235#0.4400682740376155;fr.ifremer.echobase.entities.data.Echotype#1326209638441#0.5332573222288759|fr.ifremer.echobase.entities.data.Echotype#1326209639159#0.1900536422379523|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639951#0.5844408998127176|fr.ifremer.echobase.entities.data.Echotype#1326209640066#0.8225728528177867|fr.ifremer.echobase.entities.data.Echotype#1326209640361#0.5941173567006921; -fr.ifremer.echobase.entities.data.Voyage#1323685058237#0.4857699826577393;fr.ifremer.echobase.entities.data.Echotype#1326209638255#0.3037483064381461|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639800#0.8307443496436646|fr.ifremer.echobase.entities.data.Echotype#1326209640389#0.7259096598340894; -fr.ifremer.echobase.entities.data.Voyage#1323685058238#0.850515588840622;fr.ifremer.echobase.entities.data.Echotype#1326209638696#0.30826386896107627|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639890#0.510854995359969|fr.ifremer.echobase.entities.data.Echotype#1326209640066#0.8225728528177867|fr.ifremer.echobase.entities.data.Echotype#1326209640415#0.5609510312108426; -fr.ifremer.echobase.entities.data.Voyage#1323685058239#0.6072858518628167;fr.ifremer.echobase.entities.data.Echotype#1326209638255#0.3037483064381461|fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639697#0.6503602476196935|fr.ifremer.echobase.entities.data.Echotype#1326209640488#0.22891179848670806|fr.ifremer.echobase.entities.data.Echotype#1326209640527#0.9311740718590802|fr.ifremer.echobase.entities.data.Echotype#1326209640634#0.0964742080166282; -fr.ifremer.echobase.entities.data.Voyage#1323685058240#0.691691220615427;fr.ifremer.echobase.entities.data.Echotype#1326209638696#0.30826386896107627|fr.ifremer.echobase.entities.data.Echotype#1326209639159#0.1900536422379523|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639890#0.510854995359969|fr.ifremer.echobase.entities.data.Echotype#1326209640274#0.32975949409692495|fr.ifremer.echobase.entities.data.Echotype#1326209640534#0.9583764627192243; -fr.ifremer.echobase.entities.data.Voyage#1323685058242#0.8774330867549509;fr.ifremer.echobase.entities.data.Echotype#1326209638835#0.42631940731906515|fr.ifremer.echobase.entities.data.Echotype#1326209639308#0.9920947760656503|fr.ifremer.echobase.entities.data.Echotype#1326209639414#0.7777148466170637|fr.ifremer.echobase.entities.data.Echotype#1326209639445#0.21949955065818227|fr.ifremer.echobase.entities.data.Echotype#1326209639951#0.5844408998127176; -fr.ifremer.echobase.entities.data.Voyage#1323685058243#0.18605763792490027;fr.ifremer.echobase.entities.data.Echotype#1326209639035#0.3027785889757584|fr.ifremer.echobase.entities.data.Echotype#1326209639191#0.6470313003534052|fr.ifremer.echobase.entities.data.Echotype#1326209639483#0.8959642951719893|fr.ifremer.echobase.entities.data.Echotype#1326209639986#0.9290040880731797|fr.ifremer.echobase.entities.data.Echotype#1326209640140#0.368993273636669|fr.ifremer.echobase.entities.data.Echotype#1326209640274#0.32975949409692495|fr.ifremer.echobase.entities.data.Echotype#1326209640540#0.058123348084025084|fr.ifremer.echobase.entities.data.Echotype#1326209640659#0.3309250258110752;

1 0

r689 - in trunk/echobase-domain/src/main: java/fr/ifremer/echobase/persistence/migration/workingDb resources/META-INF/services xmi
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 16:56:11 +0200 (Sat, 22 Sep 2012) New Revision: 689 Url: http://forge.codelutin.com/repositories/revision/echobase/689 Log: refs #1521: Change Echotype relation type (no more *-*) (modification model + suppression ancienne migrations) Removed: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_2.java Modified: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion trunk/echobase-domain/src/main/xmi/echobase-internal.properties trunk/echobase-domain/src/main/xmi/echobase.properties trunk/echobase-domain/src/main/xmi/echobase.zargo Deleted: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java 2012-09-22 14:52:13 UTC (rev 688) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java 2012-09-22 14:56:11 UTC (rev 689) @@ -1,61 +0,0 @@ -package fr.ifremer.echobase.persistence.migration.workingDb; - -/* - * #%L - * EchoBase :: Domain - * $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% - */ - -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; - -import java.util.Arrays; -import java.util.List; - -/** - * Migration for version {@code 1.1}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.1 - */ -public class MigrationCallbackV1_1 extends MigrationCallBackForVersion { - - @Override - public Version getVersion() { - return VersionUtil.valueOf("1.1"); - } - - @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, - List<String> queries, - boolean showSql, - boolean showProgression) throws TopiaException { - - String[] sqls = new String[]{ - "DROP TABLE echobaseuser;", - "DROP TABLE exportquery;" - }; - - queries.addAll(Arrays.asList(sqls)); - - } -} Deleted: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_2.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_2.java 2012-09-22 14:52:13 UTC (rev 688) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_2.java 2012-09-22 14:56:11 UTC (rev 689) @@ -1,106 +0,0 @@ -package fr.ifremer.echobase.persistence.migration.workingDb; - -/* - * #%L - * EchoBase :: Domain - * $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% - */ - -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; - -import java.util.List; - -/** - * Migration for version {@code 1.2}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.2 - */ -public class MigrationCallbackV1_2 extends MigrationCallBackForVersion { - - @Override - public Version getVersion() { - return VersionUtil.valueOf("1.2"); - } - - @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, - List<String> queries, - boolean showSql, - boolean showProgression) throws TopiaException { - - // create new table import log (http://forge.codelutin.com/issues/1437) - createImportLogTable(tx, queries); - } - - protected void createImportLogTable(TopiaContextImplementor tx, - List<String> queries) throws TopiaNotFoundException { - Dialect dialect = - Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); - - if (dialect instanceof PostgreSQLDialect) { - queries.add("CREATE TABLE importlog (\n" + - "topiaid character varying(255) NOT NULL,\n" + - "topiaversion bigint NOT NULL,\n" + - "topiacreatedate date,\n" + - "importdate date NOT NULL,\n" + - "importtext character varying(1024) NOT NULL,\n" + - "importuser character varying(255) NOT NULL,\n" + - "voyageid character varying(255) NOT NULL\n" + - ");"); - queries.add("ALTER TABLE importlog ADD CONSTRAINT PRIMARY_KEY_99A PRIMARY KEY(topiaid);"); - - queries.add("CREATE TABLE importlog_importid (\n" + - "owner character varying(255) NOT NULL,\n" + - "importid character varying(255) NOT NULL\n" + - ");"); - - queries.add("ALTER TABLE importlog_importid ADD CONSTRAINT FK2987B5F3CDA24477_INDEX_3 FOREIGN KEY(owner) REFERENCES importlog(topiaid);"); - - } else if (dialect instanceof H2Dialect) { - - queries.add("CREATE TABLE importlog (\n" + - "topiaid VARCHAR(255) NOT NULL,\n" + - "topiaversion BIGINT NOT NULL,\n" + - "topiacreatedate DATE NOT NULL ,\n" + - "importdate DATE NOT NULL ,\n" + - "importtext VARCHAR(1024) NOT NULL,\n" + - "importuser VARCHAR(255) NOT NULL,\n" + - "voyageid VARCHAR(255) NOT NULL\n" + - ");"); - - queries.add("ALTER TABLE importlog ADD CONSTRAINT PRIMARY_KEY_99A PRIMARY KEY(topiaid);"); - - queries.add("CREATE TABLE importlog_importid (\n" + - "owner VARCHAR(255) NOT NULL,\n" + - "importid VARCHAR(255)\n" + - ");"); - - queries.add("ALTER TABLE importlog_importid ADD CONSTRAINT FK2987B5F3CDA24477_INDEX_3 FOREIGN KEY(owner) REFERENCES importlog(topiaid);"); - } - } -} 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 2012-09-22 14:52:13 UTC (rev 688) +++ trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2012-09-22 14:56:11 UTC (rev 689) @@ -1,2 +0,0 @@ -fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallbackV1_1 -fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallbackV1_2 \ No newline at end of file Modified: trunk/echobase-domain/src/main/xmi/echobase-internal.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2012-09-22 14:52:13 UTC (rev 688) +++ trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2012-09-22 14:56:11 UTC (rev 689) @@ -25,7 +25,7 @@ model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=1.1 +model.tagValue.version=1.3 model.tagValue.noPCS=true model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true Modified: trunk/echobase-domain/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase.properties 2012-09-22 14:52:13 UTC (rev 688) +++ trunk/echobase-domain/src/main/xmi/echobase.properties 2012-09-22 14:56:11 UTC (rev 689) @@ -25,7 +25,7 @@ model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=1.2 +model.tagValue.version=1.3 model.tagValue.noPCS=true model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true Modified: trunk/echobase-domain/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)

1 0

r688 - in trunk/echobase-services: . src/test/java/fr/ifremer/echobase/services src/test/java/fr/ifremer/echobase/services/embeddedapplication src/test/java/fr/ifremer/echobase/services/exportdb src/test/java/fr/ifremer/echobase/services/exportquery src/test/java/fr/ifremer/echobase/services/importdb src/test/resources src/test/resources/import-data
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 16:52:13 +0200 (Sat, 22 Sep 2012) New Revision: 688 Url: http://forge.codelutin.com/repositories/revision/echobase/688 Log: move test to their package + rename test data Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/embeddedapplication/ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportquery/ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportquery/ExportQueryServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdb/ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdb/ImportDbServiceTest.java trunk/echobase-services/src/test/resources/echobase-importDb-referentiel.zip trunk/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz Removed: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportQueryServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java trunk/echobase-services/src/test/resources/echobase-1.2-importDb-referentiel.zip trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-1.2-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-1.2-nodata.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-1.2-operation.h2.db.gz Modified: trunk/echobase-services/update-import-data-db.sh Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-09-22 14:26:13 UTC (rev 687) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-09-22 14:52:13 UTC (rev 688) @@ -1,70 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 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% - */ -package fr.ifremer.echobase.services; - -import fr.ifremer.echobase.services.embeddedapplication.EmbeddedApplicationConfiguration; -import fr.ifremer.echobase.services.embeddedapplication.EmbeddedApplicationService; -import org.apache.commons.io.FileUtils; -import org.junit.Assert; -import org.junit.Test; -import org.nuiton.util.FileUtil; - -import java.io.File; - -/** - * Test {@link EmbeddedApplicationService}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EmbeddedApplicationServiceIT extends EchoBaseTestServiceSupport { - - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - fixtures.IMPORT_DATA_ECHOBASE_COMMON_DATA()); - } - - @Test - public void testCreateEmbeddedApplication() throws Exception { - EmbeddedApplicationConfiguration conf = new EmbeddedApplicationConfiguration(); - conf.setVoyageIds(new String[]{getVoyageId()}); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - File warLocation = new File(workingDirectory, "echobase.war"); - FileUtils.write(warLocation, "dummy!"); - conf.setWarLocation(warLocation); - conf.setFileName("echobase"); - EmbeddedApplicationService service = - getService(EmbeddedApplicationService.class); - - File zipFile = service.createEmbeddedApplication(conf); - - Assert.assertTrue(zipFile.exists()); - Assert.assertEquals(100f, conf.getProgress(), 1); - - // TODO Test that embedded db has exactly same number of data than in incoming db - } -} Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java 2012-09-22 14:26:13 UTC (rev 687) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java 2012-09-22 14:52:13 UTC (rev 688) @@ -1,338 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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% - */ -package fr.ifremer.echobase.services; - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.data.Category; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Data; -import fr.ifremer.echobase.entities.data.DataAcquisition; -import fr.ifremer.echobase.entities.data.DataProcessing; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.AcousticInstrument; -import fr.ifremer.echobase.entities.references.CellType; -import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.entities.references.SpeciesCategory; -import fr.ifremer.echobase.io.EchoBaseIOUtil; -import fr.ifremer.echobase.services.exportdb.ExportDbConfiguration; -import fr.ifremer.echobase.services.exportdb.ExportDbMode; -import fr.ifremer.echobase.services.exportdb.ExportDbService; -import junit.framework.Assert; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Test; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.csv.in.TopiaCsvImports; -import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.FileUtil; - -import java.io.File; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -/** - * Test {@link ExportDbService}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ExportDbServiceTest extends EchoBaseTestServiceSupport { - - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - fixtures.IMPORT_DATA_ECHOBASE_COMMON_DATA()); - } - - /** Logger. */ - private static final Log log = LogFactory.getLog(ExportDbServiceTest.class); - - @Override - public void setUp() throws Exception { - super.setUp(); - - TopiaDAO<Voyage> voyageDAO = getDAO(Voyage.class); - TopiaDAO<DataProcessing> dataProcessingDAO = getDAO(DataProcessing.class); - TopiaDAO<DataAcquisition> dataAcquisitionDAO = getDAO(DataAcquisition.class); - TopiaDAO<Cell> cellDAO = getDAO(Cell.class); - TopiaDAO<Category> categoryDAO = getDAO(Category.class); - TopiaDAO<Result> resultDAO = getDAO(Result.class); - TopiaDAO<SpeciesCategory> speciesCategoryDAO = getDAO(SpeciesCategory.class); - TopiaDAO<Data> dataDAO = getDAO(Data.class); - - - Voyage voyage = getEntityById(Voyage.class, getVoyageId()); - Assert.assertNotNull(voyage); - - Transect transect = voyage.getTransit().get(0).getTransect().get(0); - Assert.assertNotNull(transect); - - List<AcousticInstrument> acousticInstruments = getEntities(AcousticInstrument.class); - Assert.assertTrue(CollectionUtils.isNotEmpty(acousticInstruments)); - AcousticInstrument acousticInstrument = acousticInstruments.get(0); - DataAcquisition dataAcquisition = dataAcquisitionDAO.create( - DataAcquisition.PROPERTY_ACOUSTIC_INSTRUMENT, acousticInstrument - ); - transect.addDataAcquisition(dataAcquisition); - DataProcessing dataProcessing = dataProcessingDAO.create( - DataProcessing.PROPERTY_ID, "id", - DataProcessing.PROPERTY_PROCESSING_TEMPLATE, "processingtemplate" - ); - dataAcquisition.addDataProcessing(dataProcessing); - - List<Species> speciesList = getEntities(Species.class); - Assert.assertTrue(CollectionUtils.isNotEmpty(speciesList)); - Species species = speciesList.get(0); - - List<DataMetadata> dataMetadatas = getEntities(DataMetadata.class); - Assert.assertTrue(CollectionUtils.isNotEmpty(dataMetadatas)); - DataMetadata dataMetadata = dataMetadatas.get(0); - - SpeciesCategory speciesCategory = speciesCategoryDAO.create( - SpeciesCategory.PROPERTY_SPECIES, species - ); - - Category category = categoryDAO.create( - Category.PROPERTY_SPECIES_CATEGORY, speciesCategory - ); - - List<CellType> cellTypes = getEntities(CellType.class); - Assert.assertTrue(CollectionUtils.isNotEmpty(cellTypes)); - CellType cellType = cellTypes.get(0); - - Cell cell = cellDAO.create( - Cell.PROPERTY_NAME, "cellName", - Cell.PROPERTY_CELL_TYPE, cellType - ); - if (log.isInfoEnabled()) { - log.info("cell:" + cell.getTopiaId()); - } - dataProcessing.addCell(cell); - - Data cellData = dataDAO.create( - Data.PROPERTY_DATA_METADATA, dataMetadata, - Data.PROPERTY_DATA_VALUE, "cellDataValue" - ); - cell.addData(cellData); - Result cellResult = resultDAO.create( - Result.PROPERTY_CATEGORY, category, - Result.PROPERTY_DATA_METADATA, dataMetadata, - Result.PROPERTY_RESULT_LABEL, "cellResultLabel", - Result.PROPERTY_RESULT_VALUE, "cellResultValue" - ); - cell.addResult(cellResult); - - Cell childCell = cellDAO.create( - Cell.PROPERTY_NAME, "childCell", - Cell.PROPERTY_CELL_TYPE, cellType - ); - cell.addChilds(childCell); - - Data childCellData = dataDAO.create( - Data.PROPERTY_DATA_METADATA, dataMetadata, - Data.PROPERTY_DATA_VALUE, "childCellDataValue" - ); - childCell.addData(childCellData); - - Result childCellResult = resultDAO.create( - Result.PROPERTY_CATEGORY, category, - Result.PROPERTY_DATA_METADATA, dataMetadata, - Result.PROPERTY_RESULT_LABEL, "childCellResultLabel", - Result.PROPERTY_RESULT_VALUE, "childCellResultValue" - ); - childCell.addResult(childCellResult); - - Cell postCell = cellDAO.create( - Cell.PROPERTY_NAME, "postCellcellName", - Cell.PROPERTY_CELL_TYPE, cellType - ); - - postCell.addChilds(cell); - voyage.addPostCell(postCell); - - - Data postCellData = dataDAO.create( - Data.PROPERTY_DATA_METADATA, dataMetadata, - Data.PROPERTY_DATA_VALUE, "postCellDataValue" - ); - postCell.addData(postCellData); - - Result postCellResult = resultDAO.create( - Result.PROPERTY_CATEGORY, category, - Result.PROPERTY_DATA_METADATA, dataMetadata, - Result.PROPERTY_RESULT_LABEL, "postCellResultLabel", - Result.PROPERTY_RESULT_VALUE, "postCellResultValue" - ); - postCell.addResult(postCellResult); - - commitTransaction("Create cells"); - } - - @Test - public void exportReferential() throws IOException { - - ExportDbService service = getService(ExportDbService.class); - - ExportDbConfiguration conf = new ExportDbConfiguration(); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - conf.setFileName("echobase-referential"); - conf.setComputeSteps(true); - conf.setExportDbMode(ExportDbMode.REFERENTIAL); - service.doExport(conf); - File exportFile = conf.getExportFile(); - Assert.assertNotNull(exportFile); - Assert.assertTrue(exportFile.exists()); - - // check all tables (referential) where exported - ZipFile zipFile = new ZipFile(exportFile); - - Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = - TopiaCsvImports.discoverEntries( - "echobase/", getDbMeta().getReferenceTables(), - zipFile, Lists.<String>newArrayList()); - - checkAllTablesExported(zipFile, tables); - } - - @Test - public void exportData() throws IOException, TopiaException { - - ExportDbService service = getService(ExportDbService.class); - - ExportDbConfiguration conf = new ExportDbConfiguration(); - - conf.setVoyageIds(new String[]{getVoyageId()}); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - conf.setFileName("echobase-data"); - conf.setComputeSteps(true); - conf.setExportDbMode(ExportDbMode.DATA); - service.doExport(conf); - File exportFile = conf.getExportFile(); - Assert.assertNotNull(exportFile); - Assert.assertTrue(exportFile.exists()); - - // check all tables (referential + data) where exported - ZipFile zipFile = new ZipFile(exportFile); - - Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = - TopiaCsvImports.discoverEntries( - "echobase/", getDbMeta().getAllTables(), - zipFile, Lists.<String>newArrayList()); - - checkAllTablesExported(zipFile, tables); - } - - @Test - public void exportReferentialAndData() throws IOException { - - ExportDbService service = getService(ExportDbService.class); - - ExportDbConfiguration conf = new ExportDbConfiguration(); - - conf.setVoyageIds(new String[]{getVoyageId()}); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - conf.setFileName("echobase-referentialAndData"); - conf.setComputeSteps(true); - conf.setExportDbMode(ExportDbMode.REFERENTIAL_AND_DATA); - service.doExport(conf); - File exportFile = conf.getExportFile(); - Assert.assertNotNull(exportFile); - Assert.assertTrue(exportFile.exists()); - - - // check all tables (referential + data) where exported - ZipFile zipFile = new ZipFile(exportFile); - - Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = - TopiaCsvImports.discoverEntries( - "echobase/", getDbMeta().getAllTables(), - zipFile, Lists.<String>newArrayList()); - - checkAllTablesExported(zipFile, tables); - } - - @Test - public void exportAll() throws IOException { - - ExportDbService service = getService(ExportDbService.class); - - ExportDbConfiguration conf = new ExportDbConfiguration(); - conf.setVoyageIds(new String[]{getVoyageId()}); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - conf.setFileName("echobase-all"); - conf.setComputeSteps(true); - conf.setExportDbMode(ExportDbMode.ALL); - service.doExport(conf); - File exportFile = conf.getExportFile(); - Assert.assertNotNull(exportFile); - Assert.assertTrue(exportFile.exists()); - - - // check all tables (referential + data) where exported - ZipFile zipFile = new ZipFile(exportFile); - - Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = - TopiaCsvImports.discoverEntries( - "echobase/", getDbMeta().getAllTables(), - zipFile, Lists.<String>newArrayList()); - - checkAllTablesExported(zipFile, tables); - } - - private void checkAllTablesExported(ZipFile zipFile, Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables) throws IOException { - for (Map.Entry<TableMeta<EchoBaseEntityEnum>, ZipEntry> entry : tables.entrySet()) { - TableMeta<EchoBaseEntityEnum> type = entry.getKey(); - if (type.getSource() == EchoBaseEntityEnum.Gear) { - // there is some extra lines so can not count from here... - //FIXME should use a csv import to read entries nstead - continue; - } - ZipEntry zipEntry = entry.getValue(); - long nbCells = EchoBaseIOUtil.countLines(zipFile, Sets.newHashSet(zipEntry)); - Assert.assertEquals(1 + getEntities(type.getEntityType()).size(), nbCells); - } - } - -} Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportQueryServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportQueryServiceTest.java 2012-09-22 14:26:13 UTC (rev 687) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportQueryServiceTest.java 2012-09-22 14:52:13 UTC (rev 688) @@ -1,71 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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% - */ -package fr.ifremer.echobase.services; - -import fr.ifremer.echobase.services.exportquery.ExportQueryService; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * To test {@link ExportQueryService}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ExportQueryServiceTest extends EchoBaseTestServiceSupport { - @Override - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext(null); - } - - ExportQueryService service; - - @Before - public void setup() { - service = getService(ExportQueryService.class); - } - - @Ignore - @Test - public void processLibreOfficeSqlQuery() throws Exception { - - processLibreOfficeSqlQuery("select \"t\".name FROM \"t\" WHERE rien;", - "select t.name FROM t WHERE rien;"); - - processLibreOfficeSqlQuery("select \"t\".name, \"s\".name FROM \"t\", \"s\" WHERE rien;", - "select t.name, s.name FROM t, s WHERE rien;"); - - processLibreOfficeSqlQuery("select \"t\".name FROM \"t\" WHERE (select \"s\".name FROM \"s\" WHERE rien2);", - "select t.name FROM t WHERE (select s.name FROM s WHERE rien2);"); - } - - protected void processLibreOfficeSqlQuery(String libreOfficeQuery, - String expected) { - - String actual = service.processLibreOfficeSqlQuery(libreOfficeQuery); - Assert.assertEquals(expected, actual); - } -} Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-09-22 14:26:13 UTC (rev 687) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-09-22 14:52:13 UTC (rev 688) @@ -1,77 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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% - */ -package fr.ifremer.echobase.services; - -import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.EchoBaseUserImpl; -import fr.ifremer.echobase.services.importdata.ImportException; -import fr.ifremer.echobase.services.importdb.ImportDbConfiguration; -import fr.ifremer.echobase.services.importdb.ImportDbMode; -import fr.ifremer.echobase.services.importdb.ImportDbService; -import org.junit.Assert; -import org.junit.Test; -import org.nuiton.util.FileUtil; - -import java.io.File; -import java.io.IOException; - -/** - * Tests the {@link ImportDbService}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ImportDbServiceTest extends EchoBaseTestServiceSupport { - - public static final String DB_VERSION = "1.2"; - - @Override - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext(null); - } - - @Test - public void importDb() throws IOException, ImportException { - - ImportDbService service = getService(ImportDbService.class); - - ImportDbConfiguration conf = new ImportDbConfiguration(getLocale()); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - conf.setComputeSteps(true); - conf.setCommitAfterEachFile(false); - conf.setImportDbMode(ImportDbMode.REFERENTIAL); - prepareInputFile(conf.getInput(), fixtures.importDbReferentialPath()); - - EchoBaseUser user = new EchoBaseUserImpl(); - user.setEmail("testUser(a)fake.fr"); - - service.doImport(conf, user); - - Assert.assertTrue(conf.getProgress() > 94); - } - -} Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationServiceIT.java (from rev 687, trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationServiceIT.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationServiceIT.java 2012-09-22 14:52:13 UTC (rev 688) @@ -0,0 +1,72 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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% + */ +package fr.ifremer.echobase.services.embeddedapplication; + +import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import fr.ifremer.echobase.services.embeddedapplication.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.embeddedapplication.EmbeddedApplicationService; +import org.apache.commons.io.FileUtils; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.util.FileUtil; + +import java.io.File; + +/** + * Test {@link EmbeddedApplicationService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EmbeddedApplicationServiceIT extends EchoBaseTestServiceSupport { + + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext( + fixtures.IMPORT_DATA_ECHOBASE_COMMON_DATA()); + } + + @Test + public void testCreateEmbeddedApplication() throws Exception { + EmbeddedApplicationConfiguration conf = new EmbeddedApplicationConfiguration(); + conf.setVoyageIds(new String[]{getVoyageId()}); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + File warLocation = new File(workingDirectory, "echobase.war"); + FileUtils.write(warLocation, "dummy!"); + conf.setWarLocation(warLocation); + conf.setFileName("echobase"); + EmbeddedApplicationService service = + getService(EmbeddedApplicationService.class); + + File zipFile = service.createEmbeddedApplication(conf); + + Assert.assertTrue(zipFile.exists()); + Assert.assertEquals(100f, conf.getProgress(), 1); + + // TODO Test that embedded db has exactly same number of data than in incoming db + } +} Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java (from rev 681, trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-09-22 14:52:13 UTC (rev 688) @@ -0,0 +1,336 @@ +/* + * #%L + * EchoBase :: Services + * + * $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% + */ +package fr.ifremer.echobase.services.exportdb; + +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.Category; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Data; +import fr.ifremer.echobase.entities.data.DataAcquisition; +import fr.ifremer.echobase.entities.data.DataProcessing; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.AcousticInstrument; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.SpeciesCategory; +import fr.ifremer.echobase.io.EchoBaseIOUtil; +import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import junit.framework.Assert; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.csv.in.TopiaCsvImports; +import org.nuiton.topia.persistence.metadata.TableMeta; +import org.nuiton.util.FileUtil; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + +/** + * Test {@link ExportDbService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ExportDbServiceTest extends EchoBaseTestServiceSupport { + + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext( + fixtures.IMPORT_DATA_ECHOBASE_COMMON_DATA()); + } + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportDbServiceTest.class); + + @Override + public void setUp() throws Exception { + super.setUp(); + + TopiaDAO<DataProcessing> dataProcessingDAO = getDAO(DataProcessing.class); + TopiaDAO<DataAcquisition> dataAcquisitionDAO = getDAO(DataAcquisition.class); + TopiaDAO<Cell> cellDAO = getDAO(Cell.class); + TopiaDAO<Category> categoryDAO = getDAO(Category.class); + TopiaDAO<Result> resultDAO = getDAO(Result.class); + TopiaDAO<SpeciesCategory> speciesCategoryDAO = getDAO(SpeciesCategory.class); + TopiaDAO<Data> dataDAO = getDAO(Data.class); + + + Voyage voyage = getEntityById(Voyage.class, getVoyageId()); + Assert.assertNotNull(voyage); + + Transect transect = voyage.getTransit().get(0).getTransect().get(0); + Assert.assertNotNull(transect); + + List<AcousticInstrument> acousticInstruments = getEntities(AcousticInstrument.class); + Assert.assertTrue(CollectionUtils.isNotEmpty(acousticInstruments)); + AcousticInstrument acousticInstrument = acousticInstruments.get(0); + DataAcquisition dataAcquisition = dataAcquisitionDAO.create( + DataAcquisition.PROPERTY_ACOUSTIC_INSTRUMENT, acousticInstrument + ); + transect.addDataAcquisition(dataAcquisition); + DataProcessing dataProcessing = dataProcessingDAO.create( + DataProcessing.PROPERTY_ID, "id", + DataProcessing.PROPERTY_PROCESSING_TEMPLATE, "processingtemplate" + ); + dataAcquisition.addDataProcessing(dataProcessing); + + List<Species> speciesList = getEntities(Species.class); + Assert.assertTrue(CollectionUtils.isNotEmpty(speciesList)); + Species species = speciesList.get(0); + + List<DataMetadata> dataMetadatas = getEntities(DataMetadata.class); + Assert.assertTrue(CollectionUtils.isNotEmpty(dataMetadatas)); + DataMetadata dataMetadata = dataMetadatas.get(0); + + SpeciesCategory speciesCategory = speciesCategoryDAO.create( + SpeciesCategory.PROPERTY_SPECIES, species + ); + + Category category = categoryDAO.create( + Category.PROPERTY_SPECIES_CATEGORY, speciesCategory + ); + + List<CellType> cellTypes = getEntities(CellType.class); + Assert.assertTrue(CollectionUtils.isNotEmpty(cellTypes)); + CellType cellType = cellTypes.get(0); + + Cell cell = cellDAO.create( + Cell.PROPERTY_NAME, "cellName", + Cell.PROPERTY_CELL_TYPE, cellType + ); + if (log.isInfoEnabled()) { + log.info("cell:" + cell.getTopiaId()); + } + dataProcessing.addCell(cell); + + Data cellData = dataDAO.create( + Data.PROPERTY_DATA_METADATA, dataMetadata, + Data.PROPERTY_DATA_VALUE, "cellDataValue" + ); + cell.addData(cellData); + Result cellResult = resultDAO.create( + Result.PROPERTY_CATEGORY, category, + Result.PROPERTY_DATA_METADATA, dataMetadata, + Result.PROPERTY_RESULT_LABEL, "cellResultLabel", + Result.PROPERTY_RESULT_VALUE, "cellResultValue" + ); + cell.addResult(cellResult); + + Cell childCell = cellDAO.create( + Cell.PROPERTY_NAME, "childCell", + Cell.PROPERTY_CELL_TYPE, cellType + ); + cell.addChilds(childCell); + + Data childCellData = dataDAO.create( + Data.PROPERTY_DATA_METADATA, dataMetadata, + Data.PROPERTY_DATA_VALUE, "childCellDataValue" + ); + childCell.addData(childCellData); + + Result childCellResult = resultDAO.create( + Result.PROPERTY_CATEGORY, category, + Result.PROPERTY_DATA_METADATA, dataMetadata, + Result.PROPERTY_RESULT_LABEL, "childCellResultLabel", + Result.PROPERTY_RESULT_VALUE, "childCellResultValue" + ); + childCell.addResult(childCellResult); + + Cell postCell = cellDAO.create( + Cell.PROPERTY_NAME, "postCellcellName", + Cell.PROPERTY_CELL_TYPE, cellType + ); + + postCell.addChilds(cell); + voyage.addPostCell(postCell); + + + Data postCellData = dataDAO.create( + Data.PROPERTY_DATA_METADATA, dataMetadata, + Data.PROPERTY_DATA_VALUE, "postCellDataValue" + ); + postCell.addData(postCellData); + + Result postCellResult = resultDAO.create( + Result.PROPERTY_CATEGORY, category, + Result.PROPERTY_DATA_METADATA, dataMetadata, + Result.PROPERTY_RESULT_LABEL, "postCellResultLabel", + Result.PROPERTY_RESULT_VALUE, "postCellResultValue" + ); + postCell.addResult(postCellResult); + + commitTransaction("Create cells"); + } + + @Test + public void exportReferential() throws IOException { + + ExportDbService service = getService(ExportDbService.class); + + ExportDbConfiguration conf = new ExportDbConfiguration(); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + conf.setFileName("echobase-referential"); + conf.setComputeSteps(true); + conf.setExportDbMode(ExportDbMode.REFERENTIAL); + service.doExport(conf); + File exportFile = conf.getExportFile(); + Assert.assertNotNull(exportFile); + Assert.assertTrue(exportFile.exists()); + + // check all tables (referential) where exported + ZipFile zipFile = new ZipFile(exportFile); + + Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = + TopiaCsvImports.discoverEntries( + "echobase/", getDbMeta().getReferenceTables(), + zipFile, Lists.<String>newArrayList()); + + checkAllTablesExported(zipFile, tables); + } + + @Test + public void exportData() throws IOException, TopiaException { + + ExportDbService service = getService(ExportDbService.class); + + ExportDbConfiguration conf = new ExportDbConfiguration(); + + conf.setVoyageIds(new String[]{getVoyageId()}); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + conf.setFileName("echobase-data"); + conf.setComputeSteps(true); + conf.setExportDbMode(ExportDbMode.DATA); + service.doExport(conf); + File exportFile = conf.getExportFile(); + Assert.assertNotNull(exportFile); + Assert.assertTrue(exportFile.exists()); + + // check all tables (referential + data) where exported + ZipFile zipFile = new ZipFile(exportFile); + + Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = + TopiaCsvImports.discoverEntries( + "echobase/", getDbMeta().getAllTables(), + zipFile, Lists.<String>newArrayList()); + + checkAllTablesExported(zipFile, tables); + } + + @Test + public void exportReferentialAndData() throws IOException { + + ExportDbService service = getService(ExportDbService.class); + + ExportDbConfiguration conf = new ExportDbConfiguration(); + + conf.setVoyageIds(new String[]{getVoyageId()}); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + conf.setFileName("echobase-referentialAndData"); + conf.setComputeSteps(true); + conf.setExportDbMode(ExportDbMode.REFERENTIAL_AND_DATA); + service.doExport(conf); + File exportFile = conf.getExportFile(); + Assert.assertNotNull(exportFile); + Assert.assertTrue(exportFile.exists()); + + + // check all tables (referential + data) where exported + ZipFile zipFile = new ZipFile(exportFile); + + Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = + TopiaCsvImports.discoverEntries( + "echobase/", getDbMeta().getAllTables(), + zipFile, Lists.<String>newArrayList()); + + checkAllTablesExported(zipFile, tables); + } + + @Test + public void exportAll() throws IOException { + + ExportDbService service = getService(ExportDbService.class); + + ExportDbConfiguration conf = new ExportDbConfiguration(); + conf.setVoyageIds(new String[]{getVoyageId()}); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + conf.setFileName("echobase-all"); + conf.setComputeSteps(true); + conf.setExportDbMode(ExportDbMode.ALL); + service.doExport(conf); + File exportFile = conf.getExportFile(); + Assert.assertNotNull(exportFile); + Assert.assertTrue(exportFile.exists()); + + + // check all tables (referential + data) where exported + ZipFile zipFile = new ZipFile(exportFile); + + Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = + TopiaCsvImports.discoverEntries( + "echobase/", getDbMeta().getAllTables(), + zipFile, Lists.<String>newArrayList()); + + checkAllTablesExported(zipFile, tables); + } + + private void checkAllTablesExported(ZipFile zipFile, Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables) throws IOException { + for (Map.Entry<TableMeta<EchoBaseEntityEnum>, ZipEntry> entry : tables.entrySet()) { + TableMeta<EchoBaseEntityEnum> type = entry.getKey(); + if (type.getSource() == EchoBaseEntityEnum.Gear) { + // there is some extra lines so can not count from here... + //FIXME should use a csv import to read entries nstead + continue; + } + ZipEntry zipEntry = entry.getValue(); + long nbCells = EchoBaseIOUtil.countLines(zipFile, Sets.newHashSet(zipEntry)); + Assert.assertEquals(1 + getEntities(type.getEntityType()).size(), nbCells); + } + } + +} Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportquery/ExportQueryServiceTest.java (from rev 687, trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportQueryServiceTest.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportquery/ExportQueryServiceTest.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportquery/ExportQueryServiceTest.java 2012-09-22 14:52:13 UTC (rev 688) @@ -0,0 +1,73 @@ +/* + * #%L + * EchoBase :: Services + * + * $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% + */ +package fr.ifremer.echobase.services.exportquery; + +import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import fr.ifremer.echobase.services.exportquery.ExportQueryService; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +/** + * To test {@link ExportQueryService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ExportQueryServiceTest extends EchoBaseTestServiceSupport { + @Override + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext(null); + } + + ExportQueryService service; + + @Before + public void setup() { + service = getService(ExportQueryService.class); + } + + @Ignore + @Test + public void processLibreOfficeSqlQuery() throws Exception { + + processLibreOfficeSqlQuery("select \"t\".name FROM \"t\" WHERE rien;", + "select t.name FROM t WHERE rien;"); + + processLibreOfficeSqlQuery("select \"t\".name, \"s\".name FROM \"t\", \"s\" WHERE rien;", + "select t.name, s.name FROM t, s WHERE rien;"); + + processLibreOfficeSqlQuery("select \"t\".name FROM \"t\" WHERE (select \"s\".name FROM \"s\" WHERE rien2);", + "select t.name FROM t WHERE (select s.name FROM s WHERE rien2);"); + } + + protected void processLibreOfficeSqlQuery(String libreOfficeQuery, + String expected) { + + String actual = service.processLibreOfficeSqlQuery(libreOfficeQuery); + Assert.assertEquals(expected, actual); + } +} Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportquery/ExportQueryServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdb/ImportDbServiceTest.java (from rev 687, trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdb/ImportDbServiceTest.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdb/ImportDbServiceTest.java 2012-09-22 14:52:13 UTC (rev 688) @@ -0,0 +1,76 @@ +/* + * #%L + * EchoBase :: Services + * + * $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% + */ +package fr.ifremer.echobase.services.importdb; + +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.EchoBaseUserImpl; +import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import fr.ifremer.echobase.services.importdata.ImportException; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.util.FileUtil; + +import java.io.File; +import java.io.IOException; + +/** + * Tests the {@link ImportDbService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ImportDbServiceTest extends EchoBaseTestServiceSupport { + + public static final String DB_VERSION = "1.2"; + + @Override + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext(null); + } + + @Test + public void importDb() throws IOException, ImportException { + + ImportDbService service = getService(ImportDbService.class); + + ImportDbConfiguration conf = new ImportDbConfiguration(getLocale()); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + conf.setComputeSteps(true); + conf.setCommitAfterEachFile(false); + conf.setImportDbMode(ImportDbMode.REFERENTIAL); + prepareInputFile(conf.getInput(), fixtures.importDbReferentialPath()); + + EchoBaseUser user = new EchoBaseUserImpl(); + user.setEmail("testUser(a)fake.fr"); + + service.doImport(conf, user); + + Assert.assertTrue(conf.getProgress() > 94); + } + +} Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdb/ImportDbServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-services/src/test/resources/echobase-1.2-importDb-referentiel.zip =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/echobase-importDb-referentiel.zip (from rev 687, trunk/echobase-services/src/test/resources/echobase-1.2-importDb-referentiel.zip) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/echobase-importDb-referentiel.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches-and-voyage-result.h2.db.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches.h2.db.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-commonData.h2.db.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-nodata.h2.db.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-operation.h2.db.gz =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz (from rev 687, trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches-and-voyage-result.h2.db.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz (from rev 687, trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches.h2.db.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz (from rev 687, trunk/echobase-services/src/test/resources/import-data/echobase-1.2-commonData.h2.db.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz (from rev 687, trunk/echobase-services/src/test/resources/import-data/echobase-1.2-nodata.h2.db.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz (from rev 687, trunk/echobase-services/src/test/resources/import-data/echobase-1.2-operation.h2.db.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-services/update-import-data-db.sh =================================================================== --- trunk/echobase-services/update-import-data-db.sh 2012-09-22 14:26:13 UTC (rev 687) +++ trunk/echobase-services/update-import-data-db.sh 2012-09-22 14:52:13 UTC (rev 688) @@ -8,7 +8,7 @@ exit fi -dbnameprefix="echobase-1.2" +dbnameprefix="echobase" dbDir=src/test/resources/import-data @@ -36,7 +36,7 @@ cp -v "$1" "src/test/resources/$dbnameprefix-importDb-referentiel.zip" -executeMaven fr.ifremer.echobase.services.ImportDbServiceTest nodata +executeMaven fr.ifremer.echobase.services.importdb.ImportDbServiceTest nodata executeMaven fr.ifremer.echobase.services.importdata.CommonAllImportServiceIT commonData

1 0

r687 - in trunk/src/site: . rst
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 16:26:13 +0200 (Sat, 22 Sep 2012) New Revision: 687 Url: http://forge.codelutin.com/repositories/revision/echobase/687 Log: improve site Modified: trunk/src/site/rst/db.rst trunk/src/site/rst/embedded.rst trunk/src/site/rst/exportData.rst trunk/src/site/rst/exportDb.rst trunk/src/site/rst/importData.rst trunk/src/site/rst/importDb.rst trunk/src/site/rst/index.rst trunk/src/site/rst/install.rst trunk/src/site/rst/model.rst trunk/src/site/rst/modifyData.rst trunk/src/site/rst/removeData.rst trunk/src/site/rst/usage.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/rst/db.rst =================================================================== --- trunk/src/site/rst/db.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/db.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -20,17 +20,11 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ========================== Echobase - Base de données ========================== -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Les bases de données dans EchoBase ---------------------------------- @@ -55,7 +49,7 @@ moins performantes et perenne que les bases de type *Postgresql*. Pour utiliser une telle base, il suffit de créer une configuration de type *H2* -en spécifiant une url de type : +en spécifiant une url sous ce format : :: jdbc:h2:file:/cheminVersLaBase/nomDeLaBase @@ -82,7 +76,7 @@ indiqué dans la section suivante. Une fois la base créée sur le serveur, il suffit de créer une configuration de -base de travail dans *EchoBase* de type *Postgresql* avec une url de type : +base de travail dans *EchoBase* de type *Postgresql* avec une url sous ce format : :: jdbc:postgresql://adresseDuServeur/nomDeLaBase Modified: trunk/src/site/rst/embedded.rst =================================================================== --- trunk/src/site/rst/embedded.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/embedded.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -26,13 +26,6 @@ Echobase ======== -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Création d'une application embarquée ------------------------------------ Modified: trunk/src/site/rst/exportData.rst =================================================================== --- trunk/src/site/rst/exportData.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/exportData.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -26,13 +26,6 @@ Exporter des données ==================== -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Abstract ======== Modified: trunk/src/site/rst/exportDb.rst =================================================================== --- trunk/src/site/rst/exportDb.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/exportDb.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -25,13 +25,6 @@ Export d'une base ================= -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Abstract -------- @@ -48,7 +41,7 @@ Il existe plusieurs modes d'export que nous détaillons ci-dessous. Export referential -~~~~~~~~~~~~~~~~~~ +------------------ Dans ce mode on exporte uniquement le référentiel de la base de travail. @@ -58,7 +51,7 @@ Une fois l'export réalisé, le fichier sera téléchargeable. Export referential and data -~~~~~~~~~~~~~~~~~~~~~~~~~~~ +--------------------------- Dans ce mode on exporte le référentiel et les données sélectionnées de la base de travail. @@ -71,7 +64,7 @@ Export data -~~~~~~~~~~~ +----------- Dans ce mode on exporte uniquement les données sélectionnées de la base de travail. @@ -83,7 +76,7 @@ Une fois l'export réalisé, le fichier sera téléchargeable. Export All -~~~~~~~~~~ +---------- Dans ce mode, on exporte toute la base de travail. Modified: trunk/src/site/rst/importData.rst =================================================================== --- trunk/src/site/rst/importData.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/importData.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -22,17 +22,10 @@ .. * #L% .. - -================================= -Importerdes données dans EchoBase -================================= +================================== +Importer des données dans EchoBase +================================== -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Abstract ======== Modified: trunk/src/site/rst/importDb.rst =================================================================== --- trunk/src/site/rst/importDb.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/importDb.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -25,34 +25,27 @@ Import d'une base ================= -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Abstract -------- Ce document explique comment importer des bases au format EchoBase. Import Referential -~~~~~~~~~~~~~~~~~~ +------------------ Ce mode permet d'importer uniquement des données du référentiel. Il suffit de renseigner le fichier *.echobase* à importer et de lancer l'import. Import Data -~~~~~~~~~~~ +----------- Ce mode permet d'importer uniquement des données thématiques. Il suffit de renseigner le fichier *.echobase* à importer et de lancer l'import. Import Free -~~~~~~~~~~~ +----------- Ce mode permet d'importer n'importe quelle type de données (référentiel ou/et données thématiques). Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/index.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -47,22 +47,6 @@ - une structure de métadonnées acoustiques en accord avec le format défini par le `groupe de travail CIEM WGFAST`_. -Les documents -------------- - - -- La documentation d'`installation`_. - -- La description du `modèle`_. - -- La description des `imports`_. - -- Comment créer une `application embarquée`_. - .. _forge Ifremer: https://forge.ifremer.fr/www/echor .. _groupe de travail CIEM WGFAST: http://www.acoustics.washington.edu/FAST -.. _installation: ./install.html -.. _modèle: ./model.html -.. _imports: ./imports.html -.. _application embarquée: ./embedded.html Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/install.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -26,13 +26,6 @@ Echobase ======== -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Installation d'EchoBase sur un serveur -------------------------------------- Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/model.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -26,13 +26,6 @@ Modèle Echobase =============== -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Présentation ------------ Modified: trunk/src/site/rst/modifyData.rst =================================================================== --- trunk/src/site/rst/modifyData.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/modifyData.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -23,16 +23,9 @@ .. - ==================== -modifier des données +Modifier des données ==================== -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Abstract ======== Modified: trunk/src/site/rst/removeData.rst =================================================================== --- trunk/src/site/rst/removeData.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/removeData.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -26,13 +26,6 @@ Suppression des imports ======================= -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Abstract -------- @@ -49,9 +42,8 @@ - category (utilise EchoType) - echotype -Question: - Les echotypes sont-ils uniquement lié au voyage ? Si oui on peut utiliser - une composition qui évitent de devoir supprimer à la main les echotypes. +Imports à retirer +~~~~~~~~~~~~~~~~~ Seront supprimés de la table des imports les imports suivants qui aurait pu être effectué suite à cet import, à savoir : Modified: trunk/src/site/rst/usage.rst =================================================================== --- trunk/src/site/rst/usage.rst 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/rst/usage.rst 2012-09-22 14:26:13 UTC (rev 687) @@ -20,17 +20,11 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ====================== EchoBase - Utilisation ====================== -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - Comment utiliser EchoBase ------------------------- Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/site_en.xml 2012-09-22 14:26:13 UTC (rev 687) @@ -23,7 +23,9 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.3.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> @@ -48,7 +50,7 @@ </bannerLeft> <publishDate position="right" format="yyyy-MM-dd"/> - <version position="right" /> + <version position="right"/> <poweredBy> <logo href="http://maven.apache.org" name="Maven" Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-22 13:46:36 UTC (rev 686) +++ trunk/src/site/site_fr.xml 2012-09-22 14:26:13 UTC (rev 687) @@ -23,7 +23,9 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.3.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> @@ -107,18 +109,19 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Utilisation" href="usage.html"/> + <item name="Bases de travail" href="db.html"/> - <menu name="Import/Export Base"> + <item name="Import/Export Base" href="#"> <item name="Importer" href="importDb.html"/> <item name="Exporter" href="exportDb.html"/> - </menu> + </item> - <menu name="Gestion données"> + <item name="Gestion données" href="#"> <item name="Importer" href="importData.html"/> <item name="Modifier" href="modifyData.html"/> <item name="Exporter" href="exportData.html"/> <item name="Supprimer" href="removeData.html"/> - </menu> + </item> <item name="Application embarquée" href="embedded.html"/> </menu>

1 0

r686 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/csv echobase-tools/src/test/echobase-2012-04-12/csv/association echobase-tools/src/test/echobase-2012-04-12/csv/baracouda echobase-tools/src/test/echobase-2012-04-12/csv/new echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData echobase-ui/src/main/java/fr/ifremer/echobase/ui/act
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 15:46:36 +0200 (Sat, 22 Sep 2012) New Revision: 686 Url: http://forge.codelutin.com/repositories/revision/echobase/686 Log: simplify import/export screen add doc entries add missing svn properties add missing headers Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml trunk/src/site/rst/exportData.rst trunk/src/site/rst/exportDb.rst trunk/src/site/rst/importData.rst trunk/src/site/rst/modifyData.rst trunk/src/site/rst/removeData.rst Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureFree-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureReferential-validation.xml trunk/src/site/rst/imports.rst trunk/src/site/rst/removeimports.rst Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_childs.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_data.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataAcquisition_dataProcessing.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataProcessing_cell.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_gearMetadataValue.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_operationMetadataValue.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_sample.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Sample_sampleData.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_dataAcquisition.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_operation.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transit_transect.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthAgeKey.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthWeightKey.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_postCell.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_transit.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Cell.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataAcquisition.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata2.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataProcessing.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data_backup.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/GearMetadataValue.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthAgeKey.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthWeightKey.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Operation.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/OperationMetadataValue.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Sample.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SampleData.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SpeciesCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transect.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transit.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Voyage.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AcousticInstrument.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AgeCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AreaOfOperation.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellMethod.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataMetadata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataQuality.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DepthStratum.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/EchotypeCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Gear.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/GearMetadata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Mission.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationEvent.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationMetadata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatum.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatumType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleDataType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SexCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SizeCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Species.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Strata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/TSParameters.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Vessel.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/VesselType.csv.gz trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.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/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp trunk/echobase-ui/src/main/webapp/images/menu2.jpg trunk/src/doc/reunions/reunion-2012-09-20.txt trunk/src/site/rst/importDb.rst trunk/src/site/rst/model.rst trunk/src/site/site_fr.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.csv; +/* + * #%L + * EchoBase :: Domain + * $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% + */ + import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_childs.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_data.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataAcquisition_dataProcessing.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataProcessing_cell.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_gearMetadataValue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_operationMetadataValue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_sample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Sample_sampleData.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_dataAcquisition.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_operation.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transit_transect.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthAgeKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthWeightKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_postCell.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_transit.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Cell.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataAcquisition.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata2.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataProcessing.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data_backup.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/GearMetadataValue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthAgeKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthWeightKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Operation.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/OperationMetadataValue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Sample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SampleData.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SpeciesCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transect.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transit.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Voyage.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AcousticInstrument.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AgeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AreaOfOperation.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellMethod.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataMetadata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataQuality.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DepthStratum.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/EchotypeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Gear.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/GearMetadata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Mission.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationEvent.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationMetadata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatum.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatumType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleDataType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SexCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SizeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Species.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Strata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/TSParameters.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Vessel.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/VesselType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2012-09-22 13:46:36 UTC (rev 686) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.ui.actions.exportDb; -import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.exportdb.ExportDbConfiguration; import fr.ifremer.echobase.services.exportdb.ExportDbMode; @@ -74,26 +73,6 @@ getModel().setFileName(fileName); } - @InputConfig(methodName = "input") - public String configureReferential() throws Exception { - return execute(); - } - - @InputConfig(methodName = "input") - public String configureReferentialAndData() throws Exception { - return execute(); - } - - @InputConfig(methodName = "input") - public String configureData() throws Exception { - return execute(); - } - - @InputConfig(methodName = "input") - public String configureAll() throws Exception { - return execute(); - } - @Override protected ExportDbConfiguration createModel() { ExportDbConfiguration result = new ExportDbConfiguration(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-09-22 13:46:36 UTC (rev 686) @@ -95,20 +95,10 @@ } @InputConfig(methodName = "input") - public String configureReferential() throws Exception { + public String configure() throws Exception { return execute(); } - @InputConfig(methodName = "input") - public String configureData() throws Exception { - return execute(); - } - - @InputConfig(methodName = "input") - public String configureFree() throws Exception { - return execute(); - } - public void setInputFileName(String fileName) { getModel().getInput().setFileName(fileName); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.removeData; +/* + * #%L + * EchoBase :: UI + * $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% + */ + import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.workingDb; +/* + * #%L + * EchoBase :: UI + * $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% + */ + import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.workingDb; +/* + * #%L + * EchoBase :: UI + * $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% + */ + import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.workingDb; +/* + * #%L + * EchoBase :: UI + * $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% + */ + import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.data.Voyage; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -31,13 +31,13 @@ <package name="exportDb" extends="loggued" namespace="/exportDb">  - <action name="configure" method="input" + <action name="configureInput" method="input" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> </action>  - <action name="configure*" method="configure{1}" + <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -31,13 +31,13 @@ <package name="importDb" extends="loggued" namespace="/importDb">  - <action name="configure" method="input" + <action name="configureInput" method="input" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> </action>  - <action name="configure*" method="configure{1}" + <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -1,35 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="input"> - <field-validator type="fieldexpression"> - <param name="expression">model.input.file != null</param> - <message key="echobase.error.importDb.input.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureFree-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureFree-validation.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureFree-validation.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -1,35 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="input"> - <field-validator type="fieldexpression"> - <param name="expression">model.input.file != null</param> - <message key="echobase.error.importDb.input.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureReferential-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureReferential-validation.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureReferential-validation.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -1,39 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="input"> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression">model.input.file != null</param> - <message key="echobase.error.importDb.input.required"/> - </field-validator> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression">model.input.fileName.endsWith(".echobase")</param> - <message key="echobase.error.importDb.input.extension.mismatch"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml (from rev 681, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,39 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="input"> + <field-validator type="fieldexpression"> + <param name="expression">model.input.file != null</param> + <message key="echobase.error.importDb.input.required"/> + </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression">model.input.fileName.endsWith(".echobase")</param> + <message key="echobase.error.importDb.input.extension.mismatch"/> + </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-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-22 13:46:36 UTC (rev 686) @@ -297,14 +297,12 @@ echobase.legend.dbeditor.show=Displaying '%s' echobase.legend.embeddedApplication.configuration=Portable database configuration echobase.legend.exportDb.configuration.files=Export configuration -echobase.legend.exportDb.configuration.selectExportDbMode=Select export db mode echobase.legend.exportDb.resume=Resume of database export echobase.legend.importData.configuration.selectImportType=Type of import selection echobase.legend.importData.configure=Import configuration echobase.legend.importData.createMission=Mission caracteristics echobase.legend.importData.result.resume=Results of data import echobase.legend.importDb.configuration=Configure import -echobase.legend.importDb.configuration.selectImportDbMode=Select import db mode echobase.legend.importDb.resume=Results of database import echobase.legend.libreOfficeQuery=Translate a SQL query from Libre Office echobase.legend.removeData.resume=Results of Import removal 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-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-22 13:46:36 UTC (rev 686) @@ -297,14 +297,12 @@ echobase.legend.dbeditor.show=Visualisation de '%s' echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export -echobase.legend.exportDb.configuration.selectExportDbMode=Choix du mode d'export echobase.legend.exportDb.resume=Résumé de l'export de base echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.createMission=Caractéristiques de la mission echobase.legend.importData.result.resume=Résultats de l'import de données echobase.legend.importDb.configuration=Configuration de l'import -echobase.legend.importDb.configuration.selectImportDbMode=Choix du mode d'import echobase.legend.importDb.resume=Résumé de l'import de base de données echobase.legend.libreOfficeQuery=Traduire une requête SQL issue de Libre Office echobase.legend.removeData.resume=Résumé de la suppression d'un import Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-22 13:46:36 UTC (rev 686) @@ -89,11 +89,11 @@ <s:if test="%{admin}"> <s:if test="%{workingDbSelected}"> <li> - <s:a action="configure" namespace="/importDb" cssClass="impBase"> + <s:a action="configureInput" namespace="/importDb" cssClass="impBase"> <span><s:text name="echobase.menu.importDb"/></s:a></span> </li> <li> - <s:a action="configure" namespace="/exportDb" cssClass="expBase"> + <s:a action="configureInput" namespace="/exportDb" cssClass="expBase"> <span><s:text name="echobase.menu.exportDb"/></s:a></span> </li> <li> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-22 13:46:36 UTC (rev 686) @@ -30,152 +30,58 @@ jQuery(document).ready(function () { + function reload(value) { + $('#extraInfos').hide(); + $('[class~="' + value + '"]').show(); + } + // to change form when mode is changed $('[name="model.exportDbMode"]').change(function (event) { - $('[class~="exportDbMode"]').hide(); - $('#' + this.value).show(); - $('#' + this.value + ' .errorMessage').hide(); + reload(this.value); }); - // show incoming mode var incomingVal = $('[name="model.exportDbMode"][checked="checked"]').val(); - $('#' + incomingVal).show(); + reload(incomingVal); }); </script> -<fieldset> - <legend> - <s:text name="echobase.legend.exportDb.configuration.selectExportDbMode"/> - </legend> - <s:radio id='mode' key='model.exportDbMode' list="modes" cssClass="cleanBoth" - label='%{getText("echobase.common.exportDbMode")}' - required="true" template="myradiomap"/> -</fieldset> - -<s:form id="REFERENTIAL" namespace="/exportDb" method="POST" - cssClass="hidden exportDbMode"> - +<s:form namespace="/exportDb" method="POST"> <fieldset> <legend> <s:text name="echobase.legend.exportDb.configuration.files"/> </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','export-referential')}" + <s:a href="%{getDocumentation('exportDb.html', null)}" target="doc"> <s:text name="echobase.action.show.exportDb.documentation"/> </s:a> </div> <br/> - <s:hidden key="model.exportDbMode" value="REFERENTIAL" label=''/> - <s:textfield key="model.fileName" required="true" size="100" - label="%{getText('echobase.label.exportDbFileName')} (*)"/> + <s:radio id='mode' key='model.exportDbMode' list="modes" + cssClass="cleanBoth" + label='%{getText("echobase.common.exportDbMode")}' + required="true" template="myradiomap"/> - <div class="cleanBoth"> - (*) <s:text name="echobase.info.exportDb.archive"/> - </div> - </fieldset> - <br/> - <s:submit action="configureReferential" - value='%{getText("echobase.action.export")}'/> - -</s:form> - - -<s:form id="REFERENTIAL_AND_DATA" namespace="/exportDb" method="POST" - cssClass="hidden exportDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.exportDb.configuration.files"/> - </legend> - - <div class="cleanBoth help"> - <s:a - href="%{getDocumentation('importDb.html','export-referential-and-data')}" - target="doc"> - <s:text name="echobase.action.show.exportDb.documentation"/> - </s:a> - </div> + <div class="cleanBoth"></div> <br/> - - <s:hidden key="model.exportDbMode" value="REFERENTIAL_AND_DATA" label=''/> <s:textfield key="model.fileName" required="true" size="100" label="%{getText('echobase.label.exportDbFileName')} (*)"/> - <s:checkboxlist list="voyages" key="model.voyageIds" - template="mycheckboxlist" - label="%{getText('echobase.label.voyageToSelect')}"/> - - <div class="cleanBoth"> - (*) <s:text name="echobase.info.exportDb.archive"/> - </div> - </fieldset> - <br/> - <s:submit action="configureReferentialAndData" - value='%{getText("echobase.action.export")}'/> - -</s:form> - - -<s:form id="DATA" namespace="/exportDb" method="POST" - cssClass="hidden exportDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.exportDb.configuration.files"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','export-data')}" - target="doc"> - <s:text name="echobase.action.show.exportDb.documentation"/> - </s:a> - </div> + <div class="cleanBoth"></div> <br/> - <s:hidden key="model.exportDbMode" value="DATA" label=''/> - <s:textfield key="model.fileName" required="true" size="100" - label="%{getText('echobase.label.exportDbFileName')} (*)"/> - <s:checkboxlist list="voyages" key="model.voyageIds" - template="mycheckboxlist" - label="%{getText('echobase.label.voyageToSelect')}"/> - - <div class="cleanBoth"> - (*) <s:text name="echobase.info.exportDb.archive"/> + <div id='extraInfos' class="DATA REFERENTIAL_AND_DATA"> + <s:checkboxlist list="voyages" key="model.voyageIds" id='voyages' + template="mycheckboxlist" + label="%{getText('echobase.label.voyageToSelect')}"/> </div> - </fieldset> - <br/> - <s:submit action="configureData" - value='%{getText("echobase.action.export")}'/> -</s:form> - -<s:form id="ALL" namespace="/exportDb" method="POST" - cssClass="hidden exportDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.exportDb.configuration.files"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','export-all')}" - target="doc"> - <s:text name="echobase.action.show.exportDb.documentation"/> - </s:a> - </div> - <br/> - - <s:hidden key="model.exportDbMode" value="ALL" label=''/> - <s:textfield key="model.fileName" required="true" size="100" - label="%{getText('echobase.label.exportDbFileName')} (*)"/> - <div class="cleanBoth"> + <br/> (*) <s:text name="echobase.info.exportDb.archive"/> </div> </fieldset> <br/> - <s:submit action="configureAll" value='%{getText("echobase.action.export")}'/> - -</s:form> \ No newline at end of file + <s:submit action="configure" value='%{getText("echobase.action.export")}'/> +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-22 13:46:36 UTC (rev 686) @@ -28,98 +28,29 @@ <script type="text/javascript"> - jQuery(document).ready(function () { - - // to change form when mode is changed - $('[name="model.importDbMode"]').change(function (event) { - $('[class~="importDbMode"]').hide(); - $('#' + this.value).show(); - $('#' + this.value + ' .errorMessage').hide(); - }); - - // show incoming mode - var incomingVal = $('[name="model.importDbMode"][checked="checked"]').val(); - $('#' + incomingVal).show(); - }); </script> -<fieldset> - <legend> - <s:text name="echobase.legend.importDb.configuration.selectImportDbMode"/> - </legend> - <s:radio id='mode' key='model.importDbMode' list="modes" cssClass="cleanBoth" - label='%{getText("echobase.common.importDbMode")}' - required="true" template="myradiomap"/> -</fieldset> -<s:form id="REFERENTIAL" namespace="/importDb" method="POST" - enctype="multipart/form-data" cssClass="hidden importDbMode"> - +<s:form namespace="/importDb" method="POST" enctype="multipart/form-data"> <fieldset> <legend> <s:text name="echobase.legend.importDb.configuration"/> </legend> - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','import-referential')}" + <s:a href="%{getDocumentation('importDb.html',null)}" target="doc"> <s:text name="echobase.action.show.importDb.documentation"/> </s:a> </div> <br/> - <s:hidden key="model.importDbMode" value="REFERENTIAL" label=''/> - <s:file name="input" required="true" key="echobase.common.importDbFile"/> - - </fieldset> - <br/> - <s:submit action="configureReferential" - value='%{getText("echobase.action.import")}'/> -</s:form> - -<s:form id="DATA" namespace="/importDb" method="POST" - enctype="multipart/form-data" cssClass="hidden importDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.importDb.configuration"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','data')}" - target="doc"> - <s:text name="echobase.action.show.importDb.documentation"/> - </s:a> - </div> + <s:radio id='mode' key='model.importDbMode' list="modes" cssClass="cleanBoth" + label='%{getText("echobase.common.importDbMode")}' + required="true" template="myradiomap"/> + <div class="cleanBoth"></div> <br/> - <s:hidden key="model.importDbMode" value="DATA" label=''/> <s:file name="input" required="true" key="echobase.common.importDbFile"/> </fieldset> <br/> - <s:submit action="configureData" - value='%{getText("echobase.action.import")}'/> + <s:submit action="configure" value='%{getText("echobase.action.import")}'/> </s:form> - -<s:form id="FREE" namespace="/importDb" method="POST" - enctype="multipart/form-data" cssClass="hidden importDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.importDb.configuration"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','free')}" - target="doc"> - <s:text name="echobase.action.show.importDb.documentation"/> - </s:a> - </div> - <br/> - <s:hidden key="model.importDbMode" value="FREE" label=''/> - <s:file name="input" required="true" key="echobase.common.importDbFile"/> - - </fieldset> - <br/> - <s:submit action="configureFree" - value='%{getText("echobase.action.import")}'/> -</s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-22 13:46:36 UTC (rev 686) @@ -2,7 +2,7 @@ #%L EchoBase :: UI $Id$ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/weba… $ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/echobase-ui/src/main/webapp/images/menu2.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/doc/reunions/reunion-2012-09-20.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Added: trunk/src/site/rst/exportData.rst =================================================================== --- trunk/src/site/rst/exportData.rst (rev 0) +++ trunk/src/site/rst/exportData.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,41 @@ +.. - +.. * #%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% +.. - + +==================== +Exporter des données +==================== + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +======== + +Ce document explique comment exporter les données depuis EchoBase. + +TODO Property changes on: trunk/src/site/rst/exportData.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/src/site/rst/exportDb.rst (from rev 681, trunk/src/site/rst/importDb.rst) =================================================================== --- trunk/src/site/rst/exportDb.rst (rev 0) +++ trunk/src/site/rst/exportDb.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,93 @@ +.. - +.. * #%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% +.. - + +================= +Export d'une base +================= + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +-------- + +EchoBase permet d'export une partie ou l'ensemble d'une base de travail au +format *.echobase* qui est ensuite réimportable dans une autre instance d'EchoBase. + +- Cliquer sur le menu *Exporter une base*. + +- Configurer l'export + +Une fichier au format *.echobase* sera créé, il est ensuite possible de +l'importer sur une autre instance d'EchoBase. + +Il existe plusieurs modes d'export que nous détaillons ci-dessous. + +Export referential +~~~~~~~~~~~~~~~~~~ + +Dans ce mode on exporte uniquement le référentiel de la base de travail. + +Il vous suffit de renseigner le nom du fichier d'export (l'extension +*.echobase*) sera automatiquement rajoutée, puis de cliquer sur *Exporter*. + +Une fois l'export réalisé, le fichier sera téléchargeable. + +Export referential and data +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Dans ce mode on exporte le référentiel et les données sélectionnées +de la base de travail. + +Il vous suffit de renseigner le nom du fichier d'export (l'extension +*.echobase*) sera automatiquement rajoutée, de sélectionner les données +à exporter puis de cliquer sur *Exporter*. + +Une fois l'export réalisé, le fichier sera téléchargeable. + + +Export data +~~~~~~~~~~~ + +Dans ce mode on exporte uniquement les données sélectionnées de la base de +travail. + +Il vous suffit de renseigner le nom du fichier d'export (l'extension +*.echobase*) sera automatiquement rajoutée, de sélectionner les données +à exporter puis de cliquer sur *Exporter*. + +Une fois l'export réalisé, le fichier sera téléchargeable. + +Export All +~~~~~~~~~~ + +Dans ce mode, on exporte toute la base de travail. + +Il vous suffit de renseigner le nom du fichier d'export (l'extension +*.echobase*) sera automatiquement rajoutée, puis de cliquer sur *Exporter*. + +Une fois l'export réalisé, le fichier sera téléchargeable. Copied: trunk/src/site/rst/importData.rst (from rev 681, trunk/src/site/rst/imports.rst) =================================================================== --- trunk/src/site/rst/importData.rst (rev 0) +++ trunk/src/site/rst/importData.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,694 @@ +.. - +.. * #%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% +.. - + +================================= +Importerdes données dans EchoBase +================================= + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +======== + +Ce document donne la définition de tous les imports de données. + +Format des colonnes +~~~~~~~~~~~~~~~~~~~ + +- FK(XXX#yyy) désigne une clef étrangère requise (XXX sur la propriété yyy). +- (int) un entier (pas du nullité possible) +- (float) un décimal (pas de nullité possible) +- (Integer) un entier avec nullité possible +- (Integer-NA) un entier avec nullité possible (et nullité si NA) +- Float un décimale avec nullité possible +- (Float-NA) un décimale avec nullité possible (et nullité si NA) +- (date) unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* +- (esdu cell) nom de cellule esdu - elementary : esduName[_elementaryCellName] + avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS + +Note importantes +~~~~~~~~~~~~~~~~ + +- Le nom des colonnes est sensible à la casse, il faut donc bien respecter les + noms donnés dans cette page. + +- Le contenu des cellules (et aussi les nom de colonnes) peuvent être encapsulés + par des **"**. + + +Voyage / Transit / Transect +=========================== + +Voyage +~~~~~~ + +Colonnes requises +----------------- + +:: + + name;startDate;endDate;startPort;endPort + +Format des colonnes +------------------- + +- name +- startDate (date) +- endDate (date) +- startPort +- endPort + +Exemple +------- + +:: + + name;startDate;endDate;startPort;endPort + PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;Santander;Concarneau + +Transit +~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;description;startTime;endTime;startLocality;endLocality + +Format des colonnes +------------------- + +- voyage FK(voyage#name) +- description +- startTime (date) +- endTime (date) +- startLocality +- endLocality + +Exemple +------- + +:: + + voyage;description;startTime;endTime;startLocality;endLocality + PELGAS2011;PELGAS11CAMP1;2011-04-26 08:00:01.0000;2011-05-08 20:00:00.0000;Santander;La Rochelle + +Transect +~~~~~~~~ + +Colonnes requises +----------------- + +:: + + title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring + +Format des colonnes +------------------- + +- voyage FK(voyage#name) +- vesselName FK(Vessel#name) +- title +- transectAbstract +- stratum +- comment +- dateCreated (date) +- timeCoverageStart (date) +- timeCoverageEnd (date) +- geospatialLonMin (float) +- geospatialLonMax (float) +- geospatialLatMin (float) +- geospatialLatMax (float) +- geospatialVerticalMin (float) +- geospatialVerticalMax (float) +- linestring + +Exemple +------- + +:: + + title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring + Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000";-1.5896666667;43.7055;110;-1.541;43.7606666667;110;"-176453.0000037 4851310.5,-171051 4857434.0000037 + +Operation / OperationMetadataValue / GearMetadataValue +====================================================== + +Operation +~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode + +Format des colonnes +------------------- + +- vesselName FK(Vessel#name) +- gearCode FK(Gear#casinoGearName) +- depthStratumId FK(DepthStratum#id) +- operationId +- midHaulLatitude (float) +- midHaulLongitude (float) +- gearShootingStartTime (date) +- gearShootingEndTime (date) +- gearShootingStartLatitude (float) +- gearShootingEndLatitude (float) +- gearShootingStartLongitude (float) +- gearShootingEndLongitude (float) + +Exemple +------- + +:: + + vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode + THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000";45.4165605;-1.4492292;45.4029733;-1.4860902;"2011-05-05 07:42:19.0000";45.4301477;-1.4123682;"57x52 + +OperationMetadataValue +~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + vesselName;operationId;metadataType;operationMetadataValue + +Format des colonnes +------------------- + +- vesselName FK(Vessel#name) +- operationId FK(Operation#id) +- metadataType FK(OperationMetadata#name) +- operationMetadataValue + +Exemple +------- + +:: + + vesselName;operationId;metadataType;operationMetadataValue + THALASSA II;P0422;MeanWaterDepth";43.42 + +GearMetadataValue +~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + vesselName;operationId;gearCode;metadataType;gearMetadataValue + +Format des colonnes +------------------- + +- vesselName FK(Vessel#name) +- operationId FK(Operation#id) +- metadataType FK(GearMetadata#name) +- gearCode FK(Gear#casinoGearName) +- gearMetadataValue + +Exemple +------- + +:: + + vesselName;operationId;gearCode;metadataType;gearMetadataValue + THALASSA II;P0422;57x52;CableLength";31.6666666666667 + +TotalSample / SubSample / BiometrySample +======================================== + +TotalSample +~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight + +Format des colonnes +------------------- + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory FK(SizeCategory#name) +- sampleWeight (float) +- numberSampled (Integer-NA) +- meanLength (Float-NA) +- meanWeight (Float-NA) +- noPerKg (Float-NA) +- sortedWeight (float) + +Exemple +------- + +:: + + operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight + P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03 + +SubSample +~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round + +Format des colonnes +------------------- + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory FK(SizeCategory#name) +- sexCategory FK(SexCategory#name) +- sampleWeight (float) +- numberSampled (int) +- numberAtLength (float) +- weightAtLength (Float-NA) +- lengthClass + +(colonnes ignorées) subHaul units round + +Exemple +------- + +:: + + operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round + P0372;ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 + +BiometrySample +~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;numFish;dataLabel;dataValue;name + +Format des colonnes +------------------- + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- numFish (int) +- name FK(SampleDataType#name) +- dataLabel +- dataValue (Float-NA) + +Exemple +------- + +:: + + operationId;baracoudaCode;numFish;dataLabel;dataValue;name + P5002;ENGR-ENC";9394;NA;-1;"Age + +Acoustic +~~~~~~~~ + +Colonnes requises +----------------- + +:: + + MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality + +Format des colonnes +------------------- + +A faire... + +Exemple +------- + +:: + + MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality + 2011/06/23 10:09:00.0000";NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;"2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000";43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;"variable";1 + +Résultats voyage +================ + +Echotype +~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;echotypeName;depthStratumId;meaning;baracoudaCode + +Format des colonnes +------------------- + +- echotypeName +- meaning +- voyage FK(Voyage#name) +- depthStratumId FK(DepthStratum#id) +- baracoudaCode FK(Species#baracoudaCode) + +Exemple +------- + +:: + + voyage;echotypeName;depthStratumId;meaning;baracoudaCode + PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM + +LengthWeightKey +~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata + +Format des colonnes +------------------- + +- aParameter (float) +- bParameter (float) +- voyage FK(Voyage#name) +- sizeCategory FK(SizeCategory#name) +- baracoudaCode FK(Species#baracoudaCode) +- strata FK(Strata#name) + +Exemple +------- + +:: + + voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata + PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne + +LengthAgeKey +~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;baracoudaCode;age;length;percentAtAge;metadata;strata + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- age (int) +- length (float) +- percentAtAge (float) +- metadata +- strata FK(Strata#name) +- baracoudaCode FK(Species#baracoudaCode) + +Exemple +------- + +:: + + voyage;baracoudaCode;age;length;percentAtAge;metadata;strata + PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne + +Résultats Esdu +============== + +Esdu / Echotype +~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(esdu cell) +- echotype FK(Echotype#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1 + +Esdu / Echotype / Species Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(esdu cell) +- echotype FK(Echotype#name) +- sizeCategory FK(SizeCategory#name) +- baracoudaCode FK(Species#baracoudaCode) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality + PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0";4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + +Esdu / Species / Age Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(esdu cell) +- baracoudaCode FK(Species#baracoudaCode) +- ageCategory +- ageCategoryMeaning +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage + 2011-04-26 13:35:19.0000;ENGR-ENC";3;3377.00492644042;"fish age-group (years)";1;"PELGAS2011 + +Esdu / Species / Size Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(esdu cell) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory +- sizeCategoryMeaning +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + 2011-04-26 13:35:19.0000;MICR-POU";4;5190.7652880528;1297691.3220132;"mid point of 1 cm size bin";1;"PELGAS2011 + +Region +====== + +Region +~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;cellType;regionEnvCoordinates;surface;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- cellType FK(CellType) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- name +- regionEnvCoordinates +- surface (float) + +Exemple +------- + +:: + + voyage;name;cellType;regionEnvCoordinates;surface;dataQuality + PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1 + +Region Association +~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;regionName;esduName + +Format des colonnes +------------------- + +- voyage FK(Voyage) +- regionName FK(Cell#name) +- esduName FK(Cell#name) + +Exemple +------- + +:: + + voyage;regionName;esduName + PELGAS2011";1;"2011-05-02 09:36:54.0000 + +Region results +~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(Cell#name) +- baracoudaCode FK(Species#baracoudaCode) +- echotype FK(Echotype#name) +- sizeCategory FK(SizeCategory#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality + PELGAS2011;6;CLUP-HAR;0;D2";NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 + +Map +=== + +Map +~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory FK(SizeCategory#name) +- ageCategory FK(AgeCategory#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- gridCellLongitude (float) +- gridCellLatitude (float) +- gridCellDepth (float) +- gridLongitudeLag (float) +- gridLatitudeLag (float) +- gridDepthLag (float) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality + PELGAS2011;-6 43.5 0;ENGR-ENC";0;;-6;43.5;0;0.25;0.25;0;0;1 Property changes on: trunk/src/site/rst/importData.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/rst/importDb.rst =================================================================== --- trunk/src/site/rst/importDb.rst 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/rst/importDb.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -21,9 +21,9 @@ .. * #L% .. - -========================== -Import / Export d'une base -========================== +================= +Import d'une base +================= .. contents:: Table des matières :depth: 2 @@ -35,76 +35,8 @@ Abstract -------- -Ce document explique comment importer / exporter des bases au format EchoBase. +Ce document explique comment importer des bases au format EchoBase. -Export EchoBase ---------------- - -EchoBase permet d'export une partie ou l'ensemble d'une base de travial au -format *.echobase* qui est ensuite réimportable dans une autre instance d'EchoBase. - -- Cliquer sur le menu *Exporter une base*. - -- Configurer l'export - -Une fichier au format *.echobase* sera créé, il est ensuite possible de -l'importer sur une autre instance d'EchoBase. - -Il existe plusieurs modes d'export que nous détaillons ci-dessous. - -Export referential -~~~~~~~~~~~~~~~~~~ - -Dans ce mode on exporte uniquement le référentiel de la base de travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - -Export referential and data -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Dans ce mode on exporte le référentiel et les données sélectionnées -de la base de travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, de sélectionner les données -à exporter puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - - -Export data -~~~~~~~~~~~ - -Dans ce mode on exporte uniquement les données sélectionnées de la base de -travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, de sélectionner les données -à exporter puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - -Export All -~~~~~~~~~~ - -Dans ce mode, on exporte toute la base de travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - -Import EchoBase ---------------- - -Tout export de base au format *.echobase* est ensuite réimportable sur n'importe -qu'elle autre instance d'EchoBase. - -TODO Expliquer le fonctionnement de l'import et la politique des collisions... - Import Referential ~~~~~~~~~~~~~~~~~~ Deleted: trunk/src/site/rst/imports.rst =================================================================== --- trunk/src/site/rst/imports.rst 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/rst/imports.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -1,694 +0,0 @@ -.. - -.. * #%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% -.. - - -======================================= -Liste des colonnes des imports EchoBase -======================================= - -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - -Abstract -======== - -Ce document donne la définition de tous les imports. - -Format des colonnes -~~~~~~~~~~~~~~~~~~~ - -- FK(XXX#yyy) désigne une clef étrangère requise (XXX sur la propriété yyy). -- (int) un entier (pas du nullité possible) -- (float) un décimal (pas de nullité possible) -- (Integer) un entier avec nullité possible -- (Integer-NA) un entier avec nullité possible (et nullité si NA) -- Float un décimale avec nullité possible -- (Float-NA) un décimale avec nullité possible (et nullité si NA) -- (date) unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* -- (esdu cell) nom de cellule esdu - elementary : esduName[_elementaryCellName] - avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS - -Note importantes -~~~~~~~~~~~~~~~~ - -- Le nom des colonnes est sensible à la casse, il faut donc bien respecter les - noms donnés dans cette page. - -- Le contenu des cellules (et aussi les nom de colonnes) peuvent être encapsulés - par des **"**. - - -Voyage / Transit / Transect -=========================== - -Voyage -~~~~~~ - -Colonnes requises ------------------ - -:: - - name;startDate;endDate;startPort;endPort - -Format des colonnes -------------------- - -- name -- startDate (date) -- endDate (date) -- startPort -- endPort - -Exemple -------- - -:: - - name;startDate;endDate;startPort;endPort - PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;Santander;Concarneau - -Transit -~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;description;startTime;endTime;startLocality;endLocality - -Format des colonnes -------------------- - -- voyage FK(voyage#name) -- description -- startTime (date) -- endTime (date) -- startLocality -- endLocality - -Exemple -------- - -:: - - voyage;description;startTime;endTime;startLocality;endLocality - PELGAS2011;PELGAS11CAMP1;2011-04-26 08:00:01.0000;2011-05-08 20:00:00.0000;Santander;La Rochelle - -Transect -~~~~~~~~ - -Colonnes requises ------------------ - -:: - - title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring - -Format des colonnes -------------------- - -- voyage FK(voyage#name) -- vesselName FK(Vessel#name) -- title -- transectAbstract -- stratum -- comment -- dateCreated (date) -- timeCoverageStart (date) -- timeCoverageEnd (date) -- geospatialLonMin (float) -- geospatialLonMax (float) -- geospatialLatMin (float) -- geospatialLatMax (float) -- geospatialVerticalMin (float) -- geospatialVerticalMax (float) -- linestring - -Exemple -------- - -:: - - title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring - Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000";-1.5896666667;43.7055;110;-1.541;43.7606666667;110;"-176453.0000037 4851310.5,-171051 4857434.0000037 - -Operation / OperationMetadataValue / GearMetadataValue -====================================================== - -Operation -~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode - -Format des colonnes -------------------- - -- vesselName FK(Vessel#name) -- gearCode FK(Gear#casinoGearName) -- depthStratumId FK(DepthStratum#id) -- operationId -- midHaulLatitude (float) -- midHaulLongitude (float) -- gearShootingStartTime (date) -- gearShootingEndTime (date) -- gearShootingStartLatitude (float) -- gearShootingEndLatitude (float) -- gearShootingStartLongitude (float) -- gearShootingEndLongitude (float) - -Exemple -------- - -:: - - vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode - THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000";45.4165605;-1.4492292;45.4029733;-1.4860902;"2011-05-05 07:42:19.0000";45.4301477;-1.4123682;"57x52 - -OperationMetadataValue -~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - vesselName;operationId;metadataType;operationMetadataValue - -Format des colonnes -------------------- - -- vesselName FK(Vessel#name) -- operationId FK(Operation#id) -- metadataType FK(OperationMetadata#name) -- operationMetadataValue - -Exemple -------- - -:: - - vesselName;operationId;metadataType;operationMetadataValue - THALASSA II;P0422;MeanWaterDepth";43.42 - -GearMetadataValue -~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - vesselName;operationId;gearCode;metadataType;gearMetadataValue - -Format des colonnes -------------------- - -- vesselName FK(Vessel#name) -- operationId FK(Operation#id) -- metadataType FK(GearMetadata#name) -- gearCode FK(Gear#casinoGearName) -- gearMetadataValue - -Exemple -------- - -:: - - vesselName;operationId;gearCode;metadataType;gearMetadataValue - THALASSA II;P0422;57x52;CableLength";31.6666666666667 - -TotalSample / SubSample / BiometrySample -======================================== - -TotalSample -~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight - -Format des colonnes -------------------- - -- operationId FK(Operation#id) -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory FK(SizeCategory#name) -- sampleWeight (float) -- numberSampled (Integer-NA) -- meanLength (Float-NA) -- meanWeight (Float-NA) -- noPerKg (Float-NA) -- sortedWeight (float) - -Exemple -------- - -:: - - operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight - P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03 - -SubSample -~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round - -Format des colonnes -------------------- - -- operationId FK(Operation#id) -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory FK(SizeCategory#name) -- sexCategory FK(SexCategory#name) -- sampleWeight (float) -- numberSampled (int) -- numberAtLength (float) -- weightAtLength (Float-NA) -- lengthClass - -(colonnes ignorées) subHaul units round - -Exemple -------- - -:: - - operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round - P0372;ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 - -BiometrySample -~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - operationId;baracoudaCode;numFish;dataLabel;dataValue;name - -Format des colonnes -------------------- - -- operationId FK(Operation#id) -- baracoudaCode FK(Species#baracoudaCode) -- numFish (int) -- name FK(SampleDataType#name) -- dataLabel -- dataValue (Float-NA) - -Exemple -------- - -:: - - operationId;baracoudaCode;numFish;dataLabel;dataValue;name - P5002;ENGR-ENC";9394;NA;-1;"Age - -Acoustic -~~~~~~~~ - -Colonnes requises ------------------ - -:: - - MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality - -Format des colonnes -------------------- - -A faire... - -Exemple -------- - -:: - - MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality - 2011/06/23 10:09:00.0000";NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;"2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000";43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;"variable";1 - -Résultats voyage -================ - -Echotype -~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;echotypeName;depthStratumId;meaning;baracoudaCode - -Format des colonnes -------------------- - -- echotypeName -- meaning -- voyage FK(Voyage#name) -- depthStratumId FK(DepthStratum#id) -- baracoudaCode FK(Species#baracoudaCode) - -Exemple -------- - -:: - - voyage;echotypeName;depthStratumId;meaning;baracoudaCode - PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM - -LengthWeightKey -~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata - -Format des colonnes -------------------- - -- aParameter (float) -- bParameter (float) -- voyage FK(Voyage#name) -- sizeCategory FK(SizeCategory#name) -- baracoudaCode FK(Species#baracoudaCode) -- strata FK(Strata#name) - -Exemple -------- - -:: - - voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata - PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne - -LengthAgeKey -~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;baracoudaCode;age;length;percentAtAge;metadata;strata - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- age (int) -- length (float) -- percentAtAge (float) -- metadata -- strata FK(Strata#name) -- baracoudaCode FK(Species#baracoudaCode) - -Exemple -------- - -:: - - voyage;baracoudaCode;age;length;percentAtAge;metadata;strata - PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne - -Résultats Esdu -============== - -Esdu / Echotype -~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1 - -Esdu / Echotype / Species Category -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- sizeCategory FK(SizeCategory#name) -- baracoudaCode FK(Species#baracoudaCode) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0";4;0;20;0.05;0;0.00100292822891053;0;0;0;1 - -Esdu / Species / Age Category -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(esdu cell) -- baracoudaCode FK(Species#baracoudaCode) -- ageCategory -- ageCategoryMeaning -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;ENGR-ENC";3;3377.00492644042;"fish age-group (years)";1;"PELGAS2011 - -Esdu / Species / Size Category -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(esdu cell) -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory -- sizeCategoryMeaning -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;MICR-POU";4;5190.7652880528;1297691.3220132;"mid point of 1 cm size bin";1;"PELGAS2011 - -Region -====== - -Region -~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;cellType;regionEnvCoordinates;surface;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- cellType FK(CellType) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- name -- regionEnvCoordinates -- surface (float) - -Exemple -------- - -:: - - voyage;name;cellType;regionEnvCoordinates;surface;dataQuality - PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1 - -Region Association -~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;regionName;esduName - -Format des colonnes -------------------- - -- voyage FK(Voyage) -- regionName FK(Cell#name) -- esduName FK(Cell#name) - -Exemple -------- - -:: - - voyage;regionName;esduName - PELGAS2011";1;"2011-05-02 09:36:54.0000 - -Region results -~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(Cell#name) -- baracoudaCode FK(Species#baracoudaCode) -- echotype FK(Echotype#name) -- sizeCategory FK(SizeCategory#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality - PELGAS2011;6;CLUP-HAR;0;D2";NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 - -Map -=== - -Map -~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory FK(SizeCategory#name) -- ageCategory FK(AgeCategory#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- gridCellLongitude (float) -- gridCellLatitude (float) -- gridCellDepth (float) -- gridLongitudeLag (float) -- gridLatitudeLag (float) -- gridDepthLag (float) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality - PELGAS2011;-6 43.5 0;ENGR-ENC";0;;-6;43.5;0;0.25;0.25;0;0;1 Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/rst/model.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -38,8 +38,13 @@ On donne ici des explications sur le modèle. -Le modèle conçu sous argoUML est téléchargeable `ici`_ . +Téléchargement +============== +- `Télécharger le modèle au format argoUML`_. + +- `Télécharger le modèle au format freeMind`_. + Modèle du référentiel ===================== @@ -74,7 +79,8 @@ - `Sous modèle pêcherie`_ -.. _ici: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-entities/src/mai… +.. _Télécharger le modèle au format argoUML: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-entities/src/mai… +.. _Télécharger le modèle au format freeMind: http://svn.forge.codelutin.com/svn/echobase/trunk/src/doc/model/EchoBase_st… .. _Vue générale du référentiel: model/referenceAll.png .. _Référentiel AcousticInstrument: model/referenceAcousticInstrument.png Added: trunk/src/site/rst/modifyData.rst =================================================================== --- trunk/src/site/rst/modifyData.rst (rev 0) +++ trunk/src/site/rst/modifyData.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,41 @@ +.. - +.. * #%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% +.. - + +==================== +modifier des données +==================== + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +======== + +Ce document explique comment modifier les données depuis EchoBase. + +TODO Property changes on: trunk/src/site/rst/modifyData.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/src/site/rst/removeData.rst (from rev 681, trunk/src/site/rst/removeimports.rst) =================================================================== --- trunk/src/site/rst/removeData.rst (rev 0) +++ trunk/src/site/rst/removeData.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,237 @@ +.. - +.. * #%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 de la suppression d'un import. + +Import Voyage complêt +--------------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Le voyage en question et tout ce qui y est rattaché (Transit,...) et aussi : + +- category (utilise EchoType) +- echotype + +Question: + Les echotypes sont-ils uniquement lié au voyage ? Si oui on peut utiliser + une composition qui évitent de devoir supprimer à la main les echotypes. + +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 Voyage / Transit / Transect +---------------------------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Le voyage en question et tout ce qui y est rattaché (Transit,...) et aussi : + +- category (utilise EchoType) +- echotype + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +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 à supprimer +~~~~~~~~~~~~~~~~~~~ + +Le transect en question et tout ce qui y est rattaché, ainsi que les *postCell* +et leur résultats. + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +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 (**) + +(*) tous ceux sur la branche du transect +(**) tous ceux du voyage + +Import Operation +---------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les opérations de pêche et tout ce qui y est rattaché (OperationMetadata et +GearMetadata et Sample). + +Imports à retirer +~~~~~~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Catches (*) + +(*) tous ceux sur la branche des opérations + +Import Catches +-------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les échantillons captures (Sample) en question et tout ce qui y est rattaché +(SampleData). + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Acoustic +--------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les données acoustiques et tout ce qui y est rattaché (DataAcquisition, Cell, Result), +ainsi que les *postCell* et leur résultats. + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +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 (*) + +(*) tous ceux du voyage + +Import Résultats voyage +----------------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +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). + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +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 (*) + +(*) tous ceux du voyage + +Immort Résultats Esdu +--------------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les résultats attachés aux cellules de type *ESDU*. + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Region +------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les postCells de type *Region* et tout ce qui y est rattaché (Result) + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Map +---------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les postCells de type *Map* et tout ce qui y est rattaché (Result) + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. \ No newline at end of file Property changes on: trunk/src/site/rst/removeData.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/src/site/rst/removeimports.rst =================================================================== --- trunk/src/site/rst/removeimports.rst 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/rst/removeimports.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -1,237 +0,0 @@ -.. - -.. * #%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 de la suppression d'un import. - -Import Voyage complêt ---------------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Le voyage en question et tout ce qui y est rattaché (Transit,...) et aussi : - -- category (utilise EchoType) -- echotype - -Question: - Les echotypes sont-ils uniquement lié au voyage ? Si oui on peut utiliser - une composition qui évitent de devoir supprimer à la main les echotypes. - -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 Voyage / Transit / Transect ----------------------------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Le voyage en question et tout ce qui y est rattaché (Transit,...) et aussi : - -- category (utilise EchoType) -- echotype - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -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 à supprimer -~~~~~~~~~~~~~~~~~~~ - -Le transect en question et tout ce qui y est rattaché, ainsi que les *postCell* -et leur résultats. - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -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 (**) - -(*) tous ceux sur la branche du transect -(**) tous ceux du voyage - -Import Operation ----------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les opérations de pêche et tout ce qui y est rattaché (OperationMetadata et -GearMetadata et Sample). - -Imports à retirer -~~~~~~~~~~~~~~~~~~~ - -Seront supprimés de la table des imports les imports suivants qui aurait pu -être effectué suite à cet import, à savoir : - -- import Catches (*) - -(*) tous ceux sur la branche des opérations - -Import Catches --------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les échantillons captures (Sample) en question et tout ce qui y est rattaché -(SampleData). - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Aucun sous import possible à retirer. - -Import Acoustic ---------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les données acoustiques et tout ce qui y est rattaché (DataAcquisition, Cell, Result), -ainsi que les *postCell* et leur résultats. - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -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 (*) - -(*) tous ceux du voyage - -Import Résultats voyage ------------------------ - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -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). - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -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 (*) - -(*) tous ceux du voyage - -Immort Résultats Esdu ---------------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les résultats attachés aux cellules de type *ESDU*. - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Aucun sous import possible à retirer. - -Import Region -------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les postCells de type *Region* et tout ce qui y est rattaché (Result) - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Aucun sous import possible à retirer. - -Import Map ----------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les postCells de type *Map* et tout ce qui y est rattaché (Result) - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Aucun sous import possible à retirer. \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/site_fr.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -48,7 +48,7 @@ </bannerLeft> <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right" /> + <version position="right"/> <poweredBy> <logo href="http://maven.apache.org" name="Maven" @@ -98,15 +98,29 @@ <item name="English Version" href="./en/index.html"/> </menu> + <menu name="Administration"> + <item name="Téléchargement" + href="http://forge.codelutin.com/projects/echobase/files"/> + <item name="Installation" href="install.html"/> + </menu> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item name="Installation" href="install.html"/> + <item name="Utilisation" href="usage.html"/> + + <menu name="Import/Export Base"> + <item name="Importer" href="importDb.html"/> + <item name="Exporter" href="exportDb.html"/> + </menu> + + <menu name="Gestion données"> + <item name="Importer" href="importData.html"/> + <item name="Modifier" href="modifyData.html"/> + <item name="Exporter" href="exportData.html"/> + <item name="Supprimer" href="removeData.html"/> + </menu> + <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> <menu name="Dev"> @@ -116,8 +130,6 @@ <item name="Historique des versions" href="changes-report.html"/> </menu> - - <menu ref="reports"/> <footer>

1 0

r685 - in trunk/echobase-services/src/main/java/fr/ifremer/echobase/services: importdata removedata
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 14:28:11 +0200 (Sat, 22 Sep 2012) New Revision: 685 Url: http://forge.codelutin.com/repositories/revision/echobase/685 Log: improve remove import logs Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 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-09-22 12:27:48 UTC (rev 684) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-22 12:28:11 UTC (rev 685) @@ -190,15 +190,8 @@ String importType = getImportLabel(configuration); - StringBuilder buffer = new StringBuilder(); + String result = importLog.getImportText(); - buffer.append(importType); - buffer.append('\n').append(importLog.getImportText()); - - String result = buffer.toString(); - - importLog.setImportText(result); - create(getDAO(EntityModificationLog.class), EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import", EntityModificationLog.PROPERTY_ENTITY_ID, importType, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2012-09-22 12:27:48 UTC (rev 684) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2012-09-22 12:28:11 UTC (rev 685) @@ -280,7 +280,7 @@ } create(getDAO(EntityModificationLog.class), EntityModificationLog.PROPERTY_ENTITY_TYPE, "Removed Import", - EntityModificationLog.PROPERTY_ENTITY_ID, decorator.toString(importLog), + EntityModificationLog.PROPERTY_ENTITY_ID, importLog.getTopiaId(), EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), EntityModificationLog.PROPERTY_MODIFICATION_TEXT, result

1 0

r684 - in trunk/echobase-ui/src/main/webapp: WEB-INF/jsp/removeData WEB-INF/jsp/workingDb css images
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 14:27:48 +0200 (Sat, 22 Sep 2012) New Revision: 684 Url: http://forge.codelutin.com/repositories/revision/echobase/684 Log: - add icon for remove imports - do not display import to delete Added: trunk/echobase-ui/src/main/webapp/images/menu2.jpg Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp 2012-09-22 11:20:01 UTC (rev 683) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp 2012-09-22 12:27:48 UTC (rev 684) @@ -29,7 +29,7 @@ <fieldset> <legend> - <s:text name="echobase.confirm.delete.selected.importData"/> + <s:text name="echobase.confirm.delete.selected.importData"/> </legend> <ul class=""> @@ -40,21 +40,22 @@ </s:iterator> </ul> - <s:form namespace="/removeData"> - - <s:iterator value="model.importLogIds" var="id"> - <s:hidden name="model.importLogIds" value="%{#id}"/> - </s:iterator> - <br/> - <ul class="toolbar floatRight"> - <li> + <br/> + <ul class="toolbar floatRight"> + <li> + <s:form namespace="/removeData"> <s:submit action="importLogs" theme="simple" key="echobase.action.cancel"/> - </li> - <li> + </s:form> + </li> + <li> + <s:form namespace="/removeData"> + <s:iterator value="model.importLogIds" var="id"> + <s:hidden name="model.importLogIds" value="%{#id}"/> + </s:iterator> <s:submit action="confirmDelete" theme="simple" key="echobase.action.delete"/> - </li> - </ul> - </s:form> + </s:form> + </li> + </ul> </fieldset> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp 2012-09-22 11:20:01 UTC (rev 683) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp 2012-09-22 12:27:48 UTC (rev 684) @@ -35,47 +35,12 @@ return false; } - function loadImportLogDetail(importLogId) { - $.ajax( - { - url:'<s:url action="getDashboardImportLog" namespace="/workingDb"/>', - data:{importLogId:importLogId}, - async:false, - dataType:"json", - success:function (data, textStatus) { - - $('#noImportLogDetail').hide(); - $('#importLogDetail').show(); - var json = data.data; - - if ($('#noVoyageDetail').is(":visible")) { - - // need to load voyage - loadVoyageDetail(json['voyageId']); - } - - $('#importLogVoyage').html(json['voyageId_lbl']); - $('#importLogText').html(json['importText']); - $('#importLogUser').html(json['importUser']); - $('#importLogDate').html(json['importDate']); - $('#importLogImportType').html(json['importType']); - } - }); - return false; - } - jQuery(document).ready(function () { $('[name="voyageId"]').change(function (event) { reloadPage({'voyageId':this.value}); }); - $.addRowSelectTopic('importLogs', function (event) { - - var id = event.originalEvent.id; - loadImportLogDetail(id); - }); - $.addClearSelectTopic('importLogs', function (event) { $(':checkbox[name^="jqg"]').each(function () { @@ -85,8 +50,6 @@ elem.attr("name", "model.importLogIds"); elem.attr("value", newId); }); - $('#noImportLogDetail').show(); - $('#importLogDetail').hide(); }); $.addEvenAndOddClasses('importLogs'); }); @@ -123,7 +86,6 @@ navigatorDelete="false" navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" multiselect="true" - onSelectRowTopics='importLogs-rowSelect' onCompleteTopics="importLogs-clearSelect,importLogs-CompleteTopics"> <sjg:gridColumn name="id" title="id" hidden="true"/> @@ -139,38 +101,6 @@ title="%{getText('echobase.common.importUser')}"/> </sjg:grid> <br/> - <fieldset> - <legend><s:text name="echobase.title.importLog.detail"/></legend> - <div id="noImportLogDetail"> - <pre> - <s:text name="echobase.message.noImportLogSelected"/> - </pre> - </div> - <div id="importLogDetail"> - - <s:label key='echobase.common.importType' value=''/> - <pre id='importLogImportType' style="font-weight: bold;"></pre> - <br/> - - <s:label key='echobase.common.voyage' value=''/> - <pre id='importLogVoyage' style="font-weight: bold;"></pre> - <br/> - - <s:label key='echobase.common.importDate' value=''/> - <pre id='importLogDate' style="font-weight: bold;"></pre> - <br/> - - <s:label key='echobase.common.importText' value=''/> - - <pre id='importLogText' style="font-weight: bold;" class="floatLeft"></pre> - <br/> - - <s:label key='echobase.common.importUser' value=''/> - <pre id='importLogUser' style="font-weight: bold;" class="floatLeft"></pre> - </div> - </fieldset> - - <br/> <s:submit id='confirmDelete' action="confirmDelete" method="input" onclick="return checkOneRowSelected();" key="echobase.action.delete.selectedImport"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-22 11:20:01 UTC (rev 683) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-22 12:27:48 UTC (rev 684) @@ -134,7 +134,7 @@ navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" onSelectRowTopics="voyages-rowSelect" onCellSelectTopics="voyages-rowSelect" - onCompleteTopics="voyages-clearSelect"> + onCompleteTopics="voyages-clearSelect,voyages-CompleteTopics"> <sjg:gridColumn name="id" title="id" hidden="true"/> <sjg:gridColumn name="id_lbl" sortable="true" Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-09-22 11:20:01 UTC (rev 683) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-09-22 12:27:48 UTC (rev 684) @@ -592,7 +592,7 @@ transition: 0.25s; } .menu a{ - background:url(../images/menu.jpg) no-repeat; + background:url(../images/menu2.jpg) no-repeat; height:48px; width:48px; @@ -633,11 +633,11 @@ background-position:-144px -48px; } .menu .delDonnee{ - background-position:-144px 0; + background-position:-432px 0; } .menu .delDonnee:hover{ - background-position:-144px -48px; + background-position:-432px -48px; } .menu .modif{ Added: trunk/echobase-ui/src/main/webapp/images/menu2.jpg =================================================================== (Binary files differ) Property changes on: trunk/echobase-ui/src/main/webapp/images/menu2.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg

1 0

r683 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/csv echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 13:20:01 +0200 (Sat, 22 Sep 2012) New Revision: 683 Url: http://forge.codelutin.com/repositories/revision/echobase/683 Log: fixes #1520: Probl?\195?\168me lors de la sauvegarde d'une entit?\195?\169 (can accept more date formats) Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2012-09-22 11:20:01 UTC (rev 683) @@ -0,0 +1,54 @@ +package fr.ifremer.echobase.csv; + +import com.google.common.collect.Lists; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.csv.ValueParser; + +import java.text.ParseException; +import java.util.Iterator; +import java.util.List; + +/** + * To chain some {@link ValueParser} (different format supported). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class ChainValueParser<E> implements ValueParser<E> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ChainValueParser.class); + + final List<ValueParser<E>> parsers = Lists.newArrayList(); + + public ChainValueParser<E> addParser(ValueParser<E> parser) { + this.parsers.add(parser); + return this; + } + + @Override + public E parse(String value) throws ParseException { + E result = null; + Iterator<ValueParser<E>> iterator = parsers.iterator(); + while (iterator.hasNext()) { + ValueParser<E> parser = iterator.next(); + try { + result = parser.parse(value); + break; + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not parse value " + value, e); + } + } + } + + if (result == null && !iterator.hasNext()) { + + // all parsers were used and no one gives a good result + throw new ParseException( + "Could not parse value " + value + " with any parsers", 0); + } + return result; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native 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 2012-09-22 10:35:40 UTC (rev 682) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2012-09-22 11:20:01 UTC (rev 683) @@ -82,6 +82,12 @@ }; + public static final ValueParser<Date> DATE_TIME_VALUE_PARSER = new ChainValueParser<Date>(). + addParser(TopiaCsvCommons.DAY_TIME_SECOND_WITH_TIMESTAMP). + addParser(TopiaCsvCommons.DAY_TIME_SECOND). + addParser(TopiaCsvCommons.DAY_TIME). + addParser(TopiaCsvCommons.DAY); + public static final String CELL_NAME = "name"; public static final String OPERATION_ID = "operationId"; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-09-22 10:35:40 UTC (rev 682) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-09-22 11:20:01 UTC (rev 683) @@ -27,6 +27,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EntityModificationLog; @@ -56,6 +57,7 @@ import org.nuiton.util.decorator.JXPathDecorator; import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Map; @@ -522,6 +524,10 @@ // translate foreign key to his id model.addForeignKeyForImport(propertyName, entityType, universe); + } else if (Date.class.equals(type)) { + model.newMandatoryColumn( + propertyName, + EchoBaseCsvUtil.DATE_TIME_VALUE_PARSER); } else { model.addDefaultColumn(propertyName, type); }

1 0

r682 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor
by tchemit＠users.forge.codelutin.com 22 Sep '12

22 Sep '12

Author: tchemit Date: 2012-09-22 12:35:40 +0200 (Sat, 22 Sep 2012) New Revision: 682 Url: http://forge.codelutin.com/repositories/revision/echobase/682 Log: fix import Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2012-09-21 19:49:10 UTC (rev 681) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2012-09-22 10:35:40 UTC (rev 682) @@ -35,7 +35,7 @@ import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.services.DecoratorService; import fr.ifremer.echobase.ui.actions.AbstractJSONPaginedAction; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.pager.FilterRule;

1 0