Author: tchemit Date: 2012-01-04 22:27:13 +0100 (Wed, 04 Jan 2012) New Revision: 234 Url: http://forge.codelutin.com/repositories/revision/echobase/234 Log: continue catches import Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-04 21:27:13 UTC (rev 234) @@ -249,12 +249,7 @@ } String operationId = (String) row.get("NOSTA"); - if ("BXXX".equals(operationId)) { - // skip this operation - return null; - } - String gearId = (String) row.get("ENGIN"); if (gearId == null) { if (log.isWarnEnabled()) { Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java 2012-01-04 21:27:13 UTC (rev 234) @@ -35,7 +35,7 @@ public class OperationLoaderIT extends AbstractLoaderIT<Operation, OperationLoader> { public OperationLoaderIT() { - super(OperationLoader.class, 0, 1489); + super(OperationLoader.class, 0, 1531); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java 2012-01-04 21:27:13 UTC (rev 234) @@ -35,7 +35,7 @@ public class SampleLoaderIT extends AbstractLoaderIT<Sample, SampleLoader> { public SampleLoaderIT() { - super(SampleLoader.class, 0, 333783); + super(SampleLoader.class, 0,335110); } @Test Modified: trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv 2012-01-04 21:27:13 UTC (rev 234) @@ -1,5 +1,5 @@ CasinoGearName;ValidSince;InvalidSince;IsFishingGear;gearLabel;GearName;Description;UpdateDate;GearClassification;ParentGear;Status;IsActive;IsTowed -47,75 x 43,75;01/01/00;;1;47,75 x 43,75;CHANGE ME 47,75 x 43,75;;;5;;;1;1 +47,75 x 43,75;01/01/00;;1;47,75x43,75;Chalut pélagique 47,75 /43,75;;;5;;;1;1 119x102;01/01/00;;1;119x102;Chalut pélagique 119/102;;;5;;;1;1 36x47;01/01/00;;1;GV3647;Chalut de fond GOV 36/47;;;5;;;1;1 57x52;01/01/00;;1;57x52;Chalut pélagique 57/52;;;5;;;1;1