r158 - in trunk/echobase-tools: . src/main/java/fr/ifremer/echobase/tools src/main/java/fr/ifremer/echobase/tools/loaders src/main/resources/csv src/main/resources/csv/association src/main/resources/csv/baracouda src/main/resources/csv/new src/test/java/fr/ifremer/echobase/tools src/test/java/fr/ifremer/echobase/tools/loaders src/test/resources/csv/new - Echobase-commits

8 Dec 2011

Author: tchemit
Date: 2011-12-08 06:55:17 +0100 (Thu, 08 Dec 2011)
New Revision: 158

Url: http://forge.codelutin.com/repositories/revision/echobase/158

Log:
continue msaccess import (common datas)

Added:
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LocalisationLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransectLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransitLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java
   trunk/echobase-tools/src/main/resources/csv/association/
   trunk/echobase-tools/src/main/resources/csv/association/Transit_transect.csv
   trunk/echobase-tools/src/main/resources/csv/association/Voyage_transit.csv
   trunk/echobase-tools/src/main/resources/csv/baracouda/Transect.csv
   trunk/echobase-tools/src/main/resources/csv/baracouda/Transit.csv
   trunk/echobase-tools/src/main/resources/csv/baracouda/Voyage.csv
   trunk/echobase-tools/src/main/resources/csv/new/Localisation.csv
   trunk/echobase-tools/src/main/resources/csv/new/VesselType.csv
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LocalisationLoaderTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransectLoaderTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransitLoaderTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoaderTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java
   trunk/echobase-tools/src/test/resources/csv/new/input-Localisation.csv
   trunk/echobase-tools/src/test/resources/csv/new/input-VesselType.csv
Modified:
   trunk/echobase-tools/pom.xml
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/FileType.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AcousticInstrumentLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AreaOfOperationLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeCategoryLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/MissionLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TSParametersLoader.java
   trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselLoader.java
   trunk/echobase-tools/src/main/resources/csv/baracouda/Echotype.csv
   trunk/echobase-tools/src/main/resources/csv/baracouda/Vessel.csv
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbCreatorTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/EchotypeLoaderTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoaderTest.java
   trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TSParametersLoaderTest.java

Modified: trunk/echobase-tools/pom.xml
===================================================================

--- trunk/echobase-tools/pom.xml	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/pom.xml	2011-12-08 05:55:17 UTC (rev 158)
@@ -129,4 +129,42 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <excludes>**/*LoaderTest.java</excludes>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>run-loaders</id>
+      <activation>
+        <property>
+          <name>runLoaders</name>
+          <value>true</value>
+        </property>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/*LoaderTest.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -23,12 +23,35 @@
  */
 package fr.ifremer.echobase.tools;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.healthmarketscience.jackcess.Database;
 import fr.ifremer.echobase.services.EchoBaseService;
 import fr.ifremer.echobase.services.EchoBaseServiceContext;
-import fr.ifremer.echobase.tools.loaders.*;
+import fr.ifremer.echobase.tools.loaders.AcousticInstrumentLoader;
+import fr.ifremer.echobase.tools.loaders.AreaOfOperationLoader;
+import fr.ifremer.echobase.tools.loaders.CellMethodLoader;
+import fr.ifremer.echobase.tools.loaders.CellTypeLoader;
+import fr.ifremer.echobase.tools.loaders.DataMetadataLoader;
+import fr.ifremer.echobase.tools.loaders.DataQualityLoader;
+import fr.ifremer.echobase.tools.loaders.DataTypeLoader;
+import fr.ifremer.echobase.tools.loaders.DepthStratumLoader;
+import fr.ifremer.echobase.tools.loaders.EchotypeCategoryLoader;
+import fr.ifremer.echobase.tools.loaders.EchotypeLoader;
+import fr.ifremer.echobase.tools.loaders.EntityLoader;
+import fr.ifremer.echobase.tools.loaders.LocalisationLoader;
+import fr.ifremer.echobase.tools.loaders.MissionLoader;
+import fr.ifremer.echobase.tools.loaders.ReferenceDatumLoader;
+import fr.ifremer.echobase.tools.loaders.ReferenceDatumTypeLoader;
+import fr.ifremer.echobase.tools.loaders.SpeciesLoader;
+import fr.ifremer.echobase.tools.loaders.TSParametersLoader;
+import fr.ifremer.echobase.tools.loaders.TransectLoader;
+import fr.ifremer.echobase.tools.loaders.TransitLoader;
+import fr.ifremer.echobase.tools.loaders.VesselLoader;
+import fr.ifremer.echobase.tools.loaders.VesselTypeLoader;
+import fr.ifremer.echobase.tools.loaders.VoyageLoader;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaEntity;
 
 import java.io.File;
 import java.io.IOException;
@@ -84,31 +107,19 @@
 
     protected EchoBaseServiceContext serviceContext;
 
-    protected List<EntityLoader<?>> referenceLoaders;
+    protected List<EntityLoader<?>> entityLoaders;
 
     public void createEntities(File msAccessFile,
                                File outputDir) throws IOException, TopiaException {
 
-        List<EntityLoader<?>> loaders = getReferenceLoaders();
-
         Database db = Database.open(msAccessFile);
 
-        for (EntityLoader<?> loader : loaders) {
+        for (EntityLoader<?> loader : getEntityLoaders()) {
 
-//            EchoBaseEntityEnum[] dependencies = loader.getDependencies();
-//
-//            for (EchoBaseEntityEnum dependency : dependencies) {
-//
-//                // import from createEchoBaseEntities for this dependency
-//                EntityLoader<?> depLoader = getLoader(loaders, dependency);
-//
-//                depLoader.loadEchobaseFile(outputDir);
-//            }
             if (loader.canGenerateNew()) {
 
                 File inFile = new File(outputDir, "input-" + loader.getEntityType().name() + ".csv");
 
-//                String path = loader.getPath(inFile, FileType.NEW);
                 loader.copyStreamToFile(inFile, FileType.NEW);
 
                 loader.generateNewEntities(inFile, outputDir, false);
@@ -123,54 +134,58 @@
 
     public void createEchoBaseEntities(File outputDir) throws IOException, TopiaException {
 
-        List<EntityLoader<?>> loaders = getReferenceLoaders();
+        for (EntityLoader<?> loader : getEntityLoaders()) {
 
-        for (EntityLoader<?> loader : loaders) {
-
             loader.generateEchobaseFile(outputDir, false);
         }
     }
 
-//    protected EntityLoader<?> getLoader(List<EntityLoader<?>> loaders,
-//                                        EchoBaseEntityEnum entityType) {
-//        for (EntityLoader<?> loader : loaders) {
-//            if (entityType.equals(loader.getEntityType())) {
-//                return loader;
-//            }
-//        }
-//        Preconditions.checkState(true,
-//                "Could not find loader for type : " + entityType);
-//        return null;
-//    }
-
     @Override
     public void setServiceContext(EchoBaseServiceContext serviceContext) {
         this.serviceContext = serviceContext;
     }
 
-    protected List<EntityLoader<?>> getReferenceLoaders() {
-        if (referenceLoaders == null) {
-            referenceLoaders = Lists.newArrayList();
-            referenceLoaders.add(newService(SpeciesLoader.class));
-            referenceLoaders.add(newService(MissionLoader.class));
-            referenceLoaders.add(newService(AreaOfOperationLoader.class));
-            referenceLoaders.add(newService(AcousticInstrumentLoader.class));
-            referenceLoaders.add(newService(DepthStratumLoader.class));
-            referenceLoaders.add(newService(DataQualityLoader.class));
-            referenceLoaders.add(newService(ReferenceDatumTypeLoader.class));
-            referenceLoaders.add(newService(ReferenceDatumLoader.class));
-            referenceLoaders.add(newService(DataTypeLoader.class));
-            referenceLoaders.add(newService(CellTypeLoader.class));
-            referenceLoaders.add(newService(CellMethodLoader.class));
-            referenceLoaders.add(newService(DataMetadataLoader.class));
-            referenceLoaders.add(newService(TSParametersLoader.class));
-            referenceLoaders.add(newService(EchotypeCategoryLoader.class));
-            referenceLoaders.add(newService(EchotypeLoader.class));
-            referenceLoaders.add(newService(VesselLoader.class));
+    public List<EntityLoader<?>> getEntityLoaders() {
+        if (entityLoaders == null) {
+            entityLoaders = Lists.newArrayList();
+            entityLoaders.add(newService(SpeciesLoader.class));
+            entityLoaders.add(newService(MissionLoader.class));
+            entityLoaders.add(newService(AreaOfOperationLoader.class));
+            entityLoaders.add(newService(AcousticInstrumentLoader.class));
+            entityLoaders.add(newService(DepthStratumLoader.class));
+            entityLoaders.add(newService(DataQualityLoader.class));
+            entityLoaders.add(newService(ReferenceDatumTypeLoader.class));
+            entityLoaders.add(newService(ReferenceDatumLoader.class));
+            entityLoaders.add(newService(DataTypeLoader.class));
+            entityLoaders.add(newService(CellTypeLoader.class));
+            entityLoaders.add(newService(CellMethodLoader.class));
+            entityLoaders.add(newService(DataMetadataLoader.class));
+            entityLoaders.add(newService(TSParametersLoader.class));
+            entityLoaders.add(newService(EchotypeCategoryLoader.class));
+            entityLoaders.add(newService(EchotypeLoader.class));
+            entityLoaders.add(newService(VesselTypeLoader.class));
+            entityLoaders.add(newService(VesselLoader.class));
+            entityLoaders.add(newService(VoyageLoader.class));
+            entityLoaders.add(newService(TransitLoader.class));
+            entityLoaders.add(newService(TransectLoader.class));
+            entityLoaders.add(newService(LocalisationLoader.class));
         }
-        return referenceLoaders;
+        return entityLoaders;
     }
 
+    public <E extends TopiaEntity> EntityLoader<E> getEntityLoader(Class<E> entityClass) {
+        EntityLoader<E> result = null;
+        for (EntityLoader<?> entityLoader : getEntityLoaders()) {
+            if (entityClass.equals(entityLoader.getEntityType().getContract())) {
+                result = (EntityLoader<E>) entityLoader;
+                break;
+            }
+        }
+        Preconditions.checkNotNull(result, "Could not find EntityLoader for " +
+                entityClass.getName());
+        return result;
+    }
+
     protected <E extends EchoBaseService> E newService(Class<E> clazz) {
         return serviceContext.newService(clazz);
     }

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/FileType.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/FileType.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/FileType.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -38,5 +38,8 @@
     NEW,
 
     /** entities loaded from baracouda db (should be in directory baracouda). */
-    BARACOUDA
+    BARACOUDA,
+
+    /** entities association */
+    ASSOCIATION
 }

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AcousticInstrumentLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AcousticInstrumentLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AcousticInstrumentLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -26,14 +26,12 @@
 import com.google.common.collect.Lists;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
-import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
 import fr.ifremer.echobase.entities.references.AcousticInstrument;
-import fr.ifremer.echobase.entities.references.AcousticInstrumentDAO;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.List;
@@ -58,9 +56,7 @@
     @Override
     protected void importBaracoudaEntities(Database db) throws IOException, TopiaException {
 
-        TopiaContext tx = serviceContext.getTransaction();
-        AcousticInstrumentDAO dao =
-                EchoBaseDAOHelper.getAcousticInstrumentDAO(tx);
+        TopiaDAO<AcousticInstrument> dao = getDAO();
 
         List<AcousticInstrument> entities = Lists.newArrayList();
         Table table = db.getTable("EI_SONDEUR");

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AreaOfOperationLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AreaOfOperationLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AreaOfOperationLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -26,14 +26,12 @@
 import com.google.common.collect.Sets;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
-import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
 import fr.ifremer.echobase.entities.references.AreaOfOperation;
-import fr.ifremer.echobase.entities.references.AreaOfOperationDAO;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.Map;
@@ -68,16 +66,14 @@
             log.info("Found " + codeZones.size() + " areaOfOperation(s).");
         }
 
-        TopiaContext tx = serviceContext.getTransaction();
-        AreaOfOperationDAO dao = EchoBaseDAOHelper.getAreaOfOperationDAO(tx);
+        TopiaDAO<AreaOfOperation> dao = getDAO();
         for (String codeZone : codeZones) {
             AreaOfOperation areaOfOperation =
                     dao.create(AreaOfOperation.PROPERTY_NAME, codeZone);
             if (log.isInfoEnabled()) {
                 log.info("Created areaOfOperation : " +
-                        areaOfOperation.getName());
+                                 areaOfOperation.getName());
             }
         }
     }
-
 }

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -28,15 +28,18 @@
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
 import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
-import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
 import fr.ifremer.echobase.entities.meta.TableMeta;
-import fr.ifremer.echobase.entities.references.*;
+import fr.ifremer.echobase.entities.references.CellMethod;
+import fr.ifremer.echobase.entities.references.DataMetadata;
+import fr.ifremer.echobase.entities.references.DataType;
+import fr.ifremer.echobase.entities.references.ReferenceDatum;
 import fr.ifremer.echobase.services.models.EntityCsvModel;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.List;
@@ -55,11 +58,7 @@
             LogFactory.getLog(DataMetadataLoader.class);
 
     public DataMetadataLoader() {
-        super(DataMetadata.class,
-                new EchoBaseEntityEnum[]{EchoBaseEntityEnum.DataType,
-                        EchoBaseEntityEnum.CellMethod,
-                        EchoBaseEntityEnum.ReferenceDatum},
-                FileType.BARACOUDA, FileType.NEW);
+        super(DataMetadata.class, FileType.BARACOUDA, FileType.NEW);
     }
 
     @Override
@@ -74,8 +73,7 @@
         DataType dataType =
                 EchoBaseDAOHelper.getDataTypeDAO(tx).findByName("Acoustic density");
 
-        DataMetadataDAO dao =
-                EchoBaseDAOHelper.getDataMetadataDAO(tx);
+        TopiaDAO<DataMetadata> dao = getDAO();
 
         List<DataMetadata> entities = Lists.newArrayList();
         Table table = db.getTable("EI_CONFIGURATION");

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -26,14 +26,12 @@
 import com.google.common.collect.Lists;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
-import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
 import fr.ifremer.echobase.entities.references.DepthStratum;
-import fr.ifremer.echobase.entities.references.DepthStratumDAO;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.List;
@@ -58,9 +56,7 @@
     @Override
     protected void importBaracoudaEntities(Database db) throws IOException, TopiaException {
 
-        TopiaContext tx = serviceContext.getTransaction();
-        DepthStratumDAO dao =
-                EchoBaseDAOHelper.getDepthStratumDAO(tx);
+        TopiaDAO<DepthStratum> dao = getDAO();
 
         List<DepthStratum> entities = Lists.newArrayList();
         Table table = db.getTable("TYPE_IMAGE");

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeCategoryLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeCategoryLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeCategoryLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -26,14 +26,12 @@
 import com.google.common.collect.Sets;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
-import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
 import fr.ifremer.echobase.entities.references.EchotypeCategory;
-import fr.ifremer.echobase.entities.references.EchotypeCategoryDAO;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.Map;
@@ -70,14 +68,13 @@
             log.info("Found " + codes.size() + " EchotypeCategory(s).");
         }
 
-        TopiaContext tx = serviceContext.getTransaction();
-        EchotypeCategoryDAO dao = EchoBaseDAOHelper.getEchotypeCategoryDAO(tx);
+        TopiaDAO<EchotypeCategory> dao = getDAO();
         for (String code : codes) {
             EchotypeCategory areaOfOperation =
                     dao.create(EchotypeCategory.PROPERTY_NAME, code);
             if (log.isInfoEnabled()) {
                 log.info("Created EchotypeCategory : " +
-                        areaOfOperation.getName());
+                                 areaOfOperation.getName());
             }
         }
     }

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -24,20 +24,28 @@
 package fr.ifremer.echobase.tools.loaders;
 
 import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Multimaps;
 import com.google.common.collect.Sets;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
 import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
-import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
-import fr.ifremer.echobase.entities.references.*;
+import fr.ifremer.echobase.entities.references.DepthStratum;
+import fr.ifremer.echobase.entities.references.Echotype;
+import fr.ifremer.echobase.entities.references.EchotypeCategory;
+import fr.ifremer.echobase.entities.references.Species;
+import fr.ifremer.echobase.entities.references.SpeciesDAO;
 import fr.ifremer.echobase.tools.FileType;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -58,11 +66,7 @@
             LogFactory.getLog(EchotypeLoader.class);
 
     public EchotypeLoader() {
-        super(Echotype.class,
-                new EchoBaseEntityEnum[]{EchoBaseEntityEnum.EchotypeCategory,
-                        EchoBaseEntityEnum.DepthStratum,
-                        EchoBaseEntityEnum.Species},
-                FileType.BARACOUDA);
+        super(Echotype.class, FileType.BARACOUDA);
     }
 
     @Override
@@ -90,83 +94,106 @@
 
         SpeciesDAO speciesDAO = EchoBaseDAOHelper.getSpeciesDAO(tx);
 
-        EchotypeDAO dao = EchoBaseDAOHelper.getEchotypeDAO(tx);
+        TopiaDAO<Echotype> dao = getDAO();
 
-        Map<Integer, Echotype> entitiesById = Maps.newTreeMap();
-        Set<String> names = Sets.newHashSet();
+        List<Echotype> echotypes = Lists.newArrayList();
 
         if (log.isInfoEnabled()) {
             log.info("Scan table EIT_VALEUR_ECHOS");
         }
 
-        // first obtains all echotype with their name and natural key
+        // obtain all (id,name) from table EIT_VALEUR_ECHOS
+        Set<Pair<Integer, String>> pairs = Sets.newHashSet();
+
         Table table = db.getTable("EIT_VALEUR_ECHOS");
         for (Map<String, Object> row : table) {
             Integer id = (Integer) row.get("ID_DESCRIPTION_DEVIATION");
             String name = (String) row.get("LIBELLE_DEVIATION");
-            names.add(name);
-            if (!entitiesById.containsKey(id)) {
-
-                // a new echotype found
-                Echotype entity = dao.create(
-                        Echotype.PROPERTY_NAME, name
-                );
-                entitiesById.put(id, entity);
-            }
+            Pair<Integer, String> pair = Pair.of(id, name);
+            pairs.add(pair);
         }
 
         if (log.isInfoEnabled()) {
-            List<String> nameList = Lists.newArrayList(names);
-            Collections.sort(nameList);
-
-            log.info("Found " + entitiesById.size() + " Echotype(s) with distinct ids " + entitiesById.keySet());
-            log.info("Found " + names.size() + " Echotype(s) names  : " + names);
+            log.info("Found " + pairs.size() + " pairs of ids");
         }
 
-        // obtain meaning, EchotypeCategory and DepthStratum from Table EIT_DESCRIPT_ECHOS
-        Set<Integer> missingIds = Sets.newHashSet();
+        // obtain Species fro table ESPECE_ECHOS
+        ImmutableListMultimap<Integer, Map<String, Object>> especeEchoById = Multimaps.index(
+                db.getTable("ESPECE_ECHOS"), new Function<Map<String, Object>, Integer>() {
+
+            @Override
+            public Integer apply(Map<String, Object> input) {
+                Integer id = (Integer) input.get("CODE_DESCRIPTION_DEVIATION");
+                return id;
+            }
+        });
+
+        Map<Integer, Map<String, Object>> descriptEchoById = Maps.uniqueIndex(
+                db.getTable("EIT_DESCRIPT_ECHOS"), new Function<Map<String, Object>, Integer>() {
+
+            @Override
+            public Integer apply(Map<String, Object> input) {
+                Integer id = (Integer) input.get("ID_DESCRIPTION_DEVIATION");
+                return id;
+            }
+        });
+
         Set<String> missingDepthStratum = Sets.newHashSet();
         Set<String> missingCategories = Sets.newHashSet();
         Set<String> missingSpecies = Sets.newHashSet();
 
-        if (log.isInfoEnabled()) {
-            log.info("Scan table EIT_DESCRIPT_ECHOS");
-        }
-        table = db.getTable("EIT_DESCRIPT_ECHOS");
-        for (Map<String, Object> row : table) {
-            Integer id = (Integer) row.get("ID_DESCRIPTION_DEVIATION");
-            Echotype echotype = entitiesById.get(id);
-            if (echotype == null) {
-                missingIds.add(id);
-                continue;
-            }
+        // for each id, find out available species and meaning from table ESPECE_ECHOS
 
-            String meaning = (String) row.get("LIBELLE_DESCRIPTION_DEVIATION");
-            echotype.setMeaning(meaning);
-            String categoryId = (String) row.get("TYPE_DEVIATION");
+        for (Pair<Integer, String> pair : pairs) {
+            Integer id = pair.getKey();
+            String name = pair.getValue();
+
+            // get row for table EIT_DESCRIPT_ECHOS
+            Map<String, Object> descriptionRow = descriptEchoById.get(id);
+
+            // get echotype meaning
+            String meaning = (String) descriptionRow.get("LIBELLE_DESCRIPTION_DEVIATION");
+
+            // get echotype category
+            String categoryId = (String) descriptionRow.get("TYPE_DEVIATION");
             EchotypeCategory echotypeCategory = categoriesByName.get(categoryId.toLowerCase());
             if (echotypeCategory == null) {
                 missingCategories.add(categoryId);
             }
-            echotype.setEchotypeCategory(echotypeCategory);
-            String depthStratumId = (String) row.get("IMAGES");
+
+            // get echotype depthstratum
+            String depthStratumId = (String) descriptionRow.get("IMAGES");
             DepthStratum depthStratum = depthStratumsById.get(depthStratumId.toLowerCase());
             if (depthStratum == null) {
                 missingDepthStratum.add(depthStratumId);
             }
-            echotype.setDepthStratum(depthStratum);
-        }
 
-        if (!missingIds.isEmpty()) {
+            // get all rows from ESPECE_ECHOS for this id
+            ImmutableList<Map<String, Object>> rows = especeEchoById.get(id);
 
-            // there is some missing id in this table
-            List<Integer> missingIdsList = Lists.newArrayList(missingIds);
-            Collections.sort(missingIdsList);
+            for (Map<String, Object> row : rows) {
 
-            if (log.isWarnEnabled()) {
-                log.warn("There is " + missingIdsList.size() + " missing echotype ids in table EIT_DESCRIPT_ECHOS : " + missingIdsList);
+                String speciesId = (String) row.get("GENRE_ESP");
+                Species species = speciesDAO.findByBaracoudaCode(speciesId);
+
+                if (species == null) {
+                    missingSpecies.add(speciesId);
+                }
+
+                Echotype echotype = dao.create(
+                        Echotype.PROPERTY_ID, id,
+                        Echotype.PROPERTY_NAME, name,
+                        Echotype.PROPERTY_SPECIES, species
+                );
+                echotypes.add(echotype);
+
+                echotype.setMeaning(meaning);
+                echotype.setSpecies(species);
+                echotype.setEchotypeCategory(echotypeCategory);
+                echotype.setDepthStratum(depthStratum);
             }
         }
+
         if (!missingDepthStratum.isEmpty()) {
 
             // there is some missing id in this table
@@ -187,42 +214,7 @@
                 log.warn("There is " + missingCategories.size() + " missing echotypecategories ids in table EIT_DESCRIPT_ECHOS : " + missingCategoriesList);
             }
         }
-        if (log.isInfoEnabled()) {
-            log.info("Scan table ESPECE_ECHOS");
-        }
 
-        missingIds.clear();
-
-        // obtain Species fro table ESPECE_ECHOS
-        table = db.getTable("ESPECE_ECHOS");
-        for (Map<String, Object> row : table) {
-            Integer id = (Integer) row.get("CODE_DESCRIPTION_DEVIATION");
-            Echotype echotype = entitiesById.get(id);
-            if (echotype == null) {
-                missingIds.add(id);
-                continue;
-            }
-
-            String meaning = (String) row.get("LIBELLE_DESCRIPTION_DEVIATION");
-            echotype.setMeaning(meaning);
-            String speciesId = (String) row.get("GENRE_ESP");
-            Species species = speciesDAO.findByBaracoudaCode(speciesId);
-            if (species == null) {
-                missingSpecies.add(speciesId);
-            }
-            echotype.setSpecies(species);
-        }
-
-        if (!missingIds.isEmpty()) {
-
-            // there is some missing id in this table
-            List<Integer> missingIdsList = Lists.newArrayList(missingIds);
-            Collections.sort(missingIdsList);
-
-            if (log.isWarnEnabled()) {
-                log.warn("There is " + missingIdsList.size() + " missing echotype ids in table ESPECE_ECHOS : " + missingIdsList);
-            }
-        }
         if (!missingSpecies.isEmpty()) {
 
             // there is some missing id in this table
@@ -235,8 +227,7 @@
         }
 
         if (log.isInfoEnabled()) {
-            log.info("Found " + entitiesById.size() + " Echotype(s).");
+            log.info("Found " + echotypes.size() + " Echotype(s).");
         }
     }
-
 }

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -23,25 +23,38 @@
  */
 package fr.ifremer.echobase.tools.loaders;
 
+import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Sets;
 import com.healthmarketscience.jackcess.Database;
 import fr.ifremer.echobase.EchoBaseTechnicalException;
 import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
+import fr.ifremer.echobase.entities.meta.AssociationMeta;
+import fr.ifremer.echobase.entities.meta.MetaFilenameAware;
 import fr.ifremer.echobase.entities.meta.TableMeta;
-import fr.ifremer.echobase.services.*;
+import fr.ifremer.echobase.services.CsvImportResult;
+import fr.ifremer.echobase.services.DbEditorService;
+import fr.ifremer.echobase.services.DbImportExportService;
+import fr.ifremer.echobase.services.EchoBaseServiceContext;
+import fr.ifremer.echobase.services.EchoBaseServiceSupport;
 import fr.ifremer.echobase.services.models.EntityCsvModel;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.util.FileUtil;
 import org.nuiton.util.csv.Import;
-import org.nuiton.util.csv.ImportExportModel;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
 import java.util.Set;
 
 /**
@@ -50,16 +63,14 @@
  * @author tchemit <chemit@codelutin.com>
  * @since 0.3
  */
-public abstract class EntityLoader<E extends TopiaEntity> implements EchoBaseService {
+public abstract class EntityLoader<E extends TopiaEntity> extends EchoBaseServiceSupport {
 
     /** Logger. */
     private static final Log log = LogFactory.getLog(EntityLoader.class);
 
-    private static final EchoBaseEntityEnum[] DEPENDENCIES =
+    private static final EchoBaseEntityEnum[] EMPTY_DEPENDENCIES_ARRAY =
             new EchoBaseEntityEnum[0];
 
-    protected EchoBaseServiceContext serviceContext;
-
     private DbEditorService dbEditorService;
 
     private final Class<E> entityClass;
@@ -68,22 +79,68 @@
 
     private final Set<FileType> fileTypes;
 
-    private final EchoBaseEntityEnum[] dependencies;
+    private TableMeta meta;
 
+    private AssociationMeta parentAssociationMeta;
+
+    private final EchoBaseEntityEnum parent;
+
+    private final String parentAssociationName;
+
+    private final EchoBaseEntityEnum[] extraDependencies;
+
     protected EntityLoader(Class<E> entityClass,
                            FileType... fileTypes) {
-        this(entityClass, DEPENDENCIES, fileTypes);
+        this(entityClass, null, null, EMPTY_DEPENDENCIES_ARRAY, fileTypes);
     }
 
     protected EntityLoader(Class<E> entityClass,
-                           EchoBaseEntityEnum[] dependencies,
+                           EchoBaseEntityEnum[] extraDependencies,
                            FileType... fileTypes) {
+        this(entityClass, null, null, extraDependencies, fileTypes);
+    }
+
+    protected EntityLoader(Class<E> entityClass,
+                           EchoBaseEntityEnum parent,
+                           String parentAssociationName,
+                           FileType... fileTypes) {
+        this(entityClass, parent, parentAssociationName, EMPTY_DEPENDENCIES_ARRAY, fileTypes);
+    }
+
+    protected EntityLoader(Class<E> entityClass,
+                           EchoBaseEntityEnum parent,
+                           String parentAssociationName,
+                           EchoBaseEntityEnum[] extraDependencies,
+                           FileType... fileTypes) {
         this.entityClass = entityClass;
         entityType = EchoBaseEntityEnum.valueOf(entityClass);
+
         this.fileTypes = Sets.newHashSet(fileTypes);
-        this.dependencies = dependencies;
+        this.parent = parent;
+        this.parentAssociationName = parentAssociationName;
+        this.extraDependencies = extraDependencies;
     }
 
+    @Override
+    public void setServiceContext(EchoBaseServiceContext serviceContext) {
+        super.setServiceContext(serviceContext);
+
+        // init internal states
+
+        meta = getDbMeta().getTable(entityType);
+
+        if (parent != null) {
+
+            TableMeta parentMeta = getDbMeta().getTable(parent);
+
+            // find the associationMeta
+            parentAssociationMeta =
+                    parentMeta.getAssociations(parentAssociationName);
+        } else {
+            parentAssociationMeta = null;
+        }
+    }
+
     protected EntityCsvModel<E> createCsvImportModel(TableMeta meta) {
         // by default no model
         return null;
@@ -93,11 +150,6 @@
         // by default do nothing
     }
 
-    @Override
-    public final void setServiceContext(EchoBaseServiceContext serviceContext) {
-        this.serviceContext = serviceContext;
-    }
-
     public boolean canGenerateNew() {
         return fileTypes.contains(FileType.NEW);
     }
@@ -111,15 +163,27 @@
     }
 
     public EchoBaseEntityEnum[] getDependencies() {
-        return dependencies;
+        return meta.getDependencies();
     }
 
+    public EchoBaseEntityEnum[] getExtraDependencies() {
+        return extraDependencies;
+    }
+
+    public TableMeta getMeta() {
+        return meta;
+    }
+
+    public AssociationMeta getParentAssociationMeta() {
+        return parentAssociationMeta;
+    }
+
     public final void generateNewEntities(File csvfile,
                                           File outputDir,
                                           boolean cleanTransaction) throws IOException, TopiaException {
 
         Preconditions.checkState(canGenerateNew(),
-                "Not allow to generate new entities");
+                                 "Not allow to generate new entities");
 
         try {
             if (log.isInfoEnabled()) {
@@ -140,10 +204,10 @@
                 try {
                     for (E entity : importer) {
                         service.saveEntity(meta,
-                                "",
-                                entity,
-                                null,
-                                false
+                                           "",
+                                           entity,
+                                           null,
+                                           false
                         );
                     }
                 } finally {
@@ -159,9 +223,9 @@
                 bf.close();
             }
 
-            File outputFile = getTableFile(outputDir, entityType, FileType.NEW);
+            File out = getTableFile(outputDir, meta, FileType.NEW);
 
-            exportEntities(outputFile);
+            getDbEditorService().exportDatas(meta, out);
         } finally {
             if (cleanTransaction) {
                 serviceContext.getTransaction().rollbackTransaction();
@@ -175,15 +239,16 @@
                                                     boolean cleanTransaction) throws IOException, TopiaException {
 
         Preconditions.checkState(canGenerateBaracouda(),
-                "Not allow to generate baracouda entities");
+                                 "Not allow to generate baracouda entities");
 
         try {
             importBaracoudaEntities(db);
 
-            File outputFile =
-                    getTableFile(outputDir, entityType, FileType.BARACOUDA);
+            File out = getTableFile(outputDir, meta, FileType.BARACOUDA);
 
-            exportEntities(outputFile);
+            getDbEditorService().exportDatas(meta, out);
+
+            exportAssociations(outputDir, FileType.ASSOCIATION);
         } finally {
             if (cleanTransaction) {
                 serviceContext.getTransaction().rollbackTransaction();
@@ -191,12 +256,22 @@
         }
     }
 
-    public final void generateEchobaseFile(File outputFile,
+    protected void exportAssociations(File outputDir, FileType targetType) throws IOException {
+        AssociationMeta associationMeta = getParentAssociationMeta();
+
+        if (associationMeta != null) {
+
+            File out = getTableFile(outputDir, associationMeta, targetType);
+            getDbEditorService().exportDatas(associationMeta, out);
+        }
+    }
+
+    public final void generateEchobaseFile(File outputDir,
                                            boolean cleanTransaction) throws IOException, TopiaException {
 
         try {
 
-            File out = getTableFile(outputFile, entityType, FileType.ECHOBASE);
+            File out = getTableFile(outputDir, meta, FileType.ECHOBASE);
 
             if (log.isInfoEnabled()) {
                 log.info("Generate echobase csv file " + out.getName());
@@ -205,18 +280,21 @@
             if (canGenerateNew()) {
 
                 // copy and load new stuff
-                copyAndLoadEntities(outputFile, entityType, false, FileType.NEW);
+                copyAndLoadEntities(outputDir, meta, false, FileType.NEW);
             }
 
             if (canGenerateBaracouda()) {
 
                 // copy and load of baracouda stuff
-                copyAndLoadEntities(outputFile, entityType, false, FileType.BARACOUDA);
+                copyAndLoadEntities(outputDir, meta, false, FileType.BARACOUDA);
             }
 
             // export to the ouput file
-            exportEntities(out);
+            getDbEditorService().exportDatas(meta, out);
 
+            // export associations
+            exportAssociations(outputDir, FileType.ECHOBASE);
+
         } finally {
             if (cleanTransaction) {
                 serviceContext.getTransaction().rollbackTransaction();
@@ -225,16 +303,12 @@
     }
 
     public File getTableFile(File directory,
-                             EchoBaseEntityEnum entityType,
+                             MetaFilenameAware meta,
                              FileType fileType) throws IOException {
 
-        TableMeta meta = getDbEditorService().getTableMeta(entityType);
-
-        DbImportExportService.FileEntry entry =
-                DbImportExportService.FileEntry.newEntry(meta);
         File parentDir = new File(directory, fileType.name().toLowerCase());
         FileUtil.createDirectoryIfNecessary(parentDir);
-        return new File(parentDir, entry.getFilename());
+        return new File(parentDir, meta.getFilename());
     }
 
     public void copyStreamToFile(File file, FileType fileType) throws IOException {
@@ -243,10 +317,10 @@
         InputStream stream = getClass().getResourceAsStream(path);
         try {
             Preconditions.checkNotNull(stream,
-                    "could not find class-path resource " + path);
+                                       "could not find class-path resource " + path);
             Writer outStream = new FileWriter(file);
             try {
-                IOUtils.copy(stream, outStream, "utf-8");
+                IOUtils.copy(stream, outStream, Charsets.UTF_8.name());
             } finally {
                 outStream.close();
             }
@@ -257,6 +331,10 @@
         }
     }
 
+    protected TopiaDAO<E> getDAO() throws TopiaException {
+        return getDAO(entityClass);
+    }
+
     protected final DbEditorService getDbEditorService() {
         if (dbEditorService == null) {
             dbEditorService = serviceContext.newService(DbEditorService.class);
@@ -273,51 +351,25 @@
     }
 
     public void copyAndLoadEntities(File directory,
-                                    EchoBaseEntityEnum entityType,
+                                    MetaFilenameAware meta,
                                     boolean commit,
                                     FileType... fileTypes) throws IOException, TopiaException {
 
-        DbEditorService service = getDbEditorService();
+        DbImportExportService service = newService(DbImportExportService.class);
 
         for (FileType fileType : fileTypes) {
 
-            File out = getTableFile(directory, entityType, fileType);
+            File out = getTableFile(directory, meta, fileType);
             copyStreamToFile(out, fileType);
 
-            TableMeta meta = service.getTableMeta(entityType);
-
-            ImportExportModel<TopiaEntity> csvModel = service.buildForImport(meta);
-
-            CsvImportResult result = CsvImportResult.newResult(entityType,
-                    out.getAbsolutePath(),
-                    true);
+            CsvImportResult result = CsvImportResult.newResult(meta.getSource(),
+                                                               out.getAbsolutePath(),
+                                                               true);
             BufferedReader bf = new BufferedReader(new FileReader(out));
             try {
 
-                Import<TopiaEntity> importer = Import.newImport(csvModel, bf);
+                service.importFile(meta, bf, result);
 
-                try {
-                    for (TopiaEntity entity : importer) {
-                        boolean create = service.saveEntity(meta,
-                                "",
-                                entity,
-                                null,
-                                true
-                        );
-
-                        if (create) {
-
-                            result.incrementsNumberCreated();
-                        } else {
-
-                            result.incrementsNumberUpdated();
-                        }
-                    }
-                } finally {
-
-                    importer.close();
-                }
-
             } catch (EchoBaseTechnicalException eee) {
                 throw eee;
             } catch (Exception eee) {
@@ -327,19 +379,8 @@
             }
         }
         if (commit) {
-            serviceContext.getTransaction().commitTransaction();
+            commitTransaction("Could not copyAndLoadEntities");
         }
     }
 
-    private void exportEntities(File outputFile) throws IOException {
-
-        if (log.isInfoEnabled()) {
-            log.info("Export " + entityType + " to " + outputFile);
-        }
-
-        String content = getDbEditorService().exportDatas(entityType);
-
-        FileUtil.writeString(outputFile, content, "utf-8");
-    }
-
 }

Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LocalisationLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LocalisationLoader.java	                        (rev 0)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LocalisationLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import fr.ifremer.echobase.entities.meta.TableMeta;
+import fr.ifremer.echobase.entities.references.Localisation;
+import fr.ifremer.echobase.services.models.EntityCsvModel;
+import fr.ifremer.echobase.tools.FileType;
+
+/**
+ * Loader of {@link Localisation}.
+ * <p/>
+ * TODO Import it.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class LocalisationLoader extends EntityLoader<Localisation> {
+
+    public LocalisationLoader() {
+        super(Localisation.class, FileType.NEW);
+    }
+
+    @Override
+    protected EntityCsvModel<Localisation> createCsvImportModel(TableMeta meta) {
+
+        EntityCsvModel<Localisation> model = EntityCsvModel.newModel(
+                getCsvSeparator(),
+                meta
+        );
+        model.newMandatoryColumn(Localisation.PROPERTY_MAX_LATITUDE);
+        model.newMandatoryColumn(Localisation.PROPERTY_MIN_LATITUDE);
+        model.newMandatoryColumn(Localisation.PROPERTY_MAX_LONGITUDE);
+        model.newMandatoryColumn(Localisation.PROPERTY_MIN_LONGITUDE);
+        model.newMandatoryColumn(Localisation.PROPERTY_BATHYMETRE);
+        model.newMandatoryColumn(Localisation.PROPERTY_SEAFLOOR_SUBSTRATE);
+        return model;
+    }
+
+
+}
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LocalisationLoader.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/MissionLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/MissionLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/MissionLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -26,14 +26,12 @@
 import com.google.common.collect.Sets;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
-import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
 import fr.ifremer.echobase.entities.references.Mission;
-import fr.ifremer.echobase.entities.references.MissionDAO;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.Map;
@@ -68,8 +66,7 @@
             log.info("Found " + typeCampagnes.size() + " mission(s).");
         }
 
-        TopiaContext tx = serviceContext.getTransaction();
-        MissionDAO dao = EchoBaseDAOHelper.getMissionDAO(tx);
+        TopiaDAO<Mission> dao = getDAO();
         for (String typeCampagne : typeCampagnes) {
             Mission mission =
                     dao.create(Mission.PROPERTY_NAME, typeCampagne);
@@ -79,5 +76,4 @@
         }
     }
 
-
 }

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -27,18 +27,15 @@
 import com.google.common.collect.Lists;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
-import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
-import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
 import fr.ifremer.echobase.entities.meta.TableMeta;
 import fr.ifremer.echobase.entities.references.ReferenceDatum;
-import fr.ifremer.echobase.entities.references.ReferenceDatumDAO;
 import fr.ifremer.echobase.entities.references.ReferenceDatumType;
 import fr.ifremer.echobase.services.models.EntityCsvModel;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.List;
@@ -57,7 +54,7 @@
             LogFactory.getLog(ReferenceDatumLoader.class);
 
     public ReferenceDatumLoader() {
-        super(ReferenceDatum.class, new EchoBaseEntityEnum[]{EchoBaseEntityEnum.ReferenceDatumType}, FileType.BARACOUDA, FileType.NEW);
+        super(ReferenceDatum.class, FileType.BARACOUDA, FileType.NEW);
     }
 
     @Override
@@ -65,9 +62,7 @@
 
         // require referenceDatumType
 
-        TopiaContext tx = serviceContext.getTransaction();
-        ReferenceDatumDAO dao =
-                EchoBaseDAOHelper.getReferenceDatumDAO(tx);
+        TopiaDAO<ReferenceDatum> dao = getDAO();
 
         List<ReferenceDatum> entities = Lists.newArrayList();
         Table table = db.getTable("TYPE_AFFECTATION");

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TSParametersLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TSParametersLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TSParametersLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -27,13 +27,17 @@
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
 import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
-import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
-import fr.ifremer.echobase.entities.references.*;
+import fr.ifremer.echobase.entities.references.AcousticInstrument;
+import fr.ifremer.echobase.entities.references.AcousticInstrumentDAO;
+import fr.ifremer.echobase.entities.references.Species;
+import fr.ifremer.echobase.entities.references.SpeciesDAO;
+import fr.ifremer.echobase.entities.references.TSParameters;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.List;
@@ -52,10 +56,7 @@
             LogFactory.getLog(TSParametersLoader.class);
 
     public TSParametersLoader() {
-        super(TSParameters.class,
-                new EchoBaseEntityEnum[]{EchoBaseEntityEnum.AcousticInstrument,
-                        EchoBaseEntityEnum.Species},
-                FileType.BARACOUDA);
+        super(TSParameters.class, FileType.BARACOUDA);
     }
 
     /*
@@ -72,8 +73,7 @@
         AcousticInstrumentDAO acousticInstrumentDAO =
                 EchoBaseDAOHelper.getAcousticInstrumentDAO(tx);
 
-        TSParametersDAO dao =
-                EchoBaseDAOHelper.getTSParametersDAO(tx);
+        TopiaDAO<TSParameters> dao = getDAO();
 
         List<TSParameters> entities = Lists.newArrayList();
         Table table = db.getTable("COEFFICIENT_ACOUSTIQUE");
@@ -108,5 +108,4 @@
         }
     }
 
-
 }

Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransectLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransectLoader.java	                        (rev 0)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransectLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.healthmarketscience.jackcess.Database;
+import com.healthmarketscience.jackcess.Table;
+import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
+import fr.ifremer.echobase.entities.data.Transect;
+import fr.ifremer.echobase.entities.data.Transit;
+import fr.ifremer.echobase.entities.data.Voyage;
+import fr.ifremer.echobase.entities.references.Vessel;
+import fr.ifremer.echobase.tools.FileType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Loader of {@link Transect}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class TransectLoader extends EntityLoader<Transect> {
+
+    /** Logger. */
+    private static final Log log =
+            LogFactory.getLog(AcousticInstrumentLoader.class);
+
+    public TransectLoader() {
+        super(Transect.class, EchoBaseEntityEnum.Transit,
+              Transit.PROPERTY_TRANSECT, FileType.BARACOUDA);
+    }
+
+    @Override
+    protected void importBaracoudaEntities(Database db) throws IOException, TopiaException {
+
+        List<Voyage> voyages = getEntities(Voyage.class);
+        Map<String, Voyage> voyagesByName = Maps.uniqueIndex(voyages, new Function<Voyage, String>() {
+            @Override
+            public String apply(Voyage input) {
+                return input.getName().toLowerCase();
+            }
+        });
+
+        List<Vessel> vessels = getEntities(Vessel.class);
+        Map<String, Vessel> vesselsByName = Maps.uniqueIndex(vessels, new Function<Vessel, String>() {
+            @Override
+            public String apply(Vessel input) {
+                return input.getName().toLowerCase();
+            }
+        });
+
+        TopiaDAO<Transect> dao = getDAO();
+
+        List<Transect> transects = Lists.newArrayList();
+        Table table = db.getTable("CAMPAGNES");
+        for (Map<String, Object> row : table) {
+
+            String vesselName = (String) row.get("NAVIRE");
+            Vessel vessel = vesselsByName.get(vesselName.toLowerCase());
+            String voyageName = (String) row.get("CAMPAGNE");
+            Voyage voyage = voyagesByName.get(voyageName.toLowerCase());
+            Transit transit = voyage.getTransit().iterator().next();
+            Transect transect = dao.create(
+                    Transect.PROPERTY_VESSEL, vessel,
+                    Transect.PROPERTY_TITLE, "Cruise",
+                    Transect.PROPERTY_COMMENT, "from Baracouda",
+                    Transect.PROPERTY_BIN_UNITS_PING_AXIS, "n.mi.",
+                    Transect.PROPERTY_BIN_SIZE_PING_AXIS, 1,
+                    Transect.PROPERTY_BIN_SIZE_RANGE_AXIS, "variable"
+            );
+            transects.add(transect);
+            transit.addTransect(transect);
+        }
+        if (log.isInfoEnabled()) {
+            log.info("Found " + transects.size() + " transect(s).");
+        }
+    }
+
+}
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransectLoader.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransitLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransitLoader.java	                        (rev 0)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransitLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,96 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.healthmarketscience.jackcess.Database;
+import com.healthmarketscience.jackcess.Table;
+import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
+import fr.ifremer.echobase.entities.data.Transit;
+import fr.ifremer.echobase.entities.data.Voyage;
+import fr.ifremer.echobase.tools.FileType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Loader of {@link Transit}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class TransitLoader extends EntityLoader<Transit> {
+
+    /** Logger. */
+    private static final Log log =
+            LogFactory.getLog(AcousticInstrumentLoader.class);
+
+    public TransitLoader() {
+        super(Transit.class, EchoBaseEntityEnum.Voyage,
+              Voyage.PROPERTY_TRANSIT, FileType.BARACOUDA);
+    }
+
+    @Override
+    protected void importBaracoudaEntities(Database db) throws IOException, TopiaException {
+
+        List<Voyage> voyages = getEntities(Voyage.class);
+        Map<String, Voyage> voyagesByName = Maps.uniqueIndex(voyages, new Function<Voyage, String>() {
+            @Override
+            public String apply(Voyage input) {
+                return input.getName().toLowerCase();
+            }
+        });
+
+        TopiaDAO<Transit> dao = getDAO();
+
+        List<Transit> transits = Lists.newArrayList();
+        Table table = db.getTable("CAMPAGNES");
+        for (Map<String, Object> row : table) {
+
+            String voyageName = (String) row.get("CAMPAGNE");
+            Voyage voyage = voyagesByName.get(voyageName.toLowerCase());
+            Date startTime = voyage.getStartDate();
+            Date endTime = voyage.getEndDate();
+            Transit transit = dao.create(
+                    Transit.PROPERTY_DESCRIPTION, "Cruise",
+                    Transit.PROPERTY_START_TIME, startTime,
+                    Transit.PROPERTY_END_TIME, endTime
+            );
+            transits.add(transit);
+            voyage.addTransit(transit);
+        }
+        if (log.isInfoEnabled()) {
+            log.info("Found " + transits.size() + " transit(s).");
+        }
+    }
+
+}
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TransitLoader.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselLoader.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -26,14 +26,12 @@
 import com.google.common.collect.Sets;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Table;
-import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
 import fr.ifremer.echobase.entities.references.Vessel;
-import fr.ifremer.echobase.entities.references.VesselDAO;
 import fr.ifremer.echobase.tools.FileType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
 
 import java.io.IOException;
 import java.util.Map;
@@ -68,11 +66,9 @@
             log.info("Found " + names.size() + " vessel(s).");
         }
 
-        TopiaContext tx = serviceContext.getTransaction();
-        VesselDAO dao = EchoBaseDAOHelper.getVesselDAO(tx);
-        for (String typeCampagne : names) {
-            Vessel vessel =
-                    dao.create(Vessel.PROPERTY_NAME, typeCampagne);
+        TopiaDAO<Vessel> dao = getDAO();
+        for (String name : names) {
+            Vessel vessel = dao.create(Vessel.PROPERTY_NAME, name);
             if (log.isInfoEnabled()) {
                 log.info("Created vessel : " + vessel.getName());
             }

Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java	                        (rev 0)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import fr.ifremer.echobase.entities.meta.TableMeta;
+import fr.ifremer.echobase.entities.references.VesselType;
+import fr.ifremer.echobase.services.models.EntityCsvModel;
+import fr.ifremer.echobase.tools.FileType;
+
+/**
+ * Loader of {@link VesselType}.
+ * <p/>
+ * TODO Import it.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class VesselTypeLoader extends EntityLoader<VesselType> {
+
+    public VesselTypeLoader() {
+        super(VesselType.class, FileType.NEW);
+    }
+
+    @Override
+    protected EntityCsvModel<VesselType> createCsvImportModel(TableMeta meta) {
+
+        EntityCsvModel<VesselType> model = EntityCsvModel.newModel(
+                getCsvSeparator(),
+                meta
+        );
+        model.newMandatoryColumn(VesselType.PROPERTY_NAME);
+        return model;
+    }
+
+
+}
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java
===================================================================
--- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java	                        (rev 0)
+++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,117 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.healthmarketscience.jackcess.Database;
+import com.healthmarketscience.jackcess.Table;
+import fr.ifremer.echobase.entities.data.Voyage;
+import fr.ifremer.echobase.entities.references.AreaOfOperation;
+import fr.ifremer.echobase.entities.references.Mission;
+import fr.ifremer.echobase.tools.FileType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.persistence.TopiaDAO;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Loader of {@link Voyage}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class VoyageLoader extends EntityLoader<Voyage> {
+
+    /** Logger. */
+    private static final Log log =
+            LogFactory.getLog(AcousticInstrumentLoader.class);
+
+    public VoyageLoader() {
+        super(Voyage.class,
+//              new EchoBaseEntityEnum[]{ EchoBaseEntityEnum.Echotype},
+              FileType.BARACOUDA);
+    }
+
+    @Override
+    protected void importBaracoudaEntities(Database db) throws IOException, TopiaException {
+
+        List<Mission> missions = getEntities(Mission.class);
+        Map<String, Mission> missionsByName = Maps.uniqueIndex(missions, new Function<Mission, String>() {
+            @Override
+            public String apply(Mission input) {
+                return input.getName().toLowerCase();
+            }
+        });
+
+        List<AreaOfOperation> areaOfOperations = getEntities(AreaOfOperation.class);
+        Map<String, AreaOfOperation> areaOfOperationsByName = Maps.uniqueIndex(areaOfOperations, new Function<AreaOfOperation, String>() {
+            @Override
+            public String apply(AreaOfOperation input) {
+                return input.getName().toLowerCase();
+            }
+        });
+        TopiaDAO<Voyage> dao = getDAO();
+
+        List<Voyage> entities = Lists.newArrayList();
+        Table table = db.getTable("CAMPAGNES");
+        for (Map<String, Object> row : table) {
+            String voyageName = (String) row.get("CAMPAGNE");
+            String missionName = (String) row.get("TYPE_CAMPAGNE");
+            Mission mission = missionsByName.get(missionName.toLowerCase());
+            String areaOfOperationName = (String) row.get("ZONE");
+            AreaOfOperation areaOfOperation = areaOfOperationsByName.get(areaOfOperationName.toLowerCase());
+            Date startDate = (Date) row.get("DATE_DEPART");
+            Date endDate = (Date) row.get("DATE_ARRIVEE");
+            String startPort = (String) row.get("PORT_DEPART");
+            String endPort = (String) row.get("PORT_ARRIVEE");
+            String comment = (String) row.get("COMMENTAIRE");
+
+            Voyage entity = dao.create(
+                    Voyage.PROPERTY_NAME, voyageName,
+                    Voyage.PROPERTY_MISSION, mission,
+                    Voyage.PROPERTY_AREA_OF_OPERATION, areaOfOperation,
+                    Voyage.PROPERTY_START_DATE, startDate,
+                    Voyage.PROPERTY_END_DATE, endDate,
+                    Voyage.PROPERTY_START_PORT, startPort,
+                    Voyage.PROPERTY_END_PORT, endPort,
+                    Voyage.PROPERTY_DESCRIPTION, comment
+            );
+            entities.add(entity);
+
+            // obtain all echotypes for this voyage
+
+        }
+        if (log.isInfoEnabled()) {
+            log.info("Found " + entities.size() + " voyage(s).");
+        }
+    }
+
+}
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/main/resources/csv/association/Transit_transect.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/association/Transit_transect.csv	                        (rev 0)
+++ trunk/echobase-tools/src/main/resources/csv/association/Transit_transect.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,43 @@
+topiaId;transect
+fr.ifremer.echobase.entities.data.Transit#1323320544653#0.42197526215246806;fr.ifremer.echobase.entities.data.Transect#1323320718854#0.16496474136164707;
+fr.ifremer.echobase.entities.data.Transit#1323320544657#0.793955419938976;fr.ifremer.echobase.entities.data.Transect#1323320718871#0.43811591058938393;
+fr.ifremer.echobase.entities.data.Transit#1323320544658#0.49318285166930464;fr.ifremer.echobase.entities.data.Transect#1323320718873#0.22590776454798145;
+fr.ifremer.echobase.entities.data.Transit#1323320544659#0.7109241959164326;fr.ifremer.echobase.entities.data.Transect#1323320718879#0.22762589557527313;
+fr.ifremer.echobase.entities.data.Transit#1323320544660#0.16422798833446173;fr.ifremer.echobase.entities.data.Transect#1323320718880#0.8675763932708581;
+fr.ifremer.echobase.entities.data.Transit#1323320544663#0.8906451141766373;fr.ifremer.echobase.entities.data.Transect#1323320718882#0.8313008850992559;
+fr.ifremer.echobase.entities.data.Transit#1323320544665#0.11831664240407658;fr.ifremer.echobase.entities.data.Transect#1323320718883#0.02090206540995454;
+fr.ifremer.echobase.entities.data.Transit#1323320544666#0.8309964238365404;fr.ifremer.echobase.entities.data.Transect#1323320718889#0.48341511290981376;
+fr.ifremer.echobase.entities.data.Transit#1323320544666#0.4221066981307239;fr.ifremer.echobase.entities.data.Transect#1323320718890#0.9228759996243251;
+fr.ifremer.echobase.entities.data.Transit#1323320544667#0.5486234276187558;fr.ifremer.echobase.entities.data.Transect#1323320718891#0.14412591039674894;
+fr.ifremer.echobase.entities.data.Transit#1323320544668#0.6422242362291657;fr.ifremer.echobase.entities.data.Transect#1323320718892#0.2630535664991509;
+fr.ifremer.echobase.entities.data.Transit#1323320544669#0.4133776331975709;fr.ifremer.echobase.entities.data.Transect#1323320718896#0.5644879956116315;
+fr.ifremer.echobase.entities.data.Transit#1323320544670#0.053298123205487546;fr.ifremer.echobase.entities.data.Transect#1323320718897#0.6866101322356634;
+fr.ifremer.echobase.entities.data.Transit#1323320544671#0.47245185863582717;fr.ifremer.echobase.entities.data.Transect#1323320718898#0.15476162598793997;
+fr.ifremer.echobase.entities.data.Transit#1323320544672#0.22937541587424826;fr.ifremer.echobase.entities.data.Transect#1323320718904#0.41986337020591025;
+fr.ifremer.echobase.entities.data.Transit#1323320544673#0.578376489040041;fr.ifremer.echobase.entities.data.Transect#1323320718908#0.31990422173935795;
+fr.ifremer.echobase.entities.data.Transit#1323320544678#0.7693855379965776;fr.ifremer.echobase.entities.data.Transect#1323320718916#0.7828994640243007;
+fr.ifremer.echobase.entities.data.Transit#1323320544679#0.3505919461457373;fr.ifremer.echobase.entities.data.Transect#1323320718917#0.5204678684295829;
+fr.ifremer.echobase.entities.data.Transit#1323320544679#0.846655793463204;fr.ifremer.echobase.entities.data.Transect#1323320718922#0.2531141442003776;
+fr.ifremer.echobase.entities.data.Transit#1323320544680#0.3277389642475089;fr.ifremer.echobase.entities.data.Transect#1323320718923#0.615133835112941;
+fr.ifremer.echobase.entities.data.Transit#1323320544681#0.8651972319858928;fr.ifremer.echobase.entities.data.Transect#1323320718924#0.934706270228778;
+fr.ifremer.echobase.entities.data.Transit#1323320544682#0.2565267980712128;fr.ifremer.echobase.entities.data.Transect#1323320718929#0.6609608451095067;
+fr.ifremer.echobase.entities.data.Transit#1323320544683#0.44005376597751444;fr.ifremer.echobase.entities.data.Transect#1323320718930#0.17966889271931497;
+fr.ifremer.echobase.entities.data.Transit#1323320544684#0.10308863056611683;fr.ifremer.echobase.entities.data.Transect#1323320718931#0.5478985568987733;
+fr.ifremer.echobase.entities.data.Transit#1323320544685#0.6495413567325516;fr.ifremer.echobase.entities.data.Transect#1323320718941#0.3684605503902849;
+fr.ifremer.echobase.entities.data.Transit#1323320544686#0.24477664069068616;fr.ifremer.echobase.entities.data.Transect#1323320718945#0.7746317527045835;
+fr.ifremer.echobase.entities.data.Transit#1323320544687#0.5034231567862362;fr.ifremer.echobase.entities.data.Transect#1323320718946#0.6817852081485376;
+fr.ifremer.echobase.entities.data.Transit#1323320544689#0.2256772840219713;fr.ifremer.echobase.entities.data.Transect#1323320718947#0.6234180587856287;
+fr.ifremer.echobase.entities.data.Transit#1323320544690#0.5683246549515286;fr.ifremer.echobase.entities.data.Transect#1323320718948#0.03286565097316285;
+fr.ifremer.echobase.entities.data.Transit#1323320544690#0.1496511628529995;fr.ifremer.echobase.entities.data.Transect#1323320718953#0.6429210446164039;
+fr.ifremer.echobase.entities.data.Transit#1323320544691#0.9409630901898548;fr.ifremer.echobase.entities.data.Transect#1323320718956#0.151985601133512;
+fr.ifremer.echobase.entities.data.Transit#1323320544692#0.09296507577201119;fr.ifremer.echobase.entities.data.Transect#1323320718960#0.021415926234680804;
+fr.ifremer.echobase.entities.data.Transit#1323320544693#0.2776537176251803;fr.ifremer.echobase.entities.data.Transect#1323320718961#0.3572556134816314;
+fr.ifremer.echobase.entities.data.Transit#1323320544694#0.08774570394067749;fr.ifremer.echobase.entities.data.Transect#1323320718966#0.34006625430138016;
+fr.ifremer.echobase.entities.data.Transit#1323320544695#0.40728382328739476;fr.ifremer.echobase.entities.data.Transect#1323320718967#0.5585008703711315;
+fr.ifremer.echobase.entities.data.Transit#1323320544696#0.14133735498080002;fr.ifremer.echobase.entities.data.Transect#1323320718968#0.6897790607172997;
+fr.ifremer.echobase.entities.data.Transit#1323320544697#0.4723694725893558;fr.ifremer.echobase.entities.data.Transect#1323320718971#0.04147802141850254;
+fr.ifremer.echobase.entities.data.Transit#1323320544698#0.18960274209427297;fr.ifremer.echobase.entities.data.Transect#1323320718974#0.9586055041722416;
+fr.ifremer.echobase.entities.data.Transit#1323320544699#0.37240320237016433;fr.ifremer.echobase.entities.data.Transect#1323320718975#0.0995293616473204;
+fr.ifremer.echobase.entities.data.Transit#1323320544700#0.749306020024636;fr.ifremer.echobase.entities.data.Transect#1323320718978#0.6335534900534213;
+fr.ifremer.echobase.entities.data.Transit#1323320544701#0.10456654278071209;fr.ifremer.echobase.entities.data.Transect#1323320718983#0.4171279906214215;
+fr.ifremer.echobase.entities.data.Transit#1323320544702#0.6416234129528282;fr.ifremer.echobase.entities.data.Transect#1323320718990#0.9854326934832759;
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/resources/csv/association/Transit_transect.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/main/resources/csv/association/Voyage_transit.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/association/Voyage_transit.csv	                        (rev 0)
+++ trunk/echobase-tools/src/main/resources/csv/association/Voyage_transit.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,43 @@
+topiaId;transit
+fr.ifremer.echobase.entities.data.Voyage#1323303023495#0.36706645473250754;fr.ifremer.echobase.entities.data.Transit#1323320544653#0.42197526215246806;
+fr.ifremer.echobase.entities.data.Voyage#1323303023503#0.09567385479638657;fr.ifremer.echobase.entities.data.Transit#1323320544657#0.793955419938976;
+fr.ifremer.echobase.entities.data.Voyage#1323303023504#0.9677819531722206;fr.ifremer.echobase.entities.data.Transit#1323320544658#0.49318285166930464;
+fr.ifremer.echobase.entities.data.Voyage#1323303023505#0.4262528713105248;fr.ifremer.echobase.entities.data.Transit#1323320544659#0.7109241959164326;
+fr.ifremer.echobase.entities.data.Voyage#1323303023506#0.1062254778763495;fr.ifremer.echobase.entities.data.Transit#1323320544660#0.16422798833446173;
+fr.ifremer.echobase.entities.data.Voyage#1323303023507#0.07825220610379435;fr.ifremer.echobase.entities.data.Transit#1323320544663#0.8906451141766373;
+fr.ifremer.echobase.entities.data.Voyage#1323303023507#0.9404442865659914;fr.ifremer.echobase.entities.data.Transit#1323320544665#0.11831664240407658;
+fr.ifremer.echobase.entities.data.Voyage#1323303023508#0.8194263055341403;fr.ifremer.echobase.entities.data.Transit#1323320544666#0.8309964238365404;
+fr.ifremer.echobase.entities.data.Voyage#1323303023509#0.6276894783839798;fr.ifremer.echobase.entities.data.Transit#1323320544666#0.4221066981307239;
+fr.ifremer.echobase.entities.data.Voyage#1323303023510#0.8543928026040171;fr.ifremer.echobase.entities.data.Transit#1323320544667#0.5486234276187558;
+fr.ifremer.echobase.entities.data.Voyage#1323303023511#0.8925091841705969;fr.ifremer.echobase.entities.data.Transit#1323320544668#0.6422242362291657;
+fr.ifremer.echobase.entities.data.Voyage#1323303023512#0.7596092994912406;fr.ifremer.echobase.entities.data.Transit#1323320544669#0.4133776331975709;
+fr.ifremer.echobase.entities.data.Voyage#1323303023513#0.25382672822496855;fr.ifremer.echobase.entities.data.Transit#1323320544670#0.053298123205487546;
+fr.ifremer.echobase.entities.data.Voyage#1323303023513#0.5820561569184488;fr.ifremer.echobase.entities.data.Transit#1323320544671#0.47245185863582717;
+fr.ifremer.echobase.entities.data.Voyage#1323303023514#0.24667523668314195;fr.ifremer.echobase.entities.data.Transit#1323320544672#0.22937541587424826;
+fr.ifremer.echobase.entities.data.Voyage#1323303023516#0.16660749895879945;fr.ifremer.echobase.entities.data.Transit#1323320544673#0.578376489040041;
+fr.ifremer.echobase.entities.data.Voyage#1323303023520#0.3173583906959343;fr.ifremer.echobase.entities.data.Transit#1323320544678#0.7693855379965776;
+fr.ifremer.echobase.entities.data.Voyage#1323303023521#0.13240865039763816;fr.ifremer.echobase.entities.data.Transit#1323320544679#0.3505919461457373;
+fr.ifremer.echobase.entities.data.Voyage#1323303023522#0.03920949944365959;fr.ifremer.echobase.entities.data.Transit#1323320544679#0.846655793463204;
+fr.ifremer.echobase.entities.data.Voyage#1323303023523#0.712206579078481;fr.ifremer.echobase.entities.data.Transit#1323320544680#0.3277389642475089;
+fr.ifremer.echobase.entities.data.Voyage#1323303023524#0.3165864309920038;fr.ifremer.echobase.entities.data.Transit#1323320544681#0.8651972319858928;
+fr.ifremer.echobase.entities.data.Voyage#1323303023525#0.21007197696149016;fr.ifremer.echobase.entities.data.Transit#1323320544682#0.2565267980712128;
+fr.ifremer.echobase.entities.data.Voyage#1323303023526#0.32215301271063745;fr.ifremer.echobase.entities.data.Transit#1323320544683#0.44005376597751444;
+fr.ifremer.echobase.entities.data.Voyage#1323303023526#0.13500421160044418;fr.ifremer.echobase.entities.data.Transit#1323320544684#0.10308863056611683;
+fr.ifremer.echobase.entities.data.Voyage#1323303023527#0.8798610330859603;fr.ifremer.echobase.entities.data.Transit#1323320544685#0.6495413567325516;
+fr.ifremer.echobase.entities.data.Voyage#1323303023528#0.09634018765517882;fr.ifremer.echobase.entities.data.Transit#1323320544686#0.24477664069068616;
+fr.ifremer.echobase.entities.data.Voyage#1323303023529#0.7745000263711423;fr.ifremer.echobase.entities.data.Transit#1323320544687#0.5034231567862362;
+fr.ifremer.echobase.entities.data.Voyage#1323303023531#0.4706443465353609;fr.ifremer.echobase.entities.data.Transit#1323320544689#0.2256772840219713;
+fr.ifremer.echobase.entities.data.Voyage#1323303023533#0.27747720635320694;fr.ifremer.echobase.entities.data.Transit#1323320544690#0.5683246549515286;
+fr.ifremer.echobase.entities.data.Voyage#1323303023534#0.290907921617367;fr.ifremer.echobase.entities.data.Transit#1323320544690#0.1496511628529995;
+fr.ifremer.echobase.entities.data.Voyage#1323303023535#0.8450134097016887;fr.ifremer.echobase.entities.data.Transit#1323320544691#0.9409630901898548;
+fr.ifremer.echobase.entities.data.Voyage#1323303023536#0.09262596174917548;fr.ifremer.echobase.entities.data.Transit#1323320544692#0.09296507577201119;
+fr.ifremer.echobase.entities.data.Voyage#1323303023537#0.1146978858099349;fr.ifremer.echobase.entities.data.Transit#1323320544693#0.2776537176251803;
+fr.ifremer.echobase.entities.data.Voyage#1323303023538#0.8559728139816168;fr.ifremer.echobase.entities.data.Transit#1323320544694#0.08774570394067749;
+fr.ifremer.echobase.entities.data.Voyage#1323303023539#0.7229716827342229;fr.ifremer.echobase.entities.data.Transit#1323320544695#0.40728382328739476;
+fr.ifremer.echobase.entities.data.Voyage#1323303023540#0.19030397344315386;fr.ifremer.echobase.entities.data.Transit#1323320544696#0.14133735498080002;
+fr.ifremer.echobase.entities.data.Voyage#1323303023541#0.14135887168462702;fr.ifremer.echobase.entities.data.Transit#1323320544697#0.4723694725893558;
+fr.ifremer.echobase.entities.data.Voyage#1323303023549#0.4511463913210365;fr.ifremer.echobase.entities.data.Transit#1323320544698#0.18960274209427297;
+fr.ifremer.echobase.entities.data.Voyage#1323303023550#0.31302522399517285;fr.ifremer.echobase.entities.data.Transit#1323320544699#0.37240320237016433;
+fr.ifremer.echobase.entities.data.Voyage#1323303023553#0.19839460156228705;fr.ifremer.echobase.entities.data.Transit#1323320544700#0.749306020024636;
+fr.ifremer.echobase.entities.data.Voyage#1323303023554#0.8215190298890366;fr.ifremer.echobase.entities.data.Transit#1323320544701#0.10456654278071209;
+fr.ifremer.echobase.entities.data.Voyage#1323303023555#0.888427275309948;fr.ifremer.echobase.entities.data.Transit#1323320544702#0.6416234129528282;
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/resources/csv/association/Voyage_transit.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: trunk/echobase-tools/src/main/resources/csv/baracouda/Echotype.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/baracouda/Echotype.csv	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/resources/csv/baracouda/Echotype.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -1,50 +1,216 @@
-topiaId;depthStratum;echotypeCategory;lengthCategory;meaning;name;species
-fr.ifremer.echobase.entities.references.Echotype#1323195806347#0.4593468100225647;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D1;;
-fr.ifremer.echobase.entities.references.Echotype#1323195806352#0.2383351096030406;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
-fr.ifremer.echobase.entities.references.Echotype#1323195806573#0.1876986222492676;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D1;;
-fr.ifremer.echobase.entities.references.Echotype#1323195806573#0.3553738399622369;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
-fr.ifremer.echobase.entities.references.Echotype#1323195807610#0.1593731003057871;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D3;;
-fr.ifremer.echobase.entities.references.Echotype#1323195807695#0.06957905428538025;fr.ifremer.echobase.entities.references.DepthStratum#1323130442655#0.40925384899283856;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376878#0.935937394765954;;Température de surface --> transfére dans TempSurf;D4;;
-fr.ifremer.echobase.entities.references.Echotype#1323195807751#0.6799768010687669;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D3;;
-fr.ifremer.echobase.entities.references.Echotype#1323195807840#0.7797322877680625;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D3;;
-fr.ifremer.echobase.entities.references.Echotype#1323195807841#0.7022014790882867;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D4;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
-fr.ifremer.echobase.entities.references.Echotype#1323195807841#0.17753686637668753;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D6;;
-fr.ifremer.echobase.entities.references.Echotype#1323195807959#0.8986348038683848;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D4;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
-fr.ifremer.echobase.entities.references.Echotype#1323195807960#0.6690998772521702;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D5;;
-fr.ifremer.echobase.entities.references.Echotype#1323195807960#0.9016178787693311;fr.ifremer.echobase.entities.references.DepthStratum#1323130442655#0.40925384899283856;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376846#0.3245072187704323;;Couche planctonique (non renseigné sur l'ensemble de la campagne);D7;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808105#0.5698869402138907;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D1;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808105#0.19154941027295946;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D5;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808211#0.5035488108809038;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D1;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808212#0.14744963608105077;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
-fr.ifremer.echobase.entities.references.Echotype#1323195808212#0.8169502513784964;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D5;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808332#0.6205249930362902;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D1;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808332#0.8858998933552448;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
-fr.ifremer.echobase.entities.references.Echotype#1323195808332#0.06951778341826953;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D3;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
-fr.ifremer.echobase.entities.references.Echotype#1323195808332#0.1716487546482507;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
-fr.ifremer.echobase.entities.references.Echotype#1323195808332#0.8380107904973866;fr.ifremer.echobase.entities.references.DepthStratum#1323130442655#0.40925384899283856;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376846#0.3245072187704323;;;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
-fr.ifremer.echobase.entities.references.Echotype#1323195808374#0.6809836558092459;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D1;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808374#0.856436209998245;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
-fr.ifremer.echobase.entities.references.Echotype#1323195808374#0.8571054628254866;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
-fr.ifremer.echobase.entities.references.Echotype#1323195808499#0.7287881620638617;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D4;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808500#0.7994872862965123;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D6;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808580#0.39506016410498457;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D3;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808580#0.3842214307638231;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;(JUV05) bancs bleus en 120 non visible en 38;D5;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808580#0.9399490114458748;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D6;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808580#0.27827314580318707;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D7;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808581#0.5067373482838434;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376878#0.935937394765954;;(JUV05) grosse couche de nuit sous la surface;D8;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808581#0.8484786329987604;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D9;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808771#0.04846397022844906;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D1;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808771#0.5365938501328896;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D6;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808879#0.9481169610442292;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D6;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
-fr.ifremer.echobase.entities.references.Echotype#1323195808879#0.7733826483651796;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D7;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
-fr.ifremer.echobase.entities.references.Echotype#1323195808879#0.522864288202452;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D8;;
-fr.ifremer.echobase.entities.references.Echotype#1323195808996#0.9464181647742861;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D7;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
-fr.ifremer.echobase.entities.references.Echotype#1323195809132#0.5171231964249203;fr.ifremer.echobase.entities.references.DepthStratum#1323130442655#0.40925384899283856;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376878#0.935937394765954;;? A virer;D8;;
-fr.ifremer.echobase.entities.references.Echotype#1323195809317#0.2173716937864063;fr.ifremer.echobase.entities.references.DepthStratum#1323130442655#0.40925384899283856;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376878#0.935937394765954;;qq. Température de surface --> transfére dans TempSurf;D3;;
-fr.ifremer.echobase.entities.references.Echotype#1323195809347#0.8240395046512969;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D1;;
-fr.ifremer.echobase.entities.references.Echotype#1323195809347#0.14512080054713228;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
-fr.ifremer.echobase.entities.references.Echotype#1323195809347#0.558801491299687;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D3;;
-fr.ifremer.echobase.entities.references.Echotype#1323195809347#0.541684484881961;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
-fr.ifremer.echobase.entities.references.Echotype#1323195809347#0.9598778564423474;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D5;;
-fr.ifremer.echobase.entities.references.Echotype#1323195809347#0.8400784617938918;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D7;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
-fr.ifremer.echobase.entities.references.Echotype#1323195809347#0.401097434690203;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;;;D8;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
\ No newline at end of file
+topiaId;depthStratum;echotypeCategory;id;meaning;name;species
+fr.ifremer.echobase.entities.references.Echotype#1323284205292#0.8518075839289402;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;50;"(Pel07) Bancs de surface (Sardine, anchois et maquereau)";D10;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284205369#0.6352134903014366;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;50;"(Pel07) Bancs de surface (Sardine, anchois et maquereau)";D10;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284205421#0.32702655508394374;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;50;"(Pel07) Bancs de surface (Sardine, anchois et maquereau)";D10;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284205441#0.2320722418324156;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;65;Banc d'Anchois purs;D7;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284205463#0.9256623337089225;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;64;"Points bleus près du fond (Merlans leus, merlus et chinchards)";D5;fr.ifremer.echobase.entities.references.Species#1323183898723#0.4657252169816988;
+fr.ifremer.echobase.entities.references.Echotype#1323284205489#0.6845143172250965;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;64;"Points bleus près du fond (Merlans leus, merlus et chinchards)";D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205506#0.6727085497267945;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;64;"Points bleus près du fond (Merlans leus, merlus et chinchards)";D5;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284205528#0.7483474605887602;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;64;"Points bleus près du fond (Merlans leus, merlus et chinchards)";D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205550#0.8973731873845845;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;64;"Points bleus près du fond (Merlans leus, merlus et chinchards)";D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205569#0.7319324353449131;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;66;Banc de Sardines pur;D8;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284205589#0.8928897328242728;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;62;"Merlans bleus, myctophidés et capros présents au large";D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205607#0.8126244414780128;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;62;"Merlans bleus, myctophidés et capros présents au large";D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205623#0.8243843341062618;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;60;"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";D1;fr.ifremer.echobase.entities.references.Species#1323183898723#0.4657252169816988;
+fr.ifremer.echobase.entities.references.Echotype#1323284205645#0.6415471690966841;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;60;"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205665#0.012339076093922374;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;60;"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";D1;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284205685#0.6304614518016449;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;60;"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";D1;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284205704#0.46704327741286533;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;60;"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284205725#0.34093787038955226;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;60;"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205744#0.03146965649210387;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;60;"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205762#0.04388857835404636;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;34;(JUV05) poisson clairsemé en surface;D7;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284205780#0.1510164423607413;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;34;(JUV05) poisson clairsemé en surface;D7;fr.ifremer.echobase.entities.references.Species#1323183898942#0.9511729470180373;
+fr.ifremer.echobase.entities.references.Echotype#1323284205797#0.3673564460147408;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;34;(JUV05) poisson clairsemé en surface;D7;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284205816#0.7812829040063348;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;34;(JUV05) poisson clairsemé en surface;D7;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284205834#0.3674901349187044;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;34;(JUV05) poisson clairsemé en surface;D7;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284205858#0.9855848963455235;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;34;(JUV05) poisson clairsemé en surface;D7;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205881#0.11248498840853471;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;34;(JUV05) poisson clairsemé en surface;D7;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284205905#0.9601015720367673;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;34;(JUV05) poisson clairsemé en surface;D7;;
+fr.ifremer.echobase.entities.references.Echotype#1323284205932#0.5027293637691141;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;36;(JUV05) poisson clairsemé sur toute la tranche d'eau;D9;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284205954#0.10997998743672943;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;36;(JUV05) poisson clairsemé sur toute la tranche d'eau;D9;fr.ifremer.echobase.entities.references.Species#1323183898942#0.9511729470180373;
+fr.ifremer.echobase.entities.references.Echotype#1323284205984#0.2598210682769916;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;36;(JUV05) poisson clairsemé sur toute la tranche d'eau;D9;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206006#0.8350572431556507;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;36;(JUV05) poisson clairsemé sur toute la tranche d'eau;D9;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284206027#0.6551320786809235;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;36;(JUV05) poisson clairsemé sur toute la tranche d'eau;D9;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206055#0.98117386707445;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;36;(JUV05) poisson clairsemé sur toute la tranche d'eau;D9;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206083#0.008611757401793874;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;36;(JUV05) poisson clairsemé sur toute la tranche d'eau;D9;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284206111#0.6954531704862683;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;36;(JUV05) poisson clairsemé sur toute la tranche d'eau;D9;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206132#0.22452449820540843;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;61;"Bancs bien distincts: Anchois, Sardines Sprats et Harengs situés entre le fond et 50m au dessus du fond";D2;fr.ifremer.echobase.entities.references.Species#1323183898606#0.9240203343809948;
+fr.ifremer.echobase.entities.references.Echotype#1323284206156#0.9309579890730224;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;61;"Bancs bien distincts: Anchois, Sardines Sprats et Harengs situés entre le fond et 50m au dessus du fond";D2;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284206178#0.8873986146606001;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;61;"Bancs bien distincts: Anchois, Sardines Sprats et Harengs situés entre le fond et 50m au dessus du fond";D2;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206194#0.6327774175848143;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;61;"Bancs bien distincts: Anchois, Sardines Sprats et Harengs situés entre le fond et 50m au dessus du fond";D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284206210#0.8375085126235706;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;33;(JUV05) catégorie non classifiable;D6;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284206226#0.09934579274863131;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;33;(JUV05) catégorie non classifiable;D6;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206245#0.7090439471782567;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;33;(JUV05) catégorie non classifiable;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284206261#0.6232889948184872;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;33;(JUV05) catégorie non classifiable;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206277#0.8771820497182593;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;33;(JUV05) catégorie non classifiable;D6;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284206294#0.07708616031637039;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;33;(JUV05) catégorie non classifiable;D6;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284206314#0.3071416116542145;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;33;(JUV05) catégorie non classifiable;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206330#0.3166592275062916;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;47;(PEL07) bancs de sardine;D6;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206348#0.1741890738520031;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;44;(Pel06) Melange de D1 et D2 non différenciable;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206363#0.5940038775891957;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;44;(Pel06) Melange de D1 et D2 non différenciable;D6;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284206383#0.9262827693758459;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;44;(Pel06) Melange de D1 et D2 non différenciable;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206400#0.5005856337844954;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;44;(Pel06) Melange de D1 et D2 non différenciable;D6;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206415#0.0956213044952754;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;44;(Pel06) Melange de D1 et D2 non différenciable;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284206431#0.7274864314701311;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;44;(Pel06) Melange de D1 et D2 non différenciable;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206447#0.9197903630972531;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;44;(Pel06) Melange de D1 et D2 non différenciable;D6;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284206464#0.4690395796209814;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;44;(Pel06) Melange de D1 et D2 non différenciable;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206479#0.07583888153928442;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;40;(JUV03) bancs bien formés à proximité de la surface (<35 m de profondeur);D4;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284206495#0.07723359998047497;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;40;(JUV03) bancs bien formés à proximité de la surface (<35 m de profondeur);D4;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206511#0.835859195305329;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;40;(JUV03) bancs bien formés à proximité de la surface (<35 m de profondeur);D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206526#0.5246557263694831;fr.ifremer.echobase.entities.references.DepthStratum#1323130442655#0.40925384899283856;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376846#0.3245072187704323;41;(JUV03) 'dragon bleu' - couche bleue de forme septentéiforme avec des noyaux plus dense);D6;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284206542#0.2005800412557307;fr.ifremer.echobase.entities.references.DepthStratum#1323130442655#0.40925384899283856;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376846#0.3245072187704323;41;(JUV03) 'dragon bleu' - couche bleue de forme septentéiforme avec des noyaux plus dense);D6;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206558#0.24049678619817305;fr.ifremer.echobase.entities.references.DepthStratum#1323130442655#0.40925384899283856;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376846#0.3245072187704323;41;(JUV03) 'dragon bleu' - couche bleue de forme septentéiforme avec des noyaux plus dense);D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206573#0.959635532745635;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;43;"(Pel06) petits bancs denses sous surface (sardine, anchois, maquereau, sprat)";D4;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284206589#0.006502323441057167;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;43;"(Pel06) petits bancs denses sous surface (sardine, anchois, maquereau, sprat)";D4;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206606#0.7273506528066628;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;43;"(Pel06) petits bancs denses sous surface (sardine, anchois, maquereau, sprat)";D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284206622#0.5734984272295567;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;43;"(Pel06) petits bancs denses sous surface (sardine, anchois, maquereau, sprat)";D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206638#0.029148467642098885;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;43;"(Pel06) petits bancs denses sous surface (sardine, anchois, maquereau, sprat)";D4;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284206657#0.6531891156661904;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;49;(Pel07) Détection au fond - mélange chinchard et maquereau;D8;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206675#0.7052920626571918;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;49;(Pel07) Détection au fond - mélange chinchard et maquereau;D8;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206695#0.5763851902922397;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;49;(Pel07) Détection au fond - mélange chinchard et maquereau;D8;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206713#0.0730106944079586;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;49;(Pel07) Détection au fond - mélange chinchard et maquereau;D8;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284206736#0.5128777431623311;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;49;(Pel07) Détection au fond - mélange chinchard et maquereau;D8;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206759#0.09062845739692205;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;42;(Pel06) diffuses et en petites boules près du fond (chinchard + maquereau + divers);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206784#0.9981338420087713;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;42;(Pel06) diffuses et en petites boules près du fond (chinchard + maquereau + divers);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206801#0.9217537525464157;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;42;(Pel06) diffuses et en petites boules près du fond (chinchard + maquereau + divers);D1;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284206818#0.08931236855890634;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;42;(Pel06) diffuses et en petites boules près du fond (chinchard + maquereau + divers);D1;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206835#0.8556493039631002;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;42;(Pel06) diffuses et en petites boules près du fond (chinchard + maquereau + divers);D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284206854#0.7123433089655804;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;42;(Pel06) diffuses et en petites boules près du fond (chinchard + maquereau + divers);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284206870#0.13147589121200598;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;51;(PEL08) D2 identifié sardine;D7;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206887#0.30068310595098413;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;50;"(Pel07) Bancs de surface (Sardine, anchois et maquereau)";D4;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284206903#0.2971900699708139;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;50;"(Pel07) Bancs de surface (Sardine, anchois et maquereau)";D4;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206920#0.25566741796928005;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;50;"(Pel07) Bancs de surface (Sardine, anchois et maquereau)";D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206937#0.8446130493750578;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;48;(Pel07) bancs de maquereau;D7;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284206953#0.8720802321816312;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;63;"Sardines, Maquereaux, Anchois situés proche de la surface";D4;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284206971#0.8648319406484107;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;63;"Sardines, Maquereaux, Anchois situés proche de la surface";D4;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284206990#0.41771276944722047;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;63;"Sardines, Maquereaux, Anchois situés proche de la surface";D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284207008#0.8050269579350692;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;63;"Sardines, Maquereaux, Anchois situés proche de la surface";D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284207026#0.9824928359684569;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;39;(JUV03) agrégats à proximité de la surface (<35 m de profondeur);D3;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207044#0.3495495566216409;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;39;(JUV03) agrégats à proximité de la surface (<35 m de profondeur);D3;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284207062#0.4245462448760411;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;39;(JUV03) agrégats à proximité de la surface (<35 m de profondeur);D3;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284207078#0.3432363593542387;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;38;(JUV03) bancs bien formés de pleine eau;D2;fr.ifremer.echobase.entities.references.Species#1323183898606#0.9240203343809948;
+fr.ifremer.echobase.entities.references.Echotype#1323284207096#0.3437502671954751;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;38;(JUV03) bancs bien formés de pleine eau;D2;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207112#0.20029299113921317;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;38;(JUV03) bancs bien formés de pleine eau;D2;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284207128#0.06752755384126541;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;38;(JUV03) bancs bien formés de pleine eau;D2;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284207145#0.6525009356735544;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;38;(JUV03) bancs bien formés de pleine eau;D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284207169#0.4015005139451483;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;37;(JUV03) agrégats ou bancs à proximité immédiate du fond (<10 m d'altitude);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207186#0.06899887398872628;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;37;(JUV03) agrégats ou bancs à proximité immédiate du fond (<10 m d'altitude);D1;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207211#0.5950019915771096;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;37;(JUV03) agrégats ou bancs à proximité immédiate du fond (<10 m d'altitude);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207235#0.08759968239275984;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;26;Diffuse près du fond (Chinchard + POUTASSOU + divers );D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207256#0.017264998233529227;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;26;Diffuse près du fond (Chinchard + POUTASSOU + divers );D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207273#0.4237822356412252;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;26;Diffuse près du fond (Chinchard + POUTASSOU + divers );D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284207296#0.3064592152653872;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;26;Diffuse près du fond (Chinchard + POUTASSOU + divers );D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207312#0.5355289054558214;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;25;Détection accores et large (merlan bleu et petit anchois PEGASE 97);D3;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207331#0.8158039896140288;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;25;Détection accores et large (merlan bleu et petit anchois PEGASE 97);D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207347#0.21556962532286306;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;24;(PEL04) D2 classique sans le maquereau;D2;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207363#0.5670841201893223;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;24;(PEL04) D2 classique sans le maquereau;D2;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284207379#0.1309770543750438;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;24;(PEL04) D2 classique sans le maquereau;D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284207397#0.3634729749950949;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;2;"""Fau D2"" - CHINCHARD en banc classique, dense et très mobile";D5;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284207416#0.13519099960424885;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;2;"""Fau D2"" - CHINCHARD en banc classique, dense et très mobile";D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207433#0.3951960732631218;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;2;"""Fau D2"" - CHINCHARD en banc classique, dense et très mobile";D4;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284207452#0.7193174550005467;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;2;"""Fau D2"" - CHINCHARD en banc classique, dense et très mobile";D4;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207468#0.48094501724986016;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;31;(JUV05) Détection en surface dont Juvenile d'anchois - diffuse et continue;D3;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207484#0.9559561215821321;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;31;(JUV05) Détection en surface dont Juvenile d'anchois - diffuse et continue;D3;fr.ifremer.echobase.entities.references.Species#1323183898942#0.9511729470180373;
+fr.ifremer.echobase.entities.references.Echotype#1323284207502#0.8658930501075716;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;31;(JUV05) Détection en surface dont Juvenile d'anchois - diffuse et continue;D3;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284207518#0.5059916919873677;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;31;(JUV05) Détection en surface dont Juvenile d'anchois - diffuse et continue;D3;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284207535#0.2876196643592862;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;31;(JUV05) Détection en surface dont Juvenile d'anchois - diffuse et continue;D3;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284207554#0.8209990113682663;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;31;(JUV05) Détection en surface dont Juvenile d'anchois - diffuse et continue;D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207570#0.32128792073892287;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;31;(JUV05) Détection en surface dont Juvenile d'anchois - diffuse et continue;D3;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284207589#0.27353999654818895;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;31;(JUV05) Détection en surface dont Juvenile d'anchois - diffuse et continue;D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207606#0.02523439615132861;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D4;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207636#0.10518136129775879;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D4;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284207655#0.781043986385396;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D4;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284207674#0.3961677181872624;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;14;Grands fléchards;D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207697#0.31463967875859955;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207714#0.6581045621633008;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D6;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284207731#0.006487182343765552;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D6;fr.ifremer.echobase.entities.references.Species#1323183898784#0.5935284035376864;
+fr.ifremer.echobase.entities.references.Echotype#1323284207750#0.6366191276161044;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207768#0.2623941380704894;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D6;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207784#0.8177866377041408;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D6;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284207802#0.38739327814931623;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D6;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284207819#0.3712636322269468;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D7;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284207836#0.7527816560632373;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D7;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284207853#0.5738192152616246;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;15;"Petits bancs denses en Surface (Sardine , anchois zone sud )";D7;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284207871#0.19261787029572985;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207889#0.4566814239682434;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207905#0.33604762107508823;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D1;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284207921#0.6543266625442016;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D1;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284207936#0.7540579843417419;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284207954#0.4246687365704406;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207971#0.3550966182139459;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;10;"Détection rupture pente accores (merlan bleu, myctophidés)";D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284207989#0.11280827010269545;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;10;"Détection rupture pente accores (merlan bleu, myctophidés)";D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208008#0.8380038512580619;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;11;Détection rupture pente accores et grands fonds (merlan bleu);D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208025#0.07246590880404069;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;11;Détection rupture pente accores et grands fonds (merlan bleu);D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208043#0.34058930400222276;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;10;"Détection rupture pente accores (merlan bleu, myctophidés)";D4;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208064#0.19895080328549042;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;10;"Détection rupture pente accores (merlan bleu, myctophidés)";D4;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208081#0.7987603112892008;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;10;"Détection rupture pente accores (merlan bleu, myctophidés)";D7;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208099#0.8011437516704495;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;10;"Détection rupture pente accores (merlan bleu, myctophidés)";D7;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208117#0.24832168264769872;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;21;(Pel03) Diffuse près du fond (Chinchard + divers + POUTASSOU);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208134#0.9117583250469508;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;21;(Pel03) Diffuse près du fond (Chinchard + divers + POUTASSOU);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208149#0.10648710715747223;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;21;(Pel03) Diffuse près du fond (Chinchard + divers + POUTASSOU);D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208166#0.24746719257665872;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;21;(Pel03) Diffuse près du fond (Chinchard + divers + POUTASSOU);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208181#0.8129649684394892;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;8;"Bancs classiques (Sardine, sprat, Anchois, Maquereau ) + grands fléchards";D2;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284208195#0.6538521368936705;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;8;"Bancs classiques (Sardine, sprat, Anchois, Maquereau ) + grands fléchards";D2;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284208211#0.4945278750621992;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;8;"Bancs classiques (Sardine, sprat, Anchois, Maquereau ) + grands fléchards";D2;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284208226#0.853187076813828;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;8;"Bancs classiques (Sardine, sprat, Anchois, Maquereau ) + grands fléchards";D2;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284208241#0.14868979729179266;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;8;"Bancs classiques (Sardine, sprat, Anchois, Maquereau ) + grands fléchards";D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284208265#0.8325531371282632;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208284#0.28106789844593905;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208301#0.02059496702945174;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D5;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284208317#0.7398938612264011;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D5;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284208332#0.08636549059352194;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D5;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208349#0.38578125195778834;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208366#0.41430754802210157;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208383#0.13419709749920683;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208398#0.054739040504797165;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284208414#0.18419754994167914;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284208429#0.7866306019916496;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D6;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208449#0.9750641290953207;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;22;(PEL04) déviation de type D1 avec du maquereau en plus;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208467#0.2544954947612651;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;11;Détection rupture pente accores et grands fonds (merlan bleu);D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208484#0.6208399861379822;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;11;Détection rupture pente accores et grands fonds (merlan bleu);D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208504#0.4274854119861745;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;20;(Pel03) Gros Bancs très denses et très mobiles de CHINCHARD;D5;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208522#0.4928590399885292;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;10;"Détection rupture pente accores (merlan bleu, myctophidés)";D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208539#0.678061040021686;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;10;"Détection rupture pente accores (merlan bleu, myctophidés)";D3;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208554#0.9367554026741045;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;23;(PEL04) Maquereau;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284208569#0.9697626402808397;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;23;(PEL04) Maquereau;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284208586#0.21083240435462736;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D2;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208601#0.18665622816026595;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D2;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208617#0.9578783165894269;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D2;fr.ifremer.echobase.entities.references.Species#1323183898784#0.5935284035376864;
+fr.ifremer.echobase.entities.references.Echotype#1323284208634#0.8171025085827384;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D2;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208652#0.41648650237936913;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;13;Diffuse près du fond (Chinchard + divers) + bancs de chinchards;D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208666#0.6358512513671997;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;13;Diffuse près du fond (Chinchard + divers) + bancs de chinchards;D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208685#0.13774103184803987;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;13;Diffuse près du fond (Chinchard + divers) + bancs de chinchards;D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208703#0.9034819020003422;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;18;(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208718#0.8989592387071674;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;18;(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer;D6;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284208733#0.9414034285098634;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;18;(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer;D6;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284208748#0.4513617253822404;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;18;(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284208763#0.8426227178498306;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;18;(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer;D6;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284208778#0.5595132194533983;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;18;(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer;D6;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284208796#0.9700502901457638;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;18;(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer;D6;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208815#0.7967132370991139;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;18;(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer;D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208832#0.7801178222157008;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208847#0.7649113111619383;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208862#0.2229406921371878;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.5935284035376864;
+fr.ifremer.echobase.entities.references.Echotype#1323284208879#0.7759958748672279;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;12;Diffuse près du fond (Chinchard + divers);D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208894#0.4223044313788632;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;2;"""Fau D2"" - CHINCHARD en banc classique, dense et très mobile";D1;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208912#0.7324056329732276;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;2;"""Fau D2"" - CHINCHARD en banc classique, dense et très mobile";D1;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208928#0.7686434229105303;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;30;"(Pel05) Chandelles (anchois, chinchard)";D6;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284208942#0.6010065698794724;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;30;"(Pel05) Chandelles (anchois, chinchard)";D6;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284208960#0.7832971579814831;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;30;"(Pel05) Chandelles (anchois, chinchard)";D6;;
+fr.ifremer.echobase.entities.references.Echotype#1323284208975#0.8102618910652098;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;29;"(Pel05) Bancs de surface (sardine, anchois, maquereau, sprat, chinchard)";D4;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284208990#0.7781807772627437;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;29;"(Pel05) Bancs de surface (sardine, anchois, maquereau, sprat, chinchard)";D4;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284209006#0.39521892403068304;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;29;"(Pel05) Bancs de surface (sardine, anchois, maquereau, sprat, chinchard)";D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284209021#0.16522585813141077;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;29;"(Pel05) Bancs de surface (sardine, anchois, maquereau, sprat, chinchard)";D4;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284209036#0.24918671245377932;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;29;"(Pel05) Bancs de surface (sardine, anchois, maquereau, sprat, chinchard)";D4;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284209051#0.3162925220631143;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;29;"(Pel05) Bancs de surface (sardine, anchois, maquereau, sprat, chinchard)";D4;fr.ifremer.echobase.entities.references.Species#1323183898784#0.6472333874788162;
+fr.ifremer.echobase.entities.references.Echotype#1323284209068#0.3497571500148887;fr.ifremer.echobase.entities.references.DepthStratum#1323130442656#0.3438170447145241;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;29;"(Pel05) Bancs de surface (sardine, anchois, maquereau, sprat, chinchard)";D4;;
+fr.ifremer.echobase.entities.references.Echotype#1323284209083#0.7666063236241601;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D1;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284209098#0.9477205790665866;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D1;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284209114#0.7511433825155591;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D1;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284209132#0.03126856067798023;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D1;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284209147#0.09990460426310899;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D1;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
+fr.ifremer.echobase.entities.references.Echotype#1323284209161#0.6986045182445567;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D2;fr.ifremer.echobase.entities.references.Species#1323183898609#0.11230475322322542;
+fr.ifremer.echobase.entities.references.Echotype#1323284209176#0.25894494475920493;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D2;fr.ifremer.echobase.entities.references.Species#1323183898607#0.6597513181914701;
+fr.ifremer.echobase.entities.references.Echotype#1323284209191#0.6367688417462207;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D2;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13623631467947173;
+fr.ifremer.echobase.entities.references.Echotype#1323284209208#0.09173848280167751;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D2;fr.ifremer.echobase.entities.references.Species#1323183898832#0.13717053384328737;
+fr.ifremer.echobase.entities.references.Echotype#1323284209223#0.6633237548921491;fr.ifremer.echobase.entities.references.DepthStratum#1323130442626#0.571760366977773;fr.ifremer.echobase.entities.references.EchotypeCategory#1323188376877#0.3339892718793188;7;"Bancs classiques (Sardine, sprat, Anchois, Maquereau )";D2;fr.ifremer.echobase.entities.references.Species#1323183898608#0.09129160671880698;
\ No newline at end of file

Added: trunk/echobase-tools/src/main/resources/csv/baracouda/Transect.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/baracouda/Transect.csv	                        (rev 0)
+++ trunk/echobase-tools/src/main/resources/csv/baracouda/Transect.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,43 @@
+topiaId;binSizePingAxis;binSizeRangeAxis;binUnitsPingAxis;citation;comment;dateCreated;datum;geospatialLatMax;geospatialLatMin;geospatialLonMax;geospatialLonMin;geospatialVerticalMax;geospatialVerticalMin;geospatialVerticalPositive;history;licence;linestring;localisation;metadata;timeCoverageEnd;timeCoverageStart;title;transectAbstract;vessel
+fr.ifremer.echobase.entities.data.Transect#1323320718854#0.16496474136164707;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718871#0.43811591058938393;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718873#0.22590776454798145;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718879#0.22762589557527313;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718880#0.8675763932708581;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718882#0.8313008850992559;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718883#0.02090206540995454;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718889#0.48341511290981376;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718890#0.9228759996243251;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718891#0.14412591039674894;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718892#0.2630535664991509;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718896#0.5644879956116315;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718897#0.6866101322356634;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718898#0.15476162598793997;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718904#0.41986337020591025;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718908#0.31990422173935795;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718916#0.7828994640243007;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672051#0.02434833661196656;
+fr.ifremer.echobase.entities.data.Transect#1323320718917#0.5204678684295829;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672052#0.6724497299526435;
+fr.ifremer.echobase.entities.data.Transect#1323320718922#0.2531141442003776;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672052#0.6724497299526435;
+fr.ifremer.echobase.entities.data.Transect#1323320718923#0.615133835112941;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672052#0.6724497299526435;
+fr.ifremer.echobase.entities.data.Transect#1323320718924#0.934706270228778;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672055#0.7049715347111914;
+fr.ifremer.echobase.entities.data.Transect#1323320718929#0.6609608451095067;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718930#0.17966889271931497;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718931#0.5478985568987733;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718941#0.3684605503902849;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718945#0.7746317527045835;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718946#0.6817852081485376;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718947#0.6234180587856287;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718948#0.03286565097316285;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718953#0.6429210446164039;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718956#0.151985601133512;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718960#0.021415926234680804;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718961#0.3572556134816314;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718966#0.34006625430138016;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718967#0.5585008703711315;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718968#0.6897790607172997;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672055#0.7049715347111914;
+fr.ifremer.echobase.entities.data.Transect#1323320718971#0.04147802141850254;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672054#0.6748983274029329;
+fr.ifremer.echobase.entities.data.Transect#1323320718974#0.9586055041722416;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672054#0.6748983274029329;
+fr.ifremer.echobase.entities.data.Transect#1323320718975#0.0995293616473204;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718978#0.6335534900534213;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;
+fr.ifremer.echobase.entities.data.Transect#1323320718983#0.4171279906214215;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
+fr.ifremer.echobase.entities.data.Transect#1323320718990#0.9854326934832759;1.0;variable;n.mi.;;from Baracouda;;;0.0;0.0;0.0;0.0;0.0;0.0;;;;;;;;;Cruise;;fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/resources/csv/baracouda/Transect.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/main/resources/csv/baracouda/Transit.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/baracouda/Transit.csv	                        (rev 0)
+++ trunk/echobase-tools/src/main/resources/csv/baracouda/Transit.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,43 @@
+topiaId;description;endLocality;endTime;relatedActivity;startLocality;startTime
+fr.ifremer.echobase.entities.data.Transit#1323320544653#0.42197526215246806;Cruise;;29/08/1990 00:00:00;;;10/08/1990 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544657#0.793955419938976;Cruise;;26/10/1991 00:00:00;;;07/10/1991 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544658#0.49318285166930464;Cruise;;14/05/1989 00:00:00;;;21/04/1989 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544659#0.7109241959164326;Cruise;;26/04/1990 00:00:00;;;10/04/1990 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544660#0.16422798833446173;Cruise;;29/04/1991 00:00:00;;;06/04/1991 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544663#0.8906451141766373;Cruise;;30/04/1992 00:00:00;;;13/04/1992 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544665#0.11831664240407658;Cruise;;05/05/1983 00:00:00;;;19/04/1983 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544666#0.8309964238365404;Cruise;;05/05/1983 00:00:00;;;19/04/1983 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544666#0.4221066981307239;Cruise;;16/05/1984 00:00:00;;;28/04/1984 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544667#0.5486234276187558;Cruise;;09/05/1985 00:00:00;;;18/04/1985 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544668#0.6422242362291657;Cruise;;27/06/1986 00:00:00;;;06/06/1986 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544669#0.4133776331975709;Cruise;;05/04/1987 00:00:00;;;16/03/1987 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544670#0.053298123205487546;Cruise;;23/06/1993 00:00:00;;;04/06/1993 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544671#0.47245185863582717;Cruise;;08/06/1994 00:00:00;;;15/05/1994 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544672#0.22937541587424826;Cruise;;16/10/2003 00:00:00;;;07/10/2003 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544673#0.578376489040041;Cruise;;17/10/2005 00:00:00;;;05/10/2005 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544678#0.7693855379965776;Cruise;;17/09/1999 00:00:00;;;04/09/1999 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544679#0.3505919461457373;Cruise;;29/07/2003 00:00:00;;;06/07/2003 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544679#0.846655793463204;Cruise;;31/12/2004 00:00:00;;;01/01/2004 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544680#0.3277389642475089;Cruise;;30/09/2005 00:00:00;;;25/09/2005 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544681#0.8651972319858928;Cruise;;11/06/2004 00:00:00;;;08/06/2004 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544682#0.2565267980712128;Cruise;;03/06/1997 00:00:00;;;06/05/1997 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544683#0.44005376597751444;Cruise;;21/06/1998 00:00:00;;;20/05/1998 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544684#0.10308863056611683;Cruise;;15/06/2000 00:00:00;;;15/05/2000 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544685#0.6495413567325516;Cruise;;06/06/2001 00:00:00;;;26/04/2001 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544686#0.24477664069068616;Cruise;;07/06/2002 00:00:00;;;07/05/2002 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544687#0.5034231567862362;Cruise;;24/06/2003 00:00:00;;;29/05/2003 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544689#0.2256772840219713;Cruise;;25/05/2004 00:00:00;;;27/04/2004 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544690#0.5683246549515286;Cruise;;31/05/2005 00:00:00;;;02/05/2005 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544690#0.1496511628529995;Cruise;;30/05/2006 00:00:00;;;01/05/2006 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544691#0.9409630901898548;Cruise;;26/05/2007 00:00:00;;;26/04/2007 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544692#0.09296507577201119;Cruise;;26/05/2008 00:00:00;;;27/04/2008 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544693#0.2776537176251803;Cruise;;04/06/2009 00:00:00;;;26/04/2009 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544694#0.08774570394067749;Cruise;;04/06/2010 00:00:00;;;26/04/2010 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544695#0.40728382328739476;Cruise;;12/10/2007 00:00:00;;;18/09/2007 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544696#0.14133735498080002;Cruise;;01/06/1999 00:00:00;;;20/05/1999 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544697#0.4723694725893558;Cruise;;25/06/1999 00:00:00;;;22/06/1999 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544698#0.18960274209427297;Cruise;;15/07/1999 00:00:00;;;12/07/1999 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544699#0.37240320237016433;Cruise;;20/12/1996 00:00:00;;;12/12/1996 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544700#0.749306020024636;Cruise;;20/12/1996 00:00:00;;;12/12/1996 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544701#0.10456654278071209;Cruise;;01/06/2004 00:00:00;;;27/05/2004 00:00:00;
+fr.ifremer.echobase.entities.data.Transit#1323320544702#0.6416234129528282;Cruise;;25/06/1996 00:00:00;;;15/06/1996 00:00:00;
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/resources/csv/baracouda/Transit.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: trunk/echobase-tools/src/main/resources/csv/baracouda/Vessel.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/baracouda/Vessel.csv	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/main/resources/csv/baracouda/Vessel.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -1,4 +1,4 @@
-topiaId;acknowledgement;altCallsign;callsign;imo;name;operator;vesselCode;vesselEnginePower;vesselLength;vesselNoiseDesign;vesselTonnage;vesselType
+topiaId;acknowledgement;altCallsign;callsign;imo;name;operator;code;enginePower;length;noiseDesign;tonnage;vesselType
 fr.ifremer.echobase.entities.references.Vessel#1323196672005#0.0486360470261461;;;;0;THALASSA I;;;0;0.0;;0.0;;
 fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855;;;;0;THALASSA II;;;0;0.0;;0.0;;
 fr.ifremer.echobase.entities.references.Vessel#1323196672051#0.02434833661196656;;;;0;GWEN-DREZ;;;0;0.0;;0.0;;

Added: trunk/echobase-tools/src/main/resources/csv/baracouda/Voyage.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/baracouda/Voyage.csv	                        (rev 0)
+++ trunk/echobase-tools/src/main/resources/csv/baracouda/Voyage.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,43 @@
+topiaId;areaOfOperation;datum;mission;description;endDate;endPort;name;startDate;startPort
+fr.ifremer.echobase.entities.data.Voyage#1323303023495#0.36706645473250754;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544314#0.7896268567294454;;29/08/1990 00:00:00;St Nazaire;AURA1990;10/08/1990 00:00:00;St Nazaire;
+fr.ifremer.echobase.entities.data.Voyage#1323303023503#0.09567385479638657;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544314#0.7896268567294454;;26/10/1991 00:00:00;;AURA1991;07/10/1991 00:00:00;;
+fr.ifremer.echobase.entities.data.Voyage#1323303023504#0.9677819531722206;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474322#0.5330563253304542;;fr.ifremer.echobase.entities.references.Mission#1323127544322#0.5631896168840276;;14/05/1989 00:00:00;St Nazaire;DAAG1989;21/04/1989 00:00:00;Bilbao;
+fr.ifremer.echobase.entities.data.Voyage#1323303023505#0.4262528713105248;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544322#0.5631896168840276;;26/04/1990 00:00:00;St Nazaire;DAAG1990;10/04/1990 00:00:00;St Nazaire;
+fr.ifremer.echobase.entities.data.Voyage#1323303023506#0.1062254778763495;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544322#0.5631896168840276;;29/04/1991 00:00:00;St Nazaire;DAAG1991;06/04/1991 00:00:00;Brest;
+fr.ifremer.echobase.entities.data.Voyage#1323303023507#0.07825220610379435;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544322#0.5631896168840276;;30/04/1992 00:00:00;St Nazaire;DAAG1992;13/04/1992 00:00:00;St Nazaire;
+fr.ifremer.echobase.entities.data.Voyage#1323303023507#0.9404442865659914;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544274#0.7939481378378231;;05/05/1983 00:00:00;Nantes;EIGAS1983;19/04/1983 00:00:00;Nantes;
+fr.ifremer.echobase.entities.data.Voyage#1323303023508#0.8194263055341403;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544274#0.7939481378378231;;05/05/1983 00:00:00;Nantes;EIGAS83b;19/04/1983 00:00:00;Nantes;
+fr.ifremer.echobase.entities.data.Voyage#1323303023509#0.6276894783839798;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544274#0.7939481378378231;;16/05/1984 00:00:00;;EIGAS1984;28/04/1984 00:00:00;4800N ;
+fr.ifremer.echobase.entities.data.Voyage#1323303023510#0.8543928026040171;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544274#0.7939481378378231;;09/05/1985 00:00:00;;EIGAS1985;18/04/1985 00:00:00;;
+fr.ifremer.echobase.entities.data.Voyage#1323303023511#0.8925091841705969;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544274#0.7939481378378231;;27/06/1986 00:00:00;;EIGAS1986;06/06/1986 00:00:00;;
+fr.ifremer.echobase.entities.data.Voyage#1323303023512#0.7596092994912406;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544274#0.7939481378378231;;05/04/1987 00:00:00;Nantes;EIGAS1987;16/03/1987 00:00:00;Nantes;
+fr.ifremer.echobase.entities.data.Voyage#1323303023513#0.25382672822496855;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.08648279689805949;;23/06/1993 00:00:00;St Nazaire;ERAG1993;04/06/1993 00:00:00;St Nazaire;
+fr.ifremer.echobase.entities.data.Voyage#1323303023513#0.5820561569184488;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.08648279689805949;;08/06/1994 00:00:00;St Nazaire;ERAG1994;15/05/1994 00:00:00;Concarneau;
+fr.ifremer.echobase.entities.data.Voyage#1323303023514#0.24667523668314195;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544313#0.17788792073354875;Prospectio juvénile d'anchois;16/10/2003 00:00:00;Lorient;JUVAGA2003;07/10/2003 00:00:00;La Pallice;
+fr.ifremer.echobase.entities.data.Voyage#1323303023516#0.16660749895879945;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544313#0.17788792073354875;Juveniles anchois;17/10/2005 00:00:00;Brest;JUVAGA2005;05/10/2005 00:00:00;Brest;
+fr.ifremer.echobase.entities.data.Voyage#1323303023520#0.3173583906959343;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544321#0.4573242294775681;Campagne sur les juveniles d'anchois;17/09/1999 00:00:00;non renseigné;JUVESU1999;04/09/1999 00:00:00;non renseigné;
+fr.ifremer.echobase.entities.data.Voyage#1323303023521#0.13240865039763816;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544310#0.7246429372414137;échantillon anchois de navire professionnel;29/07/2003 00:00:00;;JUVPRO2003;06/07/2003 00:00:00;;
+fr.ifremer.echobase.entities.data.Voyage#1323303023522#0.03920949944365959;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544310#0.7246429372414137;échantillon anchois de navire professionnel;31/12/2004 00:00:00;;JUVPRO2004;01/01/2004 00:00:00;;
+fr.ifremer.echobase.entities.data.Voyage#1323303023523#0.712206579078481;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544310#0.7246429372414137;"échantillon anchois de navires professionnels : Fou du roi, Vénètes, Vent de galerne lors de la campagne d'observation des juvéniles organisée par le CNPMEM en septembre 2005";30/09/2005 00:00:00;;JUVPRO2005;25/09/2005 00:00:00;;
+fr.ifremer.echobase.entities.data.Voyage#1323303023524#0.3165864309920038;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544324#0.5349635284883839;;11/06/2004 00:00:00;La Rochelle;MICRODYN-3;08/06/2004 00:00:00;La Pallice;
+fr.ifremer.echobase.entities.data.Voyage#1323303023525#0.21007197696149016;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544312#0.2405501137183701;Les valeurs d'écho de type D3 ont été supprimées : probablement essai de subdivision de D2;03/06/1997 00:00:00;St Nazaire;PEGASE1997;06/05/1997 00:00:00;Brest;
+fr.ifremer.echobase.entities.data.Voyage#1323303023526#0.32215301271063745;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544312#0.2405501137183701;;21/06/1998 00:00:00;St Nazaire;PEGASE1998;20/05/1998 00:00:00;Brest;
+fr.ifremer.echobase.entities.data.Voyage#1323303023526#0.13500421160044418;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544311#0.7638448048181886;Survey pélagiques Gascogne;15/06/2000 00:00:00;Brest;PELASSES2000;15/05/2000 00:00:00;Santander;
+fr.ifremer.echobase.entities.data.Voyage#1323303023527#0.8798610330859603;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544311#0.7638448048181886;;06/06/2001 00:00:00;Brest;PELASSES2001;26/04/2001 00:00:00;Santander;
+fr.ifremer.echobase.entities.data.Voyage#1323303023528#0.09634018765517882;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806;;07/06/2002 00:00:00;Brest;PELGAS2002;07/05/2002 00:00:00;Brest;
+fr.ifremer.echobase.entities.data.Voyage#1323303023529#0.7745000263711423;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806;test d'import;24/06/2003 00:00:00;;PELGAS2003;29/05/2003 00:00:00;;
+fr.ifremer.echobase.entities.data.Voyage#1323303023531#0.4706443465353609;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806;Survey pélagiques Gascogne;25/05/2004 00:00:00;Brest;PELGAS2004;27/04/2004 00:00:00;Santander;
+fr.ifremer.echobase.entities.data.Voyage#1323303023533#0.27747720635320694;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806;Survey pélagiques Gascogne;31/05/2005 00:00:00;BREST;PELGAS2005;02/05/2005 00:00:00;SANTANDER;
+fr.ifremer.echobase.entities.data.Voyage#1323303023534#0.290907921617367;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806;Survey pélagiques Gascogne;30/05/2006 00:00:00;Brest;PELGAS2006;01/05/2006 00:00:00;Santander;
+fr.ifremer.echobase.entities.data.Voyage#1323303023535#0.8450134097016887;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806;Survey;26/05/2007 00:00:00;BREST;PELGAS2007;26/04/2007 00:00:00;SANTANDER;
+fr.ifremer.echobase.entities.data.Voyage#1323303023536#0.09262596174917548;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806;Surevy pélagiques Gascogne;26/05/2008 00:00:00;Brest;PELGAS2008;27/04/2008 00:00:00;Santander;
+fr.ifremer.echobase.entities.data.Voyage#1323303023537#0.1146978858099349;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806; ;04/06/2009 00:00:00;Brest;PELGAS2009;26/04/2009 00:00:00;Santander;
+fr.ifremer.echobase.entities.data.Voyage#1323303023538#0.8559728139816168;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544316#0.05457739535846806; ;04/06/2010 00:00:00;Brest;PELGAS2010;26/04/2010 00:00:00;Santander;
+fr.ifremer.echobase.entities.data.Voyage#1323303023539#0.7229716827342229;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544313#0.17788792073354875;Campagne IEO - survey sur leg1 (18/08 --> 03/10)  - type JUVAGA leg2 IEO-IFREMER sur leg2 (05/10 --> 11/10);12/10/2007 00:00:00;Gijon;PELACUS2007;18/09/2007 00:00:00;Gijon;
+fr.ifremer.echobase.entities.data.Voyage#1323303023540#0.19030397344315386;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544317#0.7152726500932686;Etude du plancton en liaison avec le recrutement de l'anchois;01/06/1999 00:00:00;La Rochelle;PLAGIA3;20/05/1999 00:00:00;La Rochelle;
+fr.ifremer.echobase.entities.data.Voyage#1323303023541#0.14135887168462702;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544317#0.7152726500932686;determinisme du recrutement de l'anchois;25/06/1999 00:00:00;La Rochelle;PLAGIA4;22/06/1999 00:00:00;La Rochelle;
+fr.ifremer.echobase.entities.data.Voyage#1323303023549#0.4511463913210365;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544317#0.7152726500932686;determinisme du recrutement de l'anchois;15/07/1999 00:00:00;Saint Nazaire;PLAGIA5;12/07/1999 00:00:00;La Rochelle;
+fr.ifremer.echobase.entities.data.Voyage#1323303023550#0.31302522399517285;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544323#0.10146893652382649;;20/12/1996 00:00:00;St Nazaire;SILENCE1996;12/12/1996 00:00:00;Brest;
+fr.ifremer.echobase.entities.data.Voyage#1323303023553#0.19839460156228705;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544323#0.10146893652382649;;20/12/1996 00:00:00;St Nazaire;SILE96b;12/12/1996 00:00:00;Brest;
+fr.ifremer.echobase.entities.data.Voyage#1323303023554#0.8215190298890366;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622;;fr.ifremer.echobase.entities.references.Mission#1323127544318#0.08654569881185292;Campagne Programme SIMFAMI;01/06/2004 00:00:00;BREST;SIMFAMI2004;27/05/2004 00:00:00;BREST;
+fr.ifremer.echobase.entities.data.Voyage#1323303023555#0.888427275309948;fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474321#0.4343325342422426;;fr.ifremer.echobase.entities.references.Mission#1323127544315#0.4421101375437153;;25/06/1996 00:00:00;;THALES1996;15/06/1996 00:00:00;Brest;
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/resources/csv/baracouda/Voyage.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/main/resources/csv/new/Localisation.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/new/Localisation.csv	                        (rev 0)
+++ trunk/echobase-tools/src/main/resources/csv/new/Localisation.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1 @@
+topiaId;maxLatitude;minLatitude;maxLongitude;minLongitude;seafloorSubstrate;bathymetre
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/resources/csv/new/Localisation.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/main/resources/csv/new/VesselType.csv
===================================================================
--- trunk/echobase-tools/src/main/resources/csv/new/VesselType.csv	                        (rev 0)
+++ trunk/echobase-tools/src/main/resources/csv/new/VesselType.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1 @@
+topiaId;name
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/main/resources/csv/new/VesselType.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -29,7 +29,11 @@
 import fr.ifremer.echobase.entities.EchoBaseDAOHelper;
 import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
 import fr.ifremer.echobase.entities.meta.DbMeta;
-import fr.ifremer.echobase.services.*;
+import fr.ifremer.echobase.services.DbEditorService;
+import fr.ifremer.echobase.services.EchoBaseService;
+import fr.ifremer.echobase.services.EchoBaseServiceContext;
+import fr.ifremer.echobase.services.EchoBaseServiceContextImpl;
+import fr.ifremer.echobase.services.EchoBaseServiceFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.After;

Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbCreatorTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbCreatorTest.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbCreatorTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -23,11 +23,16 @@
  */
 package fr.ifremer.echobase.tools;
 
+import fr.ifremer.echobase.entities.meta.MetaFilenameAware;
 import fr.ifremer.echobase.tools.loaders.AbstractLoaderTest;
 import fr.ifremer.echobase.tools.loaders.EntityLoader;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.junit.*;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.nuiton.util.FileUtil;
 
 import java.io.File;
@@ -57,15 +62,15 @@
         AbstractLoaderTest.beforeClass();
 
         msAccessFile = FileUtil.getFileFromPaths(TestHelper.getBasedir(),
-                "src",
-                "test",
-                "private",
-                "baracouda.mdb"
+                                                 "src",
+                                                 "test",
+                                                 "private",
+                                                 "baracouda.mdb"
         );
         if (!msAccessFile.exists()) {
             if (log.isWarnEnabled()) {
                 log.warn("Could not find " + msAccessFile +
-                        ", the test will be skip.");
+                                 ", the test will be skip.");
             }
         }
         Assume.assumeTrue(msAccessFile.exists());
@@ -90,9 +95,15 @@
     @Test
     public void createEntities() throws Exception {
 
+        List<EntityLoader<?>> loaders = creator.getEntityLoaders();
+
+        for (EntityLoader<?> loader : loaders) {
+            assertFileNotExists(loader, FileType.values());
+        }
+
         creator.createEntities(msAccessFile, exportdir);
-        List<EntityLoader<?>> loaders = creator.getReferenceLoaders();
         for (EntityLoader<?> loader : loaders) {
+
             if (loader.canGenerateNew()) {
                 assertFileExists(loader, FileType.NEW);
             }
@@ -108,11 +119,16 @@
 
         if (log.isInfoEnabled()) {
             log.info("Generate echobase csv files in " +
-                    new File(exportdir, FileType.ECHOBASE.name().toLowerCase()));
+                             new File(exportdir, FileType.ECHOBASE.name().toLowerCase()));
         }
+        List<EntityLoader<?>> loaders = creator.getEntityLoaders();
+
+        for (EntityLoader<?> loader : loaders) {
+            assertFileNotExists(loader, FileType.values());
+        }
+
         creator.createEchoBaseEntities(exportdir);
 
-        List<EntityLoader<?>> loaders = creator.getReferenceLoaders();
         for (EntityLoader<?> loader : loaders) {
             assertFileExists(loader, FileType.ECHOBASE);
         }
@@ -121,23 +137,28 @@
     protected void assertFileExists(EntityLoader<?> loader,
                                     FileType... fileTypes) throws IOException {
 
-        assertFileExistsOrNot(loader, true, fileTypes);
+        assertFileExistsOrNot(loader, loader.getMeta(), true, fileTypes);
     }
 
     protected void assertFileNotExists(EntityLoader<?> loader,
                                        FileType... fileTypes) throws IOException {
 
-        assertFileExistsOrNot(loader, false, fileTypes);
+        assertFileExistsOrNot(loader, loader.getMeta(), false, fileTypes);
+
+        if (loader.getParentAssociationMeta() != null) {
+            assertFileExistsOrNot(loader, loader.getParentAssociationMeta(), false, fileTypes);
+        }
     }
 
     protected void assertFileExistsOrNot(EntityLoader<?> loader,
+                                         MetaFilenameAware meta,
                                          boolean shouldExists,
                                          FileType... fileTypes) throws IOException {
 
         for (FileType fileType : fileTypes) {
             File file = loader.getTableFile(
                     exportdir,
-                    loader.getEntityType(),
+                    meta,
                     fileType
             );
             if (shouldExists) {

Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderTest.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -23,10 +23,16 @@
  */
 package fr.ifremer.echobase.tools.loaders;
 
+import com.google.common.collect.Sets;
 import com.healthmarketscience.jackcess.Database;
 import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
+import fr.ifremer.echobase.entities.meta.AssociationMeta;
+import fr.ifremer.echobase.entities.meta.DbMeta;
+import fr.ifremer.echobase.entities.meta.MetaFilenameAware;
+import fr.ifremer.echobase.entities.meta.TableMeta;
 import fr.ifremer.echobase.services.CsvImportResult;
 import fr.ifremer.echobase.tools.AbstractToolTest;
+import fr.ifremer.echobase.tools.EchoBaseDbCreator;
 import fr.ifremer.echobase.tools.FileType;
 import fr.ifremer.echobase.tools.TestHelper;
 import org.apache.commons.logging.Log;
@@ -42,6 +48,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Set;
 
 /**
  * Abstract entity loader test.
@@ -69,21 +76,23 @@
 
     protected final long expectedBaracoudaEntities;
 
+    protected EchoBaseDbCreator echoBaseDbCreator;
+
     @BeforeClass
     public static void beforeClass() {
 
         AbstractToolTest.beforeClass();
 
         msAccessFile = FileUtil.getFileFromPaths(TestHelper.getBasedir(),
-                "src",
-                "test",
-                "private",
-                "baracouda.mdb"
+                                                 "src",
+                                                 "test",
+                                                 "private",
+                                                 "baracouda.mdb"
         );
         if (!msAccessFile.exists()) {
             if (log.isWarnEnabled()) {
                 log.warn("Could not find " + msAccessFile +
-                        ", the test will be skip.");
+                                 ", the test will be skip.");
             }
         }
         Assume.assumeTrue(msAccessFile.exists());
@@ -102,7 +111,12 @@
         // creates it
         FileUtil.createDirectoryIfNecessary(exportdir);
 
+        // get loader
         loader = newService(loaderType);
+
+        echoBaseDbCreator = newService(EchoBaseDbCreator.class);
+
+        loadDependencies();
     }
 
     protected AbstractLoaderTest(Class<L> loaderType,
@@ -162,25 +176,89 @@
         importEntities(outFile, expectedNewEntities + expectedBaracoudaEntities);
     }
 
-    protected <T extends EntityLoader<?>> void loadEchobaseFile(Class<T> loaderType) throws IOException, TopiaException {
-        T t = newService(loaderType);
+    protected void loadDependencies() throws IOException, TopiaException {
 
-        EchoBaseEntityEnum entityType = t.getEntityType();
-        if (log.isInfoEnabled()) {
-            log.info("Load for " + entityType);
+        Set<MetaFilenameAware> dones = Sets.newHashSet();
+        for (EchoBaseEntityEnum dependency : loader.getDependencies()) {
+            loadDependencies(dependency, dones);
         }
+        for (EchoBaseEntityEnum dependency : loader.getExtraDependencies()) {
+            loadDependencies(dependency, dones);
+        }
+        AssociationMeta parentAssociationMeta =
+                loader.getParentAssociationMeta();
+        if (parentAssociationMeta != null) {
+            loadDependencies(parentAssociationMeta.getSource(), dones);
+        }
+    }
 
-        if (t.canGenerateNew()) {
+    private void loadDependencies(EchoBaseEntityEnum dependency,
+                                  Set<MetaFilenameAware> dones) throws IOException, TopiaException {
+        DbMeta dbMeta = serviceContext.getDbMeta();
+        TableMeta meta = dbMeta.getTable(dependency);
+        loadDependencies(meta, dones);
+    }
 
-            // copy and load new stuff
-            t.copyAndLoadEntities(exportdir, entityType, true, FileType.NEW);
+    private void loadDependencies(MetaFilenameAware meta,
+                                  Set<MetaFilenameAware> dones) throws IOException, TopiaException {
+
+
+        // mark it as load (to prevent reloading of it twice)
+        if (!dones.add(meta)) {
+
+            // was already loaded
+            if (log.isWarnEnabled()) {
+                log.warn("Skip already loaded type " + meta);
+            }
+            return;
         }
 
-        if (t.canGenerateBaracouda()) {
+        EntityLoader<? extends TopiaEntity> entityLoader =
+                echoBaseDbCreator.getEntityLoader(meta.getSource().getContract());
 
-            // copy and load of baracouda stuff
-            t.copyAndLoadEntities(exportdir, entityType, true, FileType.BARACOUDA);
+        if (meta instanceof AssociationMeta) {
+
+            // import association
+
+            loadDependencies(meta.getSource(), dones);
+            loadDependencies(((AssociationMeta) meta).getTarget(), dones);
+            entityLoader.copyAndLoadEntities(exportdir, meta, true, FileType.ASSOCIATION);
+
+        } else {
+
+            // load dependencies before
+            for (EchoBaseEntityEnum dependency : entityLoader.getDependencies()) {
+                loadDependencies(dependency, dones);
+            }
+            // load extra dependencies before
+            for (EchoBaseEntityEnum dependency : entityLoader.getExtraDependencies()) {
+                loadDependencies(dependency, dones);
+            }
+
+            if (log.isInfoEnabled()) {
+                log.info("Load for " + meta);
+            }
+
+            if (entityLoader.canGenerateNew()) {
+
+                // copy and load new stuff
+                entityLoader.copyAndLoadEntities(exportdir, meta, true, FileType.NEW);
+            }
+
+            if (entityLoader.canGenerateBaracouda()) {
+
+                // copy and load of baracouda stuff
+                entityLoader.copyAndLoadEntities(exportdir, meta, true, FileType.BARACOUDA);
+            }
+
+            // load associations
+            AssociationMeta parentAssociationMeta =
+                    entityLoader.getParentAssociationMeta();
+            if (parentAssociationMeta != null) {
+                loadDependencies(parentAssociationMeta, dones);
+            }
         }
+
     }
 
     private TopiaDAO<E> getDAO() throws TopiaException {
@@ -189,7 +267,7 @@
 
     private File getTableFile(FileType fileType) throws IOException {
 
-        File outFile = loader.getTableFile(exportdir, loader.getEntityType(), fileType);
+        File outFile = loader.getTableFile(exportdir, loader.getMeta(), fileType);
         return outFile;
     }
 

Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderTest.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -38,23 +38,6 @@
         super(DataMetadataLoader.class, 34, 29);
     }
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        // load DataType
-        loadEchobaseFile(DataTypeLoader.class);
-
-        // load ReferenceDatumType
-        loadEchobaseFile(ReferenceDatumTypeLoader.class);
-
-        // load ReferenceDatum
-        loadEchobaseFile(ReferenceDatumLoader.class);
-
-        // load CellMethod
-        loadEchobaseFile(CellMethodLoader.class);
-    }
-
     @Test
     public void testGenerateNewEntities() throws Exception {
         generateNewEntities();

Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/EchotypeLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/EchotypeLoaderTest.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/EchotypeLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -35,23 +35,9 @@
 public class EchotypeLoaderTest extends AbstractLoaderTest<Echotype, EchotypeLoader> {
 
     public EchotypeLoaderTest() {
-        super(EchotypeLoader.class, 0, 49);
+        super(EchotypeLoader.class, 0, 215);
     }
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        // load EchotypeCategoryLoader
-        loadEchobaseFile(EchotypeCategoryLoader.class);
-
-        // load DepthStratum
-        loadEchobaseFile(DepthStratumLoader.class);
-
-        // load Species
-        loadEchobaseFile(SpeciesLoader.class);
-    }
-
     @Test
     public void testGenerateEntitiesFromBaracouda() throws Exception {
         generateEntitiesFromBaracouda();

Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LocalisationLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LocalisationLoaderTest.java	                        (rev 0)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LocalisationLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import fr.ifremer.echobase.entities.references.Localisation;
+import org.junit.Test;
+
+/**
+ * To test the {@link LocalisationLoader}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class LocalisationLoaderTest extends AbstractLoaderTest<Localisation, LocalisationLoader> {
+
+    public LocalisationLoaderTest() {
+        super(LocalisationLoader.class, 0, 0);
+    }
+
+    @Test
+    public void testGenerateNewEntities() throws Exception {
+        generateNewEntities();
+    }
+
+    @Test
+    public final void testGenerateEchobaseFile() throws Exception {
+        generateEchobaseFile();
+    }
+}


Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LocalisationLoaderTest.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoaderTest.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -38,14 +38,6 @@
         super(ReferenceDatumLoader.class, 4, 3);
     }
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        // load ReferenceDatumTypes
-        loadEchobaseFile(ReferenceDatumTypeLoader.class);
-    }
-
     @Test
     public void testGenerateNewEntities() throws Exception {
         generateNewEntities();

Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TSParametersLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TSParametersLoaderTest.java	2011-12-08 05:33:38 UTC (rev 157)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TSParametersLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -38,17 +38,6 @@
         super(TSParametersLoader.class, 0, 422);
     }
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        // load AcousticInstrument
-        loadEchobaseFile(AcousticInstrumentLoader.class);
-
-        // load Species
-        loadEchobaseFile(SpeciesLoader.class);
-    }
-
     @Test
     public void testGenerateEntitiesFromBaracouda() throws Exception {
         generateEntitiesFromBaracouda();

Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransectLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransectLoaderTest.java	                        (rev 0)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransectLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import fr.ifremer.echobase.entities.data.Transect;
+import org.junit.Test;
+
+/**
+ * To test the {@link TransectLoader}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class TransectLoaderTest extends AbstractLoaderTest<Transect, TransectLoader> {
+
+    public TransectLoaderTest() {
+        super(TransectLoader.class, 0, 42);
+    }
+
+    @Test
+    public void testGenerateEntitiesFromBaracouda() throws Exception {
+        generateEntitiesFromBaracouda();
+    }
+
+    @Test
+    public final void testGenerateEchobaseFile() throws Exception {
+        generateEchobaseFile();
+    }
+}


Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransectLoaderTest.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransitLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransitLoaderTest.java	                        (rev 0)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransitLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import fr.ifremer.echobase.entities.data.Transit;
+import org.junit.Test;
+
+/**
+ * To test the {@link TransitLoader}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class TransitLoaderTest extends AbstractLoaderTest<Transit, TransitLoader> {
+
+    public TransitLoaderTest() {
+        super(TransitLoader.class, 0, 42);
+    }
+
+    @Test
+    public void testGenerateEntitiesFromBaracouda() throws Exception {
+        generateEntitiesFromBaracouda();
+    }
+
+    @Test
+    public final void testGenerateEchobaseFile() throws Exception {
+        generateEchobaseFile();
+    }
+}


Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/TransitLoaderTest.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoaderTest.java	                        (rev 0)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import fr.ifremer.echobase.entities.references.VesselType;
+import org.junit.Test;
+
+/**
+ * To test the {@link VesselTypeLoader}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class VesselTypeLoaderTest extends AbstractLoaderTest<VesselType, VesselTypeLoader> {
+
+    public VesselTypeLoaderTest() {
+        super(VesselTypeLoader.class, 0, 0);
+    }
+
+    @Test
+    public void testGenerateNewEntities() throws Exception {
+        generateNewEntities();
+    }
+
+    @Test
+    public final void testGenerateEchobaseFile() throws Exception {
+        generateEchobaseFile();
+    }
+}


Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoaderTest.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java
===================================================================
--- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java	                        (rev 0)
+++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * EchoBase :: Tools
+ * 
+ * $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.tools.loaders;
+
+import fr.ifremer.echobase.entities.data.Voyage;
+import org.junit.Test;
+
+/**
+ * To test the {@link VoyageLoader}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 0.2
+ */
+public class VoyageLoaderTest extends AbstractLoaderTest<Voyage, VoyageLoader> {
+
+    public VoyageLoaderTest() {
+        super(VoyageLoader.class, 0, 42);
+    }
+
+    @Test
+    public void testGenerateEntitiesFromBaracouda() throws Exception {
+        generateEntitiesFromBaracouda();
+    }
+
+    @Test
+    public final void testGenerateEchobaseFile() throws Exception {
+        generateEchobaseFile();
+    }
+}


Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/test/resources/csv/new/input-Localisation.csv
===================================================================
--- trunk/echobase-tools/src/test/resources/csv/new/input-Localisation.csv	                        (rev 0)
+++ trunk/echobase-tools/src/test/resources/csv/new/input-Localisation.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1 @@
+maxLatitude;minLatitude;maxLongitude;minLongitude;seafloorSubstrate;bathymetre
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-Localisation.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: trunk/echobase-tools/src/test/resources/csv/new/input-VesselType.csv
===================================================================
--- trunk/echobase-tools/src/test/resources/csv/new/input-VesselType.csv	                        (rev 0)
+++ trunk/echobase-tools/src/test/resources/csv/new/input-VesselType.csv	2011-12-08 05:55:17 UTC (rev 158)
@@ -0,0 +1 @@
+name
\ No newline at end of file


Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-VesselType.csv
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

    

tchemit＠users.forge.codelutin.com

tags

participants (1)