Tutti-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- 4058 discussions
Author: maven-release
Date: 2014-05-05 15:39:11 +0200 (Mon, 05 May 2014)
New Revision: 1749
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1749
Log:
[maven-release-plugin] copy for tag tutti-3.4.1
Added:
tags/tutti-3.4.1/
1
0
r1748 - in branches/tutti-3.4.x: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 05 May '14
by maven-release＠users.forge.codelutin.com 05 May '14
05 May '14
Author: maven-release
Date: 2014-05-05 15:39:01 +0200 (Mon, 05 May 2014)
New Revision: 1748
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1748
Log:
[maven-release-plugin] prepare release tutti-3.4.1
Modified:
branches/tutti-3.4.x/pom.xml
branches/tutti-3.4.x/tutti-ichtyometer/pom.xml
branches/tutti-3.4.x/tutti-persistence/pom.xml
branches/tutti-3.4.x/tutti-service/pom.xml
branches/tutti-3.4.x/tutti-ui-swing/pom.xml
Modified: branches/tutti-3.4.x/pom.xml
===================================================================
--- branches/tutti-3.4.x/pom.xml 2014-05-05 13:31:26 UTC (rev 1747)
+++ branches/tutti-3.4.x/pom.xml 2014-05-05 13:39:01 UTC (rev 1748)
@@ -32,7 +32,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1</version>
<packaging>pom</packaging>
<name>Tutti</name>
@@ -99,13 +99,13 @@
<scm>
<url>
- https://forge.codelutin.com/projects/tutti/repository/branches/tutti-3.4.x
+ https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.4.1
</url>
<connection>
- scm:svn:http://svn.codelutin.com/tutti/branches/tutti-3.4.x
+ scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.4.1
</connection>
<developerConnection>
- scm:svn:https://svn.codelutin.com/tutti/branches/tutti-3.4.x
+ scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.4.1
</developerConnection>
</scm>
<distributionManagement>
Modified: branches/tutti-3.4.x/tutti-ichtyometer/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/pom.xml 2014-05-05 13:31:26 UTC (rev 1747)
+++ branches/tutti-3.4.x/tutti-ichtyometer/pom.xml 2014-05-05 13:39:01 UTC (rev 1748)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-persistence/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/pom.xml 2014-05-05 13:31:26 UTC (rev 1747)
+++ branches/tutti-3.4.x/tutti-persistence/pom.xml 2014-05-05 13:39:01 UTC (rev 1748)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-service/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/pom.xml 2014-05-05 13:31:26 UTC (rev 1747)
+++ branches/tutti-3.4.x/tutti-service/pom.xml 2014-05-05 13:39:01 UTC (rev 1748)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-ui-swing/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/pom.xml 2014-05-05 13:31:26 UTC (rev 1747)
+++ branches/tutti-3.4.x/tutti-ui-swing/pom.xml 2014-05-05 13:39:01 UTC (rev 1748)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
1
0
r1747 - in branches/tutti-3.4.x: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri tutti-service/src/test/resources/pupitri
by tchemit＠users.forge.codelutin.com 05 May '14
by tchemit＠users.forge.codelutin.com 05 May '14
05 May '14
Author: tchemit
Date: 2014-05-05 15:31:26 +0200 (Mon, 05 May 2014)
New Revision: 1747
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1747
Log:
fixes #5032
Added:
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java
branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.car
branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.tnk
branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.tuttiProtocol
Removed:
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java
Modified:
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java
branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-3898.car
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-05 13:17:39 UTC (rev 1746)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-05 13:31:26 UTC (rev 1747)
@@ -650,28 +650,32 @@
Map<String, Species> map = TuttiEntities.splitByTaxonId(allReferentSpecies);
- Iterator<SpeciesProtocol> iterator = protocol.getSpecies().iterator();
- while (iterator.hasNext()) {
- SpeciesProtocol speciesProtocol = iterator.next();
- String taxonId = String.valueOf(speciesProtocol.getSpeciesReferenceTaxonId());
- Species species = map.get(taxonId);
- if (species == null) {
- if (log.isWarnEnabled()) {
- log.warn("Could not find protocol species " + taxonId + " (" + speciesProtocol.getSpeciesSurveyCode() + ") in referential.");
+ if (!protocol.isSpeciesEmpty()) {
+ Iterator<SpeciesProtocol> iterator = protocol.getSpecies().iterator();
+ while (iterator.hasNext()) {
+ SpeciesProtocol speciesProtocol = iterator.next();
+ String taxonId = String.valueOf(speciesProtocol.getSpeciesReferenceTaxonId());
+ Species species = map.get(taxonId);
+ if (species == null) {
+ if (log.isWarnEnabled()) {
+ log.warn("Could not find protocol species " + taxonId + " (" + speciesProtocol.getSpeciesSurveyCode() + ") in referential.");
+ }
+ iterator.remove();
}
- iterator.remove();
}
}
- iterator = protocol.getBenthos().iterator();
- while (iterator.hasNext()) {
- SpeciesProtocol speciesProtocol = iterator.next();
- String taxonId = String.valueOf(speciesProtocol.getSpeciesReferenceTaxonId());
- Species species = map.get(taxonId);
- if (species == null) {
- if (log.isWarnEnabled()) {
- log.warn("Could not find protocol benthos " + taxonId + " (" + speciesProtocol.getSpeciesSurveyCode() + ") in referential.");
+ if (!protocol.isBenthosEmpty()) {
+ Iterator<SpeciesProtocol> iterator = protocol.getBenthos().iterator();
+ while (iterator.hasNext()) {
+ SpeciesProtocol speciesProtocol = iterator.next();
+ String taxonId = String.valueOf(speciesProtocol.getSpeciesReferenceTaxonId());
+ Species species = map.get(taxonId);
+ if (species == null) {
+ if (log.isWarnEnabled()) {
+ log.warn("Could not find protocol benthos " + taxonId + " (" + speciesProtocol.getSpeciesSurveyCode() + ") in referential.");
+ }
+ iterator.remove();
}
- iterator.remove();
}
}
return protocol;
@@ -962,20 +966,24 @@
Map<Integer, String> surveyCodeByTaxonId = Maps.newTreeMap();
- for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) {
- String surveyCode = speciesProtocol.getSpeciesSurveyCode();
- if (StringUtils.isNotBlank(surveyCode)) {
- Integer taxonId =
- speciesProtocol.getSpeciesReferenceTaxonId();
- surveyCodeByTaxonId.put(taxonId, surveyCode);
+ if (!protocol.isSpeciesEmpty()) {
+ for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) {
+ String surveyCode = speciesProtocol.getSpeciesSurveyCode();
+ if (StringUtils.isNotBlank(surveyCode)) {
+ Integer taxonId =
+ speciesProtocol.getSpeciesReferenceTaxonId();
+ surveyCodeByTaxonId.put(taxonId, surveyCode);
+ }
}
}
- for (SpeciesProtocol speciesProtocol : protocol.getBenthos()) {
- String surveyCode = speciesProtocol.getSpeciesSurveyCode();
- if (StringUtils.isNotBlank(surveyCode)) {
- Integer taxonId =
- speciesProtocol.getSpeciesReferenceTaxonId();
- surveyCodeByTaxonId.put(taxonId, surveyCode);
+ if (!protocol.isBenthosEmpty()) {
+ for (SpeciesProtocol speciesProtocol : protocol.getBenthos()) {
+ String surveyCode = speciesProtocol.getSpeciesSurveyCode();
+ if (StringUtils.isNotBlank(surveyCode)) {
+ Integer taxonId =
+ speciesProtocol.getSpeciesReferenceTaxonId();
+ surveyCodeByTaxonId.put(taxonId, surveyCode);
+ }
}
}
for (Species species : speciesList) {
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-05-05 13:17:39 UTC (rev 1746)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-05-05 13:31:26 UTC (rev 1747)
@@ -147,6 +147,10 @@
return Multimaps.index(list, GET_REF_TAX_CODE);
}
+ public static Multimap<String, Species> splitBySurveyCode(Iterable<Species> list) {
+ return Multimaps.index(list, GET_SURVEY_CODE);
+ }
+
public static final Function<Species, String> GET_TAXON_ID = new Function<Species, String>() {
@Override
public String apply(Species input) {
@@ -161,6 +165,13 @@
}
};
+ public static final Function<Species, String> GET_SURVEY_CODE = new Function<Species, String>() {
+ @Override
+ public String apply(Species input) {
+ return String.valueOf(input.getSurveyCode());
+ }
+ };
+
public static final Function<TuttiEntity, String> GET_ID = new Function<TuttiEntity, String>() {
@Override
public String apply(TuttiEntity input) {
@@ -515,7 +526,7 @@
public static float roundKiloGram(float value) {
BigDecimal sumB = new BigDecimal(value);
float result;
- if (Math.abs(value - sumB.floatValue())< 0.0001f) {
+ if (Math.abs(value - sumB.floatValue()) < 0.0001f) {
result = value;
} else {
result = sumB.abs(MATH_CONTEXT_4_DIGIT).floatValue();
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2014-05-05 13:17:39 UTC (rev 1746)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2014-05-05 13:31:26 UTC (rev 1747)
@@ -25,11 +25,7 @@
*/
import fr.ifremer.tutti.service.TuttiCsvUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.nuiton.csv.ValueParser;
-import java.text.ParseException;
-
/**
* @author kmorin <kmorin(a)codelutin.com>
* @since 1.2
@@ -41,13 +37,7 @@
newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE);
newMandatoryColumn(CarrouselRow.PROPERTY_RIG_NUMBER);
- newMandatoryColumn(CarrouselRow.PROPERTY_SPECIES_ID, new ValueParser<String>() {
-
- @Override
- public String parse(String string) throws ParseException {
- return StringUtils.remove(string, '-').trim();
- }
- });
+ newMandatoryColumn(CarrouselRow.PROPERTY_SPECIES_ID);
newMandatoryColumn(CarrouselRow.PROPERTY_SIGN);
newMandatoryColumn(CarrouselRow.PROPERTY_DIRECTION,
TuttiCsvUtil.newEnumByNameParserFormatter(Directions.class));
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-05-05 13:17:39 UTC (rev 1746)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-05-05 13:31:26 UTC (rev 1747)
@@ -30,10 +30,7 @@
import com.google.common.collect.ListMultimap;
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 org.nuiton.jaxx.application.ApplicationIOUtil;
-import org.nuiton.jaxx.application.ApplicationTechnicalException;
import fr.ifremer.tutti.persistence.entities.TuttiEntities;
import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum;
import fr.ifremer.tutti.persistence.entities.data.Attachment;
@@ -63,6 +60,8 @@
import org.nuiton.csv.Export;
import org.nuiton.csv.Import;
import org.nuiton.decorator.Decorator;
+import org.nuiton.jaxx.application.ApplicationIOUtil;
+import org.nuiton.jaxx.application.ApplicationTechnicalException;
import java.io.File;
import java.io.IOException;
@@ -74,8 +73,8 @@
import java.util.Map;
import java.util.Set;
+import static org.nuiton.i18n.I18n.n;
import static org.nuiton.i18n.I18n.t;
-import static org.nuiton.i18n.I18n.n;
/**
* @author kmorin <kmorin(a)codelutin.com>
@@ -149,7 +148,7 @@
PupitriImportResult result = new PupitriImportResult(trunkFile,
carrouselFile);
- importPupitriTrunk(result, trunkFile, operation, catchBatch);
+ importPupitriTrunk(result, trunkFile, operation);
importPupitriCarrousel(result, carrouselFile, operation, catchBatch);
if (result.isFishingOperationFound()) {
@@ -203,9 +202,7 @@
persistenceService.createAttachment(attachment, f);
}
- protected void importPupitriTrunk(PupitriImportResult result, File file,
- FishingOperation operation,
- CatchBatch catchBatch) {
+ protected void importPupitriTrunk(PupitriImportResult result, File file, FishingOperation operation) {
if (log.isInfoEnabled()) {
log.info("Will import pupitri operation [" + operation.toString() +
@@ -278,17 +275,20 @@
// get the map of species by survey code
ListMultimap<String, Species> speciesBySurveyCode = ArrayListMultimap.create();
- speciesBySurveyCode.putAll(
- Multimaps.index(dataContext.getReferentSpeciesWithSurveyCode(),
- new Function<Species, String>() {
- @Override
- public String apply(Species input) {
- String surveyCode = String.valueOf(input.getSurveyCode());
- int end = Math.min(surveyCode.length(), 7);
- return surveyCode.substring(0, end);
- }
- })
- );
+// speciesBySurveyCode.putAll(
+// Multimaps.index(dataContext.getReferentSpeciesWithSurveyCode(),
+// new Function<Species, String>() {
+// @Override
+// public String apply(Species input) {
+// String surveyCode = String.valueOf(input.getSurveyCode());
+// int end = Math.min(surveyCode.length(), 7);
+// return surveyCode.substring(0, end);
+// }
+// })
+// );
+// speciesBySurveyCode.putAll(TuttiEntities.splitByRefTaxCode(dataContext.getReferentSpecies()));
+
+ speciesBySurveyCode.putAll(TuttiEntities.splitBySurveyCode(dataContext.getReferentSpeciesWithSurveyCode()));
speciesBySurveyCode.putAll(TuttiEntities.splitByRefTaxCode(dataContext.getReferentSpecies()));
// import the batches
Copied: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java (from rev 1744, branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java)
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java (rev 0)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java 2014-05-05 13:31:26 UTC (rev 1747)
@@ -0,0 +1,137 @@
+package fr.ifremer.tutti.service.pupitri;
+
+/*
+ * #%L
+ * Tutti :: Service
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 - 2013 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import fr.ifremer.tutti.TuttiConfigurationOption;
+import fr.ifremer.tutti.persistence.entities.data.BatchContainer;
+import fr.ifremer.tutti.persistence.entities.data.CatchBatch;
+import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
+import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch;
+import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
+import fr.ifremer.tutti.persistence.entities.referential.Species;
+import fr.ifremer.tutti.service.DecoratorService;
+import fr.ifremer.tutti.service.PersistenceService;
+import fr.ifremer.tutti.service.ServiceDbResource;
+import fr.ifremer.tutti.service.TuttiServiceContext;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.nuiton.decorator.Decorator;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author tchemit <chemit(a)codelutin.com>
+ * @since 3.0-rc-2
+ */
+public class PupitriImportServiceAno3898Test {
+
+ @ClassRule
+ public static final ServiceDbResource dbResource =
+ ServiceDbResource.writeDb("dbExport");
+
+ public static final String PROGRAM_ID = "CAM-TEST_ELEVATION";
+
+ public static final String CRUISE_ID = "100003";
+
+ public static final String OPERATION_1_ID = "100112";
+
+ public static final String OPERATION_2_ID = "100113";
+
+ public static final String OPERATION_3_ID = "100115";
+
+ protected PupitriImportExportService service;
+
+ protected PersistenceService persistenceService;
+
+ protected DecoratorService decoratorService;
+
+ protected ServiceDbResource.DataContext dataContext;
+
+ @Before
+ public void setUp() throws Exception {
+
+ TuttiServiceContext serviceContext = dbResource.getServiceContext();
+
+ persistenceService = serviceContext.getService(PersistenceService.class);
+
+ decoratorService = serviceContext.getService(DecoratorService.class);
+
+ dbResource.openDataContext();
+
+ service = serviceContext.getService(PupitriImportExportService.class);
+
+ dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3,
+ OPERATION_2_ID,
+ OPERATION_1_ID,
+ OPERATION_3_ID);
+ }
+
+ @Test
+ public void importPupitri() throws IOException {
+
+ File trunk = dbResource.copyClassPathResource("pupitri/ano-3898.tnk", "pupitri.tnk");
+ File carroussel = dbResource.copyClassPathResource("pupitri/ano-3898.car", "pupitri.car");
+ File protocol = dbResource.copyClassPathResource("pupitri/ano-3898.tuttiProtocol", "ano-3898.tuttiProtocol");
+ dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath());
+ TuttiProtocol protocol1 = persistenceService.getProtocol("ano-3898");
+ persistenceService.setProtocol(protocol1);
+
+ FishingOperation operation = dataContext.operations.get(1);
+ CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId());
+ catchBatch.setFishingOperation(operation);
+
+ BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), null);
+ Assert.assertEquals(3, rootSpeciesBatch.sizeChildren());
+ int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported();
+ Assert.assertEquals(0, nbNotAdded);
+ BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), null);
+ Assert.assertEquals(31, rootSpeciesBatchAfter.sizeChildren());
+
+ Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class);
+
+ for (SpeciesBatch speciesBatch : rootSpeciesBatchAfter.getChildren()) {
+
+ Integer nbChildren = null;
+ // species 17003 (MELAAEG) has two childs (SMALL - BIG)
+ if (17003 == speciesBatch.getSpecies().getIdAsInt()) {
+ nbChildren = 2;
+ // species 37312 (LOLIFOR) has no childs (in puttitri has some DEFAULT AND SMALL)
+ } else if (37312 == speciesBatch.getSpecies().getIdAsInt()) {
+ nbChildren = 0;
+ // species 17005 (MERNMER) has no childs (in puttitri has some DEFAULT AND SMALL)
+ } else if (17005 == speciesBatch.getSpecies().getIdAsInt()) {
+ nbChildren = 0;
+ }
+
+ if (nbChildren != null) {
+ Assert.assertEquals("SpeciesBatch with species " + speciesDecorator.toString(speciesBatch.getSpecies()) + " should have with " + nbChildren + " but had " + speciesBatch.sizeChildBatchs(), nbChildren.intValue(), speciesBatch.sizeChildBatchs());
+ }
+
+ }
+ }
+}
Added: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java (rev 0)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java 2014-05-05 13:31:26 UTC (rev 1747)
@@ -0,0 +1,152 @@
+package fr.ifremer.tutti.service.pupitri;
+
+/*
+ * #%L
+ * Tutti :: Service
+ * $Id$
+ * $HeadURL: https://svn.codelutin.com/tutti/branches/3.3.6/tutti-service/src/test/java/… $
+ * %%
+ * Copyright (C) 2012 - 2013 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import com.google.common.collect.Sets;
+import fr.ifremer.tutti.TuttiConfigurationOption;
+import fr.ifremer.tutti.persistence.entities.data.BatchContainer;
+import fr.ifremer.tutti.persistence.entities.data.CatchBatch;
+import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
+import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch;
+import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
+import fr.ifremer.tutti.persistence.entities.referential.Species;
+import fr.ifremer.tutti.service.DecoratorService;
+import fr.ifremer.tutti.service.PersistenceService;
+import fr.ifremer.tutti.service.ServiceDbResource;
+import fr.ifremer.tutti.service.TuttiServiceContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.nuiton.decorator.Decorator;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Set;
+
+/**
+ * @author tchemit <chemit(a)codelutin.com>
+ * @since 3.0-rc-2
+ */
+public class PupitriImportServiceAno5032Test {
+
+ /** Logger. */
+ private static final Log log = LogFactory.getLog(PupitriImportServiceAno5032Test.class);
+
+ @ClassRule
+ public static final ServiceDbResource dbResource =
+ ServiceDbResource.writeDb("dbExport");
+
+ public static final String PROGRAM_ID = "CAM-TEST_ELEVATION";
+
+ public static final String CRUISE_ID = "100003";
+
+ public static final String OPERATION_1_ID = "100112";
+
+ public static final String OPERATION_2_ID = "100113";
+
+ public static final String OPERATION_3_ID = "100115";
+
+ protected PupitriImportExportService service;
+
+ protected PersistenceService persistenceService;
+
+ protected DecoratorService decoratorService;
+
+ protected ServiceDbResource.DataContext dataContext;
+
+ @Before
+ public void setUp() throws Exception {
+
+ TuttiServiceContext serviceContext = dbResource.getServiceContext();
+
+ persistenceService = serviceContext.getService(PersistenceService.class);
+
+ decoratorService = serviceContext.getService(DecoratorService.class);
+
+ dbResource.openDataContext();
+
+ service = serviceContext.getService(PupitriImportExportService.class);
+
+ dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3,
+ OPERATION_2_ID,
+ OPERATION_1_ID,
+ OPERATION_3_ID);
+ }
+
+ @Test
+ public void importPupitri() throws IOException {
+
+ File trunk = dbResource.copyClassPathResource("pupitri/ano-5032.tnk", "pupitri.tnk");
+ File carroussel = dbResource.copyClassPathResource("pupitri/ano-5032.car", "pupitri.car");
+ File protocol = dbResource.copyClassPathResource("pupitri/ano-5032.tuttiProtocol", "ano-5032.tuttiProtocol");
+ dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath());
+ TuttiProtocol protocol1 = persistenceService.getProtocol("ano-5032");
+ persistenceService.setProtocol(protocol1);
+
+ FishingOperation operation = dataContext.operations.get(1);
+ CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId());
+ catchBatch.setFishingOperation(operation);
+
+ BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), null);
+ Assert.assertEquals(3, rootSpeciesBatch.sizeChildren());
+ int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported();
+ Assert.assertEquals(4, nbNotAdded);
+ BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), null);
+ Assert.assertEquals(4, rootSpeciesBatchAfter.sizeChildren());
+
+ Set<Integer> unexpectedSpecies = Sets.newHashSet(
+ );
+ Set<Integer> expectedSpecies = Sets.newHashSet(
+ 17005, // MERNMER
+ 17186, // ACATPAL
+ 16328, // ACAPPEL
+ 20788 // ASRNATL
+ );
+
+ Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class);
+
+ for (SpeciesBatch speciesBatch : rootSpeciesBatchAfter.getChildren()) {
+
+ Species species = speciesBatch.getSpecies();
+ Integer speciesId = species.getIdAsInt();
+ boolean remove = expectedSpecies.remove(speciesId);
+ if (log.isInfoEnabled()) {
+ log.info("Species : " + speciesId + " : " + speciesDecorator.toString(species));
+ }
+ if (!remove) {
+ unexpectedSpecies.add(speciesId);
+ if (log.isWarnEnabled()) {
+ log.warn("Unexpected Species " + speciesId);
+ }
+ }
+ }
+
+ Assert.assertTrue("Expected species not found: " + expectedSpecies, expectedSpecies.isEmpty());
+ Assert.assertTrue("Unexpected species found: " + unexpectedSpecies, unexpectedSpecies.isEmpty());
+ }
+}
Property changes on: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java 2014-05-05 13:17:39 UTC (rev 1746)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java 2014-05-05 13:31:26 UTC (rev 1747)
@@ -1,138 +0,0 @@
-package fr.ifremer.tutti.service.pupitri;
-
-/*
- * #%L
- * Tutti :: Service
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import fr.ifremer.tutti.TuttiConfigurationOption;
-import fr.ifremer.tutti.persistence.entities.data.BatchContainer;
-import fr.ifremer.tutti.persistence.entities.data.CatchBatch;
-import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
-import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch;
-import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
-import fr.ifremer.tutti.persistence.entities.referential.Species;
-import fr.ifremer.tutti.service.DecoratorService;
-import fr.ifremer.tutti.service.PersistenceService;
-import fr.ifremer.tutti.service.ServiceDbResource;
-import fr.ifremer.tutti.service.TuttiServiceContext;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.nuiton.decorator.Decorator;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author tchemit <chemit(a)codelutin.com>
- * @since 3.0-rc-2
- */
-public class PupitriImportServiceTest {
-
- @ClassRule
- public static final ServiceDbResource dbResource =
- ServiceDbResource.writeDb("dbExport");
-
- public static final String PROGRAM_ID = "CAM-TEST_ELEVATION";
-
- public static final String CRUISE_ID = "100003";
-
- public static final String OPERATION_1_ID = "100112";
-
- public static final String OPERATION_2_ID = "100113";
-
- public static final String OPERATION_3_ID = "100115";
-
- protected PupitriImportExportService service;
-
- protected PersistenceService persistenceService;
-
- protected DecoratorService decoratorService;
-
- protected ServiceDbResource.DataContext dataContext;
-
- @Before
- public void setUp() throws Exception {
-
- TuttiServiceContext serviceContext = dbResource.getServiceContext();
-
- persistenceService = serviceContext.getService(PersistenceService.class);
-
- decoratorService = serviceContext.getService(DecoratorService.class);
-
- dbResource.openDataContext();
-
- service = serviceContext.getService(PupitriImportExportService.class);
-
- dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3,
- OPERATION_2_ID,
- OPERATION_1_ID,
- OPERATION_3_ID);
- }
-
- @Test
- public void importPupitriANO3898() throws IOException {
-
- File trunk = dbResource.copyClassPathResource("pupitri/ano-3898.tnk", "pupitri.tnk");
- File carroussel = dbResource.copyClassPathResource("pupitri/ano-3898.car", "pupitri.car");
- File protocol = dbResource.copyClassPathResource("pupitri/ano-3898.tuttiProtocol", "ano-3898.tuttiProtocol");
- dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath());
- TuttiProtocol protocol1 = persistenceService.getProtocol("ano-3898");
- persistenceService.setProtocol(protocol1);
-
- FishingOperation operation = dataContext.operations.get(1);
- CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId());
- catchBatch.setFishingOperation(operation);
-
- BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), null);
- Assert.assertEquals(3, rootSpeciesBatch.sizeChildren());
- int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported();
- Assert.assertEquals(0, nbNotAdded);
- BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), null);
- Assert.assertEquals(31, rootSpeciesBatchAfter.sizeChildren());
-
- Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class);
-
-// int index = 0;
- for (SpeciesBatch speciesBatch : rootSpeciesBatchAfter.getChildren()) {
-
- Integer nbChildren = null;
- // species 17003 (MELAAEG) has two childs (SMALL - BIG)
- if (17003 == speciesBatch.getSpecies().getIdAsInt()) {
- nbChildren = 2;
- // species 37312 (LOLIFOR) has no childs (in puttitri has some DEFAULT AND SMALL)
- } else if (37312 == speciesBatch.getSpecies().getIdAsInt()) {
- nbChildren = 0;
- // species 17005 (MERNMER) has no childs (in puttitri has some DEFAULT AND SMALL)
- }else if (17005== speciesBatch.getSpecies().getIdAsInt()) {
- nbChildren = 0;
- }
-
- if (nbChildren != null) {
- Assert.assertEquals("SpeciesBatch with species " + speciesDecorator.toString(speciesBatch.getSpecies()) + " should have with " + nbChildren + " but had " + speciesBatch.sizeChildBatchs(), nbChildren.intValue(), speciesBatch.sizeChildBatchs());
- }
-
- }
- }
-}
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-3898.car
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-3898.car 2014-05-05 13:17:39 UTC (rev 1746)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-3898.car 2014-05-05 13:31:26 UTC (rev 1747)
@@ -1,381 +1,381 @@
-$TSMES,27/11/13,09:12:04.612,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0015.6,
-$TSMES,27/11/13,09:13:21.994,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0018.9,
-$TSMES,27/11/13,09:15:12.588,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0021.4,
-$TSMES,27/11/13,09:15:58.396,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0017.9,
-$TSMES,27/11/13,09:17:11.714,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0017.2,
-$TSMES,27/11/13,09:17:40.272,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0021.1,
-$TSMES,27/11/13,09:18:48.818,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0018.0,
-$TSMES,27/11/13,09:19:33.335,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0016.6,
-$TSMES,27/11/13,09:21:16.442,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0015.8,
-$TSMES,27/11/13,09:21:40.776,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0022.8,
-$TSMES,27/11/13,09:22:45.945,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0016.1,
-$TSMES,27/11/13,09:26:51.656,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0019.1,
-$TSMES,27/11/13,09:27:53.133,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0016.5,
-$TSMES,27/11/13,09:28:17.445,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0018.4,
-$TSMES,27/11/13,09:31:22.362,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0014.6,
-$TSMES,27/11/13,09:31:45.650,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0018.4,
-$TSMES,27/11/13,09:32:05.512,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0023.0,
-$TSMES,27/11/13,09:33:00.869,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0014.2,
-$TSMES,27/11/13,09:33:24.472,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0012.8,
-$TSMES,27/11/13,09:34:25.343,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0015.8,
-$TSMES,27/11/13,09:34:44.541,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0021.0,
-$TSMES,27/11/13,09:36:02.174,BLCAR, 0,A,1,001,NEPH-NOR,0,VAT,0006.3,
-$TSMES,27/11/13,09:36:30.632,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0024.1,
-$TSMES,27/11/13,09:37:25.749,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0017.5,
-$TSMES,27/11/13,09:37:47.056,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0018.3,
-$TSMES,27/11/13,09:38:44.513,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0018.5,
-$TSMES,27/11/13,09:40:34.621,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0015.8,
-$TSMES,27/11/13,09:41:28.855,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0011.3,
-$TSMES,27/11/13,09:42:39.349,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0016.7,
-$TSMES,27/11/13,09:43:01.405,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0020.2,
-$TSMES,27/11/13,09:43:21.779,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0018.7,
-$TSMES,27/11/13,09:44:16.028,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0025.7,
-$TSMES,27/11/13,09:44:39.643,BLCAR, 0,A,1,002,MERL-MCC,0,VAT,0017.6,
-$TSMES,27/11/13,09:45:41.310,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0015.9,
-$TSMES,27/11/13,09:46:04.181,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0018.0,
-$TSMES,27/11/13,09:47:00.822,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0018.1,
-$TSMES,27/11/13,09:47:25.806,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0018.0,
-$TSMES,27/11/13,09:48:25.059,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0013.1,
-$TSMES,27/11/13,09:48:47.779,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0016.4,
-$TSMES,27/11/13,09:50:25.036,BLCAR,-1,A,1,002,CLUP-HAR,0,VAT,-001.8,
-$TSMES,27/11/13,09:51:02.085,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0016.5,
-$TSMES,27/11/13,09:52:08.332,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0016.2,
-$TSMES,27/11/13,09:52:34.644,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0020.6,
-$TSMES,27/11/13,09:52:57.540,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0016.1,
-$TSMES,27/11/13,09:53:31.676,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0018.3,
-$TSMES,27/11/13,09:54:07.781,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0021.0,
-$TSMES,27/11/13,09:55:10.374,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0018.4,
-$TSMES,27/11/13,09:55:35.859,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0018.1,
-$TSMES,27/11/13,09:56:02.545,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0014.2,
-$TSMES,27/11/13,09:57:06.900,BLCAR, 0,A,1,002,EUTR-GUR,0,VAT,0013.5,
-$TSMES,27/11/13,09:57:28.821,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0018.3,
-$TSMES,27/11/13,09:58:35.607,BLCAR, 0,A,1,001,MERL-MNG,0,VAT,0009.9,
-$TSMES,27/11/13,09:59:17.462,BLCAR, 0,A,1,001,EUTR-GUR,0,VAT,0006.9,
-$TSMES,27/11/13,10:00:18.404,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0023.0,
-$TSMES,27/11/13,10:00:45.111,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0014.8,
-$TSMES,27/11/13,10:01:59.945,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0019.3,
-$TSMES,27/11/13,10:02:23.121,BLCAR, 0,A,1,002,NEPH-NOR,0,VAT,0010.2,
-$TSMES,27/11/13,10:03:37.632,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0014.0,
-$TSMES,27/11/13,10:04:06.529,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0015.1,
-$TSMES,27/11/13,10:05:06.144,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0014.0,
-$TSMES,27/11/13,10:05:36.831,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0020.3,
-$TSMES,27/11/13,10:06:02.527,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0012.3,
-$TSMES,27/11/13,10:07:12.015,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0023.7,
-$TSMES,27/11/13,10:07:44.295,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0018.2,
-$TSMES,27/11/13,10:08:22.400,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0017.6,
-$TSMES,27/11/13,10:09:24.404,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0022.5,
-$TSMES,27/11/13,10:09:45.542,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0017.7,
-$TSMES,27/11/13,10:10:07.635,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0021.8,
-$TSMES,27/11/13,10:10:38.750,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0011.2,
-$TSMES,27/11/13,10:11:05.784,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0015.9,
-$TSMES,27/11/13,10:11:34.634,BLCAR, 0,A,1,002,CONG-CON,0,VAT,0001.0,
-$TSMES,27/11/13,10:12:40.011,BLCAR,-1,A,1,002,RAJA-CLA,0,VAT,-000.1,
-$TSMES,27/11/13,10:13:08.077,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0014.8,
-$TSMES,27/11/13,10:13:35.173,BLCAR, 0,A,1,002,TRIS-ESM,0,VAT,0012.2,
-$TSMES,27/11/13,10:13:56.456,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0020.3,
-$TSMES,27/11/13,10:14:43.589,BLCAR, 0,A,1,001,HIPP-PLA,0,VAT,0002.9,
-$TSMES,27/11/13,10:15:33.096,BLCAR, 0,A,1,001,MELA-AEG,P,VAT,0001.4,
-$TSMES,27/11/13,10:15:59.750,BLCAR, 0,A,1,002,MELA-AEG,G,VAT,0007.8,
-$TSMES,27/11/13,10:16:28.073,BLCAR, 0,A,1,001,GADU-MOR,0,VAT,0000.1,
-$TSMES,27/11/13,10:17:04.293,BLCAR, 0,A,1,001,MERL-MNG,0,VAT,0007.1,
-$TSMES,27/11/13,10:17:35.174,BLCAR, 0,A,1,001,TRIS-MIN,0,VAT,0006.0,
-$TSMES,27/11/13,10:18:09.419,BLCAR, 0,A,1,001,MERL-MNG,P,VAT,0007.4,
-$TSMES,27/11/13,10:18:41.202,BLCAR, 0,A,1,001,MERL-MNG,0,VAT,0000.4,
-$TSMES,27/11/13,10:19:05.719,BLCAR, 0,A,1,002,CLUP-HAR,0,VAT,0007.7,
-$TSMES,27/11/13,10:19:50.270,BLCAR, 0,A,1,001,HIPP-PLA,0,VAT,0002.7,
-$TSMES,27/11/13,10:20:20.642,BLCAR, 0,A,1,002,MICR-POU,0,VAT,0010.7,
-$TSMES,27/11/13,10:20:48.724,BLCAR, 0,A,1,001,LOLI-FOR,0,VAT,0002.2,
-$TSMES,27/11/13,10:21:10.768,BLCAR, 0,A,1,001,EUTR-GUR,0,VAT,0004.7,
-$TSMES,27/11/13,10:21:41.022,BLCAR, 0,A,1,001,NEPH-NOR,0,VAT,0006.3,
-$TSMES,27/11/13,10:22:42.411,BLCAR, 0,A,1,001,ARGE-SPH,0,VAT,0000.1,
-$TSMES,27/11/13,10:23:25.537,BLCAR, 0,A,1,001,TRAC-TRU,0,VAT,0000.1,
-$TSMES,27/11/13,10:24:06.077,BLCAR, 0,A,1,001,SCOM-SCO,0,VAT,0000.4,
-$TSMES,27/11/13,10:24:34.127,BLCAR, 0,A,1,001,MAUR-MUE,0,VAT,0000.1,
-$TSMES,27/11/13,10:25:23.660,BLCAR, 0,A,1,001,LEPI-WHI,0,VAT,0003.1,
-$TSMES,27/11/13,10:25:47.598,BLCAR, 0,A,1,002,SCYL-CAN,0,VAT,0005.3,
-$TSMES,27/11/13,10:26:12.602,BLCAR, 0,A,1,002,LOPH-PIS,0,VAT,0012.0,
-$TSMES,27/11/13,10:26:33.530,BLCAR, 0,A,1,003,ELED-CIR,0,VAT,0001.4,
-$TSMES,27/11/13,10:27:34.508,BLCAR, 0,A,1,003,ROSS-MAC,0,VAT,0000.1,
-$TSMES,27/11/13,10:28:17.554,BLCAR, 0,A,1,001,ENCH-CIM,0,VAT,0000.8,
-$TSMES,27/11/13,10:28:57.935,BLCAR, 0,A,1,001,LIMA-LIM,0,VAT,0000.2,
-$TSMES,27/11/13,10:29:42.251,BLCAR, 0,A,1,001,CALL-MAC,0,VAT,0000.2,
-$TSMES,27/11/13,10:30:09.536,BLCAR, 0,A,1,001,CALL-LYR,0,VAT,0000.8,
-$TSMES,27/11/13,10:30:59.437,BLCAR, 0,A,1,001,MICR-VAR,0,VAT,0000.2,
-$TSMES,27/11/13,10:31:32.624,BLCAR, 0,A,1,001,SEPI-OLZ,0,VAT,0000.2,
-$TSMES,27/11/13,10:31:59.713,BLCAR, 0,A,1,003,LOLI-FOR,P,VAT,0000.1,
-$TSMES,27/11/13,10:32:34.851,BLCAR, 0,A,1,003,TODA-EBL,0,VAT,0000.2,
-$TSMES,27/11/13,10:33:02.175,BLCAR, 0,A,1,002,MERL-MCC,0,VAT,0013.8,
-$TSMES,27/11/13,10:35:38.377,BLCAR, 0,A,1,001,GLYP-CYN,0,VAT,0000.3,
-$TSMES,27/11/13,12:04:35.575,BLCAR, 0,R0482,1,001,MERL-MNG,0,VAT,0020.0,
-$TSMES,27/11/13,12:06:30.634,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.9,
-$TSMES,27/11/13,12:08:42.036,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.3,
-$TSMES,27/11/13,12:09:02.786,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0019.2,
-$TSMES,27/11/13,12:12:30.199,BLCAR, 0,R0482,1,002,MELA-AEG,0,VAT,0021.9,
-$TSMES,27/11/13,12:13:14.543,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0000.0,
-$TSMES,27/11/13,12:13:35.465,BLCAR,-1,R0482,1,002,MELA-AEG,0,VAT,-001.4,
-$TSMES,27/11/13,12:14:42.156,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0000.9,
-$TSMES,27/11/13,12:15:05.319,BLCAR,-1,R0482,1,002,CLUP-HAR,0,VAT,-002.9,
-$TSMES,27/11/13,12:16:11.874,BLCAR, 0,R0482,1,001,EUTR-GUR,0,VAT,0007.1,
-$TSMES,27/11/13,12:16:53.113,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0000.3,
-$TSMES,27/11/13,12:19:51.787,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0000.4,
-$TSMES,27/11/13,12:20:45.974,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.5,
-$TSMES,27/11/13,12:21:08.178,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.2,
-$TSMES,27/11/13,12:21:41.969,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0021.3,
-$TSMES,27/11/13,12:22:09.619,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0015.2,
-$TSMES,27/11/13,12:23:05.053,BLCAR, 0,R0482,1,002,MERL-MNG,P,VAT,0014.7,
-$TSMES,27/11/13,12:24:17.176,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0016.4,
-$TSMES,27/11/13,12:25:25.163,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.8,
-$TSMES,27/11/13,12:27:27.892,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0017.8,
-$TSMES,27/11/13,12:27:49.775,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0017.7,
-$TSMES,27/11/13,12:28:15.701,BLCAR, 0,R0482,1,001,EUTR-GUR,0,VAT,0007.3,
-$TSMES,27/11/13,12:32:10.843,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0018.7,
-$TSMES,27/11/13,12:34:21.824,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.6,
-$TSMES,27/11/13,12:35:28.244,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.9,
-$TSMES,27/11/13,12:35:55.232,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0018.6,
-$TSMES,27/11/13,12:36:27.381,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.9,
-$TSMES,27/11/13,12:37:02.445,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0021.9,
-$TSMES,27/11/13,12:38:17.102,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0020.9,
-$TSMES,27/11/13,12:38:39.197,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0020.5,
-$TSMES,27/11/13,12:39:55.258,BLCAR, 0,R0482,1,001,EUTR-GUR,0,VAT,0008.8,
-$TSMES,27/11/13,12:41:15.892,BLCAR, 0,R0482,1,001,MELA-AEG,P,VAT,0008.7,
-$TSMES,27/11/13,12:41:42.452,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0019.1,
-$TSMES,27/11/13,12:43:19.486,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0018.1,
-$TSMES,27/11/13,12:44:34.765,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0018.3,
-$TSMES,27/11/13,12:45:02.744,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0018.4,
-$TSMES,27/11/13,12:46:42.493,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0020.0,
-$TSMES,27/11/13,12:47:10.163,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0021.0,
-$TSMES,27/11/13,12:49:31.763,BLCAR,-1,R0482,1,002,MERL-MNG,P,VAT,-002.4,
-$TSMES,27/11/13,12:50:05.748,BLCAR,-1,R0482,1,002,MELA-AEG,G,VAT,-000.1,
-$TSMES,27/11/13,12:52:27.719,BLCAR,-1,R0482,1,002,MERL-MNG,0,VAT,-000.2,
-$TSMES,27/11/13,12:53:38.590,BLCAR, 0,R0482,1,001,EUTR-GUR,0,VAT,0006.6,
-$TSMES,27/11/13,12:54:05.175,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0034.3,
-$TSMES,27/11/13,12:54:57.849,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0039.3,
-$TSMES,27/11/13,12:55:38.978,BLCAR, 0,R0482,1,001,EUTR-GUR,0,VAT,0005.0,
-$TSMES,27/11/13,12:55:58.875,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0038.0,
-$TSMES,27/11/13,12:56:58.719,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0039.8,
-$TSMES,27/11/13,12:58:00.192,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0040.2,
-$TSMES,27/11/13,12:58:59.709,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0041.0,
-$TSMES,27/11/13,13:00:07.669,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0042.2,
-$TSMES,27/11/13,13:00:30.038,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0040.7,
-$TSMES,27/11/13,13:00:56.621,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0042.0,
-$TSMES,27/11/13,13:01:46.953,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0039.7,
-$TSMES,27/11/13,13:02:16.623,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0042.7,
-$TSMES,27/11/13,13:03:14.387,BLCAR, 0,R0482,1,001,EUTR-GUR,0,VAT,0008.3,
-$TSMES,27/11/13,13:03:53.935,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0041.8,
-$TSMES,27/11/13,13:04:18.682,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0041.8,
-$TSMES,27/11/13,13:04:44.747,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0041.8,
-$TSMES,27/11/13,13:06:33.303,BLCAR, 0,R0482,1,002,TRIS-ESM,0,VAT,0037.5,
-$TSMES,27/11/13,13:07:10.083,BLCAR, 0,R0482,1,001,MERL-MNG,0,VAT,0011.8,
-$TSMES,27/11/13,13:12:04.520,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0042.3,
-$TSMES,27/11/13,13:13:25.402,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0041.3,
-$TSMES,27/11/13,13:13:45.372,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0042.0,
-$TSMES,27/11/13,13:14:52.337,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0040.0,
-$TSMES,27/11/13,13:16:04.830,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0041.4,
-$TSMES,27/11/13,13:16:47.888,BLCAR, 0,R0482,1,002,MERL-MNG,P,VAT,0041.0,
-$TSMES,27/11/13,13:17:10.620,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0045.5,
-$TSMES,27/11/13,13:18:21.177,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0041.8,
-$TSMES,27/11/13,13:18:46.078,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0041.1,
-$TSMES,27/11/13,13:20:06.454,BLCAR, 0,R0482,1,001,EUTR-GUR,0,VAT,0008.4,
-$TSMES,27/11/13,13:20:43.587,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0040.2,
-$TSMES,27/11/13,13:21:13.460,BLCAR, 0,R0482,1,002,TRIS-ESM,0,VAT,0035.1,
-$TSMES,27/11/13,13:21:42.160,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0043.2,
-$TSMES,27/11/13,13:22:43.729,BLCAR, 0,R0482,1,002,EUTR-GUR,0,VAT,0036.9,
-$TSMES,27/11/13,13:23:05.231,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0040.3,
-$TSMES,27/11/13,13:23:34.911,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0040.9,
-$TSMES,27/11/13,13:24:11.619,BLCAR, 0,R0482,1,002,MELA-AEG,0,VAT,0038.0,
-$TSMES,27/11/13,13:24:31.678,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0041.6,
-$TSMES,27/11/13,13:25:51.665,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0041.5,
-$TSMES,27/11/13,13:26:40.759,BLCAR, 0,R0482,1,002,EUTR-GUR,0,VAT,0034.1,
-$TSMES,27/11/13,13:27:08.325,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0040.0,
-$TSMES,27/11/13,13:27:38.129,BLCAR, 0,R0482,1,002,SCYL-CAN,0,VAT,0036.8,
-$TSMES,27/11/13,13:30:07.410,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0040.1,
-$TSMES,27/11/13,13:31:10.336,BLCAR, 0,R0482,1,001,EUTR-GUR,0,VAT,0008.4,
-$TSMES,27/11/13,13:33:25.697,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0042.7,
-$TSMES,27/11/13,13:35:13.921,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0028.1,
-$TSMES,27/11/13,13:35:34.139,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0040.6,
-$TSMES,27/11/13,13:36:54.752,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0041.0,
-$TSMES,27/11/13,13:37:51.527,BLCAR, 0,R0482,1,002,MELA-AEG,0,VAT,0039.3,
-$TSMES,27/11/13,13:38:19.527,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0041.1,
-$TSMES,27/11/13,13:39:05.751,BLCAR, 0,R0482,1,002,LOPH-PIS,0,VAT,0024.2,
-$TSMES,27/11/13,13:39:33.528,BLCAR, 0,R0482,1,002,SCYL-CAN,0,VAT,0024.4,
-$TSMES,27/11/13,13:39:55.322,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0037.2,
-$TSMES,27/11/13,13:40:29.179,BLCAR, 0,R0482,1,001,MERL-MCC,0,VAT,0004.7,
-$TSMES,27/11/13,13:40:48.783,BLCAR, 0,R0482,1,001,SQUA-ACA,0,VAT,0001.8,
-$TSMES,27/11/13,13:41:11.596,BLCAR, 0,R0482,1,002,EUTR-GUR,0,VAT,0036.8,
-$TSMES,27/11/13,13:41:43.833,BLCAR, 0,R0482,1,002,MELA-AEG,G,VAT,0038.3,
-$TSMES,27/11/13,13:42:28.895,BLCAR, 0,R0482,1,001,MOLV-MOL,0,VAT,0000.7,
-$TSMES,27/11/13,13:42:57.179,BLCAR, 0,R0482,1,001,SCOM-SCO,0,VAT,0000.4,
-$TSMES,27/11/13,13:43:24.662,BLCAR, 0,R0482,1,002,CLUP-HAR,0,VAT,0028.9,
-$TSMES,27/11/13,13:44:00.332,BLCAR, 0,R0482,1,001,ARGE-SPH,0,VAT,0001.4,
-$TSMES,27/11/13,13:44:33.512,BLCAR, 0,R0482,1,001,GLYP-CYN,0,VAT,0000.3,
-$TSMES,27/11/13,13:45:01.228,BLCAR, 0,R0482,1,002,MELA-AEG,P,VAT,0044.2,
-$TSMES,27/11/13,13:45:44.635,BLCAR, 0,R0482,1,001,NEPH-NOR,0,VAT,0000.7,
-$TSMES,27/11/13,13:46:34.572,BLCAR, 0,R0482,1,001,MICR-POU,0,VAT,0001.5,
-$TSMES,27/11/13,13:46:58.845,BLCAR, 0,R0482,1,001,HIPP-PLA,0,VAT,0006.0,
-$TSMES,27/11/13,13:47:30.185,BLCAR, 0,R0482,1,002,TRIS-ESM,0,VAT,0027.9,
-$TSMES,27/11/13,13:48:06.934,BLCAR, 0,R0482,1,001,TRIS-MIN,0,VAT,0008.4,
-$TSMES,27/11/13,13:49:00.114,BLCAR, 0,R0482,1,001,ASPI-CUC,0,VAT,0000.3,
-$TSMES,27/11/13,13:49:22.326,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0034.3,
-$TSMES,27/11/13,13:50:00.587,BLCAR, 0,R0482,1,001,MICR-KIT,0,VAT,0002.0,
-$TSMES,27/11/13,13:50:54.059,BLCAR, 0,R0482,1,001,LIMA-LIM,0,VAT,0000.8,
-$TSMES,27/11/13,13:51:57.928,BLCAR, 0,R0482,1,001,CALL-LYR,0,VAT,0000.7,
-$TSMES,27/11/13,13:53:03.922,BLCAR, 0,R0482,1,001,LEPI-WHI,0,VAT,0005.3,
-$TSMES,27/11/13,13:53:27.565,BLCAR, 0,R0482,1,001,CALL-MAC,0,VAT,0000.2,
-$TSMES,27/11/13,13:53:57.947,BLCAR, 0,R0482,1,001,PLEU-PLA,0,VAT,0000.8,
-$TSMES,27/11/13,13:54:15.343,BLCAR, 0,R0482,1,001,TODA-EBL,0,VAT,0000.2,
-$TSMES,27/11/13,13:54:35.664,BLCAR, 0,R0482,1,001,ELED-CIR,0,VAT,0000.3,
-$TSMES,27/11/13,13:55:04.135,BLCAR, 0,R0482,1,001,TRAC-TRU,0,VAT,0000.7,
+$TSMES,27/11/13,09:12:04.612,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0015.6,
+$TSMES,27/11/13,09:13:21.994,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0018.9,
+$TSMES,27/11/13,09:15:12.588,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0021.4,
+$TSMES,27/11/13,09:15:58.396,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0017.9,
+$TSMES,27/11/13,09:17:11.714,BLCAR, 0,A,1,002,TRISESM,0,VAT,0017.2,
+$TSMES,27/11/13,09:17:40.272,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0021.1,
+$TSMES,27/11/13,09:18:48.818,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0018.0,
+$TSMES,27/11/13,09:19:33.335,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0016.6,
+$TSMES,27/11/13,09:21:16.442,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0015.8,
+$TSMES,27/11/13,09:21:40.776,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0022.8,
+$TSMES,27/11/13,09:22:45.945,BLCAR, 0,A,1,002,TRISESM,0,VAT,0016.1,
+$TSMES,27/11/13,09:26:51.656,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0019.1,
+$TSMES,27/11/13,09:27:53.133,BLCAR, 0,A,1,002,TRISESM,0,VAT,0016.5,
+$TSMES,27/11/13,09:28:17.445,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0018.4,
+$TSMES,27/11/13,09:31:22.362,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0014.6,
+$TSMES,27/11/13,09:31:45.650,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0018.4,
+$TSMES,27/11/13,09:32:05.512,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0023.0,
+$TSMES,27/11/13,09:33:00.869,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0014.2,
+$TSMES,27/11/13,09:33:24.472,BLCAR, 0,A,1,002,TRISESM,0,VAT,0012.8,
+$TSMES,27/11/13,09:34:25.343,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0015.8,
+$TSMES,27/11/13,09:34:44.541,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0021.0,
+$TSMES,27/11/13,09:36:02.174,BLCAR, 0,A,1,001,NEPHNOR,0,VAT,0006.3,
+$TSMES,27/11/13,09:36:30.632,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0024.1,
+$TSMES,27/11/13,09:37:25.749,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0017.5,
+$TSMES,27/11/13,09:37:47.056,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0018.3,
+$TSMES,27/11/13,09:38:44.513,BLCAR, 0,A,1,002,TRISESM,0,VAT,0018.5,
+$TSMES,27/11/13,09:40:34.621,BLCAR, 0,A,1,002,TRISESM,0,VAT,0015.8,
+$TSMES,27/11/13,09:41:28.855,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0011.3,
+$TSMES,27/11/13,09:42:39.349,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0016.7,
+$TSMES,27/11/13,09:43:01.405,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0020.2,
+$TSMES,27/11/13,09:43:21.779,BLCAR, 0,A,1,002,TRISESM,0,VAT,0018.7,
+$TSMES,27/11/13,09:44:16.028,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0025.7,
+$TSMES,27/11/13,09:44:39.643,BLCAR, 0,A,1,002,MERLMCC,0,VAT,0017.6,
+$TSMES,27/11/13,09:45:41.310,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0015.9,
+$TSMES,27/11/13,09:46:04.181,BLCAR, 0,A,1,002,TRISESM,0,VAT,0018.0,
+$TSMES,27/11/13,09:47:00.822,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0018.1,
+$TSMES,27/11/13,09:47:25.806,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0018.0,
+$TSMES,27/11/13,09:48:25.059,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0013.1,
+$TSMES,27/11/13,09:48:47.779,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0016.4,
+$TSMES,27/11/13,09:50:25.036,BLCAR,-1,A,1,002,CLUPHAR,0,VAT,-001.8,
+$TSMES,27/11/13,09:51:02.085,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0016.5,
+$TSMES,27/11/13,09:52:08.332,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0016.2,
+$TSMES,27/11/13,09:52:34.644,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0020.6,
+$TSMES,27/11/13,09:52:57.540,BLCAR, 0,A,1,002,TRISESM,0,VAT,0016.1,
+$TSMES,27/11/13,09:53:31.676,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0018.3,
+$TSMES,27/11/13,09:54:07.781,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0021.0,
+$TSMES,27/11/13,09:55:10.374,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0018.4,
+$TSMES,27/11/13,09:55:35.859,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0018.1,
+$TSMES,27/11/13,09:56:02.545,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0014.2,
+$TSMES,27/11/13,09:57:06.900,BLCAR, 0,A,1,002,EUTRGUR,0,VAT,0013.5,
+$TSMES,27/11/13,09:57:28.821,BLCAR, 0,A,1,002,TRISESM,0,VAT,0018.3,
+$TSMES,27/11/13,09:58:35.607,BLCAR, 0,A,1,001,MERLMNG,0,VAT,0009.9,
+$TSMES,27/11/13,09:59:17.462,BLCAR, 0,A,1,001,EUTRGUR,0,VAT,0006.9,
+$TSMES,27/11/13,10:00:18.404,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0023.0,
+$TSMES,27/11/13,10:00:45.111,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0014.8,
+$TSMES,27/11/13,10:01:59.945,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0019.3,
+$TSMES,27/11/13,10:02:23.121,BLCAR, 0,A,1,002,NEPHNOR,0,VAT,0010.2,
+$TSMES,27/11/13,10:03:37.632,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0014.0,
+$TSMES,27/11/13,10:04:06.529,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0015.1,
+$TSMES,27/11/13,10:05:06.144,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0014.0,
+$TSMES,27/11/13,10:05:36.831,BLCAR, 0,A,1,002,TRISESM,0,VAT,0020.3,
+$TSMES,27/11/13,10:06:02.527,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0012.3,
+$TSMES,27/11/13,10:07:12.015,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0023.7,
+$TSMES,27/11/13,10:07:44.295,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0018.2,
+$TSMES,27/11/13,10:08:22.400,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0017.6,
+$TSMES,27/11/13,10:09:24.404,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0022.5,
+$TSMES,27/11/13,10:09:45.542,BLCAR, 0,A,1,002,TRISESM,0,VAT,0017.7,
+$TSMES,27/11/13,10:10:07.635,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0021.8,
+$TSMES,27/11/13,10:10:38.750,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0011.2,
+$TSMES,27/11/13,10:11:05.784,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0015.9,
+$TSMES,27/11/13,10:11:34.634,BLCAR, 0,A,1,002,CONGCON,0,VAT,0001.0,
+$TSMES,27/11/13,10:12:40.011,BLCAR,-1,A,1,002,RAJACLA,0,VAT,-000.1,
+$TSMES,27/11/13,10:13:08.077,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0014.8,
+$TSMES,27/11/13,10:13:35.173,BLCAR, 0,A,1,002,TRISESM,0,VAT,0012.2,
+$TSMES,27/11/13,10:13:56.456,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0020.3,
+$TSMES,27/11/13,10:14:43.589,BLCAR, 0,A,1,001,HIPPPLA,0,VAT,0002.9,
+$TSMES,27/11/13,10:15:33.096,BLCAR, 0,A,1,001,MELAAEG,P,VAT,0001.4,
+$TSMES,27/11/13,10:15:59.750,BLCAR, 0,A,1,002,MELAAEG,G,VAT,0007.8,
+$TSMES,27/11/13,10:16:28.073,BLCAR, 0,A,1,001,GADUMOR,0,VAT,0000.1,
+$TSMES,27/11/13,10:17:04.293,BLCAR, 0,A,1,001,MERLMNG,0,VAT,0007.1,
+$TSMES,27/11/13,10:17:35.174,BLCAR, 0,A,1,001,TRISMIN,0,VAT,0006.0,
+$TSMES,27/11/13,10:18:09.419,BLCAR, 0,A,1,001,MERLMNG,P,VAT,0007.4,
+$TSMES,27/11/13,10:18:41.202,BLCAR, 0,A,1,001,MERLMNG,0,VAT,0000.4,
+$TSMES,27/11/13,10:19:05.719,BLCAR, 0,A,1,002,CLUPHAR,0,VAT,0007.7,
+$TSMES,27/11/13,10:19:50.270,BLCAR, 0,A,1,001,HIPPPLA,0,VAT,0002.7,
+$TSMES,27/11/13,10:20:20.642,BLCAR, 0,A,1,002,MICRPOU,0,VAT,0010.7,
+$TSMES,27/11/13,10:20:48.724,BLCAR, 0,A,1,001,LOLIFOR,0,VAT,0002.2,
+$TSMES,27/11/13,10:21:10.768,BLCAR, 0,A,1,001,EUTRGUR,0,VAT,0004.7,
+$TSMES,27/11/13,10:21:41.022,BLCAR, 0,A,1,001,NEPHNOR,0,VAT,0006.3,
+$TSMES,27/11/13,10:22:42.411,BLCAR, 0,A,1,001,ARGESPH,0,VAT,0000.1,
+$TSMES,27/11/13,10:23:25.537,BLCAR, 0,A,1,001,TRACTRU,0,VAT,0000.1,
+$TSMES,27/11/13,10:24:06.077,BLCAR, 0,A,1,001,SCOMSCO,0,VAT,0000.4,
+$TSMES,27/11/13,10:24:34.127,BLCAR, 0,A,1,001,MAURMUE,0,VAT,0000.1,
+$TSMES,27/11/13,10:25:23.660,BLCAR, 0,A,1,001,LEPIWHI,0,VAT,0003.1,
+$TSMES,27/11/13,10:25:47.598,BLCAR, 0,A,1,002,SCYLCAN,0,VAT,0005.3,
+$TSMES,27/11/13,10:26:12.602,BLCAR, 0,A,1,002,LOPHPIS,0,VAT,0012.0,
+$TSMES,27/11/13,10:26:33.530,BLCAR, 0,A,1,003,ELEDCIR,0,VAT,0001.4,
+$TSMES,27/11/13,10:27:34.508,BLCAR, 0,A,1,003,ROSSMAC,0,VAT,0000.1,
+$TSMES,27/11/13,10:28:17.554,BLCAR, 0,A,1,001,ENCHCIM,0,VAT,0000.8,
+$TSMES,27/11/13,10:28:57.935,BLCAR, 0,A,1,001,LIMALIM,0,VAT,0000.2,
+$TSMES,27/11/13,10:29:42.251,BLCAR, 0,A,1,001,CALLMAC,0,VAT,0000.2,
+$TSMES,27/11/13,10:30:09.536,BLCAR, 0,A,1,001,CALLLYR,0,VAT,0000.8,
+$TSMES,27/11/13,10:30:59.437,BLCAR, 0,A,1,001,MICRVAR,0,VAT,0000.2,
+$TSMES,27/11/13,10:31:32.624,BLCAR, 0,A,1,001,SEPIOLZ,0,VAT,0000.2,
+$TSMES,27/11/13,10:31:59.713,BLCAR, 0,A,1,003,LOLIFOR,P,VAT,0000.1,
+$TSMES,27/11/13,10:32:34.851,BLCAR, 0,A,1,003,TODAEBL,0,VAT,0000.2,
+$TSMES,27/11/13,10:33:02.175,BLCAR, 0,A,1,002,MERLMCC,0,VAT,0013.8,
+$TSMES,27/11/13,10:35:38.377,BLCAR, 0,A,1,001,GLYPCYN,0,VAT,0000.3,
+$TSMES,27/11/13,12:04:35.575,BLCAR, 0,R0482,1,001,MERLMNG,0,VAT,0020.0,
+$TSMES,27/11/13,12:06:30.634,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.9,
+$TSMES,27/11/13,12:08:42.036,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.3,
+$TSMES,27/11/13,12:09:02.786,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0019.2,
+$TSMES,27/11/13,12:12:30.199,BLCAR, 0,R0482,1,002,MELAAEG,0,VAT,0021.9,
+$TSMES,27/11/13,12:13:14.543,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0000.0,
+$TSMES,27/11/13,12:13:35.465,BLCAR,-1,R0482,1,002,MELAAEG,0,VAT,-001.4,
+$TSMES,27/11/13,12:14:42.156,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0000.9,
+$TSMES,27/11/13,12:15:05.319,BLCAR,-1,R0482,1,002,CLUPHAR,0,VAT,-002.9,
+$TSMES,27/11/13,12:16:11.874,BLCAR, 0,R0482,1,001,EUTRGUR,0,VAT,0007.1,
+$TSMES,27/11/13,12:16:53.113,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0000.3,
+$TSMES,27/11/13,12:19:51.787,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0000.4,
+$TSMES,27/11/13,12:20:45.974,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.5,
+$TSMES,27/11/13,12:21:08.178,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.2,
+$TSMES,27/11/13,12:21:41.969,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0021.3,
+$TSMES,27/11/13,12:22:09.619,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0015.2,
+$TSMES,27/11/13,12:23:05.053,BLCAR, 0,R0482,1,002,MERLMNG,P,VAT,0014.7,
+$TSMES,27/11/13,12:24:17.176,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0016.4,
+$TSMES,27/11/13,12:25:25.163,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.8,
+$TSMES,27/11/13,12:27:27.892,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0017.8,
+$TSMES,27/11/13,12:27:49.775,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0017.7,
+$TSMES,27/11/13,12:28:15.701,BLCAR, 0,R0482,1,001,EUTRGUR,0,VAT,0007.3,
+$TSMES,27/11/13,12:32:10.843,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0018.7,
+$TSMES,27/11/13,12:34:21.824,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.6,
+$TSMES,27/11/13,12:35:28.244,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.9,
+$TSMES,27/11/13,12:35:55.232,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0018.6,
+$TSMES,27/11/13,12:36:27.381,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.9,
+$TSMES,27/11/13,12:37:02.445,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0021.9,
+$TSMES,27/11/13,12:38:17.102,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0020.9,
+$TSMES,27/11/13,12:38:39.197,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0020.5,
+$TSMES,27/11/13,12:39:55.258,BLCAR, 0,R0482,1,001,EUTRGUR,0,VAT,0008.8,
+$TSMES,27/11/13,12:41:15.892,BLCAR, 0,R0482,1,001,MELAAEG,P,VAT,0008.7,
+$TSMES,27/11/13,12:41:42.452,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0019.1,
+$TSMES,27/11/13,12:43:19.486,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0018.1,
+$TSMES,27/11/13,12:44:34.765,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0018.3,
+$TSMES,27/11/13,12:45:02.744,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0018.4,
+$TSMES,27/11/13,12:46:42.493,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0020.0,
+$TSMES,27/11/13,12:47:10.163,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0021.0,
+$TSMES,27/11/13,12:49:31.763,BLCAR,-1,R0482,1,002,MERLMNG,P,VAT,-002.4,
+$TSMES,27/11/13,12:50:05.748,BLCAR,-1,R0482,1,002,MELAAEG,G,VAT,-000.1,
+$TSMES,27/11/13,12:52:27.719,BLCAR,-1,R0482,1,002,MERLMNG,0,VAT,-000.2,
+$TSMES,27/11/13,12:53:38.590,BLCAR, 0,R0482,1,001,EUTRGUR,0,VAT,0006.6,
+$TSMES,27/11/13,12:54:05.175,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0034.3,
+$TSMES,27/11/13,12:54:57.849,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0039.3,
+$TSMES,27/11/13,12:55:38.978,BLCAR, 0,R0482,1,001,EUTRGUR,0,VAT,0005.0,
+$TSMES,27/11/13,12:55:58.875,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0038.0,
+$TSMES,27/11/13,12:56:58.719,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0039.8,
+$TSMES,27/11/13,12:58:00.192,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0040.2,
+$TSMES,27/11/13,12:58:59.709,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0041.0,
+$TSMES,27/11/13,13:00:07.669,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0042.2,
+$TSMES,27/11/13,13:00:30.038,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0040.7,
+$TSMES,27/11/13,13:00:56.621,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0042.0,
+$TSMES,27/11/13,13:01:46.953,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0039.7,
+$TSMES,27/11/13,13:02:16.623,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0042.7,
+$TSMES,27/11/13,13:03:14.387,BLCAR, 0,R0482,1,001,EUTRGUR,0,VAT,0008.3,
+$TSMES,27/11/13,13:03:53.935,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0041.8,
+$TSMES,27/11/13,13:04:18.682,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0041.8,
+$TSMES,27/11/13,13:04:44.747,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0041.8,
+$TSMES,27/11/13,13:06:33.303,BLCAR, 0,R0482,1,002,TRISESM,0,VAT,0037.5,
+$TSMES,27/11/13,13:07:10.083,BLCAR, 0,R0482,1,001,MERLMNG,0,VAT,0011.8,
+$TSMES,27/11/13,13:12:04.520,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0042.3,
+$TSMES,27/11/13,13:13:25.402,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0041.3,
+$TSMES,27/11/13,13:13:45.372,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0042.0,
+$TSMES,27/11/13,13:14:52.337,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0040.0,
+$TSMES,27/11/13,13:16:04.830,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0041.4,
+$TSMES,27/11/13,13:16:47.888,BLCAR, 0,R0482,1,002,MERLMNG,P,VAT,0041.0,
+$TSMES,27/11/13,13:17:10.620,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0045.5,
+$TSMES,27/11/13,13:18:21.177,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0041.8,
+$TSMES,27/11/13,13:18:46.078,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0041.1,
+$TSMES,27/11/13,13:20:06.454,BLCAR, 0,R0482,1,001,EUTRGUR,0,VAT,0008.4,
+$TSMES,27/11/13,13:20:43.587,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0040.2,
+$TSMES,27/11/13,13:21:13.460,BLCAR, 0,R0482,1,002,TRISESM,0,VAT,0035.1,
+$TSMES,27/11/13,13:21:42.160,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0043.2,
+$TSMES,27/11/13,13:22:43.729,BLCAR, 0,R0482,1,002,EUTRGUR,0,VAT,0036.9,
+$TSMES,27/11/13,13:23:05.231,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0040.3,
+$TSMES,27/11/13,13:23:34.911,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0040.9,
+$TSMES,27/11/13,13:24:11.619,BLCAR, 0,R0482,1,002,MELAAEG,0,VAT,0038.0,
+$TSMES,27/11/13,13:24:31.678,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0041.6,
+$TSMES,27/11/13,13:25:51.665,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0041.5,
+$TSMES,27/11/13,13:26:40.759,BLCAR, 0,R0482,1,002,EUTRGUR,0,VAT,0034.1,
+$TSMES,27/11/13,13:27:08.325,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0040.0,
+$TSMES,27/11/13,13:27:38.129,BLCAR, 0,R0482,1,002,SCYLCAN,0,VAT,0036.8,
+$TSMES,27/11/13,13:30:07.410,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0040.1,
+$TSMES,27/11/13,13:31:10.336,BLCAR, 0,R0482,1,001,EUTRGUR,0,VAT,0008.4,
+$TSMES,27/11/13,13:33:25.697,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0042.7,
+$TSMES,27/11/13,13:35:13.921,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0028.1,
+$TSMES,27/11/13,13:35:34.139,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0040.6,
+$TSMES,27/11/13,13:36:54.752,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0041.0,
+$TSMES,27/11/13,13:37:51.527,BLCAR, 0,R0482,1,002,MELAAEG,0,VAT,0039.3,
+$TSMES,27/11/13,13:38:19.527,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0041.1,
+$TSMES,27/11/13,13:39:05.751,BLCAR, 0,R0482,1,002,LOPHPIS,0,VAT,0024.2,
+$TSMES,27/11/13,13:39:33.528,BLCAR, 0,R0482,1,002,SCYLCAN,0,VAT,0024.4,
+$TSMES,27/11/13,13:39:55.322,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0037.2,
+$TSMES,27/11/13,13:40:29.179,BLCAR, 0,R0482,1,001,MERLMCC,0,VAT,0004.7,
+$TSMES,27/11/13,13:40:48.783,BLCAR, 0,R0482,1,001,SQUAACA,0,VAT,0001.8,
+$TSMES,27/11/13,13:41:11.596,BLCAR, 0,R0482,1,002,EUTRGUR,0,VAT,0036.8,
+$TSMES,27/11/13,13:41:43.833,BLCAR, 0,R0482,1,002,MELAAEG,G,VAT,0038.3,
+$TSMES,27/11/13,13:42:28.895,BLCAR, 0,R0482,1,001,MOLVMOL,0,VAT,0000.7,
+$TSMES,27/11/13,13:42:57.179,BLCAR, 0,R0482,1,001,SCOMSCO,0,VAT,0000.4,
+$TSMES,27/11/13,13:43:24.662,BLCAR, 0,R0482,1,002,CLUPHAR,0,VAT,0028.9,
+$TSMES,27/11/13,13:44:00.332,BLCAR, 0,R0482,1,001,ARGESPH,0,VAT,0001.4,
+$TSMES,27/11/13,13:44:33.512,BLCAR, 0,R0482,1,001,GLYPCYN,0,VAT,0000.3,
+$TSMES,27/11/13,13:45:01.228,BLCAR, 0,R0482,1,002,MELAAEG,P,VAT,0044.2,
+$TSMES,27/11/13,13:45:44.635,BLCAR, 0,R0482,1,001,NEPHNOR,0,VAT,0000.7,
+$TSMES,27/11/13,13:46:34.572,BLCAR, 0,R0482,1,001,MICRPOU,0,VAT,0001.5,
+$TSMES,27/11/13,13:46:58.845,BLCAR, 0,R0482,1,001,HIPPPLA,0,VAT,0006.0,
+$TSMES,27/11/13,13:47:30.185,BLCAR, 0,R0482,1,002,TRISESM,0,VAT,0027.9,
+$TSMES,27/11/13,13:48:06.934,BLCAR, 0,R0482,1,001,TRISMIN,0,VAT,0008.4,
+$TSMES,27/11/13,13:49:00.114,BLCAR, 0,R0482,1,001,ASPICUC,0,VAT,0000.3,
+$TSMES,27/11/13,13:49:22.326,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0034.3,
+$TSMES,27/11/13,13:50:00.587,BLCAR, 0,R0482,1,001,MICRKIT,0,VAT,0002.0,
+$TSMES,27/11/13,13:50:54.059,BLCAR, 0,R0482,1,001,LIMALIM,0,VAT,0000.8,
+$TSMES,27/11/13,13:51:57.928,BLCAR, 0,R0482,1,001,CALLLYR,0,VAT,0000.7,
+$TSMES,27/11/13,13:53:03.922,BLCAR, 0,R0482,1,001,LEPIWHI,0,VAT,0005.3,
+$TSMES,27/11/13,13:53:27.565,BLCAR, 0,R0482,1,001,CALLMAC,0,VAT,0000.2,
+$TSMES,27/11/13,13:53:57.947,BLCAR, 0,R0482,1,001,PLEUPLA,0,VAT,0000.8,
+$TSMES,27/11/13,13:54:15.343,BLCAR, 0,R0482,1,001,TODAEBL,0,VAT,0000.2,
+$TSMES,27/11/13,13:54:35.664,BLCAR, 0,R0482,1,001,ELEDCIR,0,VAT,0000.3,
+$TSMES,27/11/13,13:55:04.135,BLCAR, 0,R0482,1,001,TRACTRU,0,VAT,0000.7,
$TSMES,27/11/13,13:55:28.772,BLCAR, 0,R0482,1,001,LOLI-FOR,0,VAT,0001.1,
-$TSMES,27/11/13,13:56:07.647,BLCAR, 0,R0482,1,002,MERL-MNG,0,VAT,0039.5,
-$TSMES,27/11/13,13:56:47.621,BLCAR, 0,R0482,1,001,SEPI-OLZ,0,VAT,0000.1,
-$TSMES,27/11/13,13:58:31.048,BLCAR, 0,R0482,1,001,HIPP-PLA,0,VAT,0000.0,
-$TSMES,27/11/13,15:04:17.116,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0037.6,
-$TSMES,27/11/13,15:05:36.658,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0039.3,
-$TSMES,27/11/13,15:07:24.923,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0040.3,
-$TSMES,27/11/13,15:08:42.057,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.9,
-$TSMES,27/11/13,15:09:01.674,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0040.5,
-$TSMES,27/11/13,15:10:13.129,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.1,
-$TSMES,27/11/13,15:10:36.121,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0040.2,
-$TSMES,27/11/13,15:11:00.595,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0036.5,
-$TSMES,27/11/13,15:11:53.701,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.9,
-$TSMES,27/11/13,15:14:24.769,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0040.1,
-$TSMES,27/11/13,15:16:18.478,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0041.0,
-$TSMES,27/11/13,15:16:38.981,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.6,
-$TSMES,27/11/13,15:17:36.780,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0037.6,
-$TSMES,27/11/13,15:17:59.835,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0040.4,
-$TSMES,27/11/13,15:19:19.326,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0037.7,
-$TSMES,27/11/13,15:19:51.956,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0037.5,
-$TSMES,27/11/13,15:21:07.014,BLCAR, 0,R0483,1,002,TRIS-ESM,0,VAT,0038.8,
-$TSMES,27/11/13,15:21:35.753,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0041.0,
-$TSMES,27/11/13,15:21:57.564,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0037.9,
-$TSMES,27/11/13,15:23:13.595,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0040.8,
-$TSMES,27/11/13,15:23:44.203,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.3,
-$TSMES,27/11/13,15:25:01.382,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0038.5,
-$TSMES,27/11/13,15:25:33.850,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.7,
-$TSMES,27/11/13,15:26:40.348,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.3,
-$TSMES,27/11/13,15:27:25.003,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0041.2,
-$TSMES,27/11/13,15:27:52.244,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0038.6,
-$TSMES,27/11/13,15:29:15.679,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.0,
-$TSMES,27/11/13,15:29:45.429,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0041.7,
-$TSMES,27/11/13,15:31:04.254,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.1,
-$TSMES,27/11/13,15:32:48.975,BLCAR, 0,R0483,1,002,TRIS-ESM,0,VAT,0036.8,
-$TSMES,27/11/13,15:33:13.585,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0040.6,
-$TSMES,27/11/13,15:33:38.474,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0040.9,
-$TSMES,27/11/13,15:34:25.118,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0036.7,
-$TSMES,27/11/13,15:35:39.285,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0039.7,
-$TSMES,27/11/13,15:36:06.481,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0037.3,
-$TSMES,27/11/13,15:36:54.494,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0040.6,
-$TSMES,27/11/13,15:38:37.423,BLCAR, 0,R0483,1,002,MELA-AEG,G,VAT,0039.6,
-$TSMES,27/11/13,15:39:06.734,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0037.4,
-$TSMES,27/11/13,15:39:30.356,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.2,
-$TSMES,27/11/13,15:42:01.949,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.5,
-$TSMES,27/11/13,15:42:32.622,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0040.3,
-$TSMES,27/11/13,15:43:53.560,BLCAR, 0,R0483,1,002,TRIS-ESM,0,VAT,0034.4,
-$TSMES,27/11/13,15:44:53.834,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0039.7,
-$TSMES,27/11/13,15:45:20.674,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0037.5,
-$TSMES,27/11/13,15:45:42.151,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0039.8,
-$TSMES,27/11/13,15:46:36.631,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0038.5,
-$TSMES,27/11/13,15:47:46.081,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0041.1,
-$TSMES,27/11/13,15:48:09.796,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0036.9,
-$TSMES,27/11/13,15:49:07.011,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0040.1,
-$TSMES,27/11/13,15:50:20.735,BLCAR, 0,R0483,1,001,EUTR-GUR,0,VAT,0009.3,
-$TSMES,27/11/13,15:50:46.736,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0037.4,
-$TSMES,27/11/13,15:51:54.878,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0041.3,
-$TSMES,27/11/13,15:52:30.751,BLCAR, 0,R0483,1,002,TRIS-ESM,0,VAT,0035.9,
-$TSMES,27/11/13,15:53:51.579,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0039.5,
-$TSMES,27/11/13,15:54:27.228,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.8,
-$TSMES,27/11/13,15:55:52.975,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0041.6,
-$TSMES,27/11/13,15:56:16.404,BLCAR, 0,R0483,1,001,EUTR-GUR,0,VAT,0008.4,
-$TSMES,27/11/13,15:57:44.638,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0039.2,
-$TSMES,27/11/13,15:58:03.736,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.4,
-$TSMES,27/11/13,15:59:20.147,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0037.1,
-$TSMES,27/11/13,15:59:42.581,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0038.5,
-$TSMES,27/11/13,16:00:05.526,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0038.5,
-$TSMES,27/11/13,16:01:05.295,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0039.2,
-$TSMES,27/11/13,16:01:38.199,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.2,
-$TSMES,27/11/13,16:02:43.037,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0037.8,
-$TSMES,27/11/13,16:03:48.080,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.5,
-$TSMES,27/11/13,16:04:19.938,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0040.8,
-$TSMES,27/11/13,16:04:44.532,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0039.0,
-$TSMES,27/11/13,16:05:05.076,BLCAR, 0,R0483,1,002,TRIS-ESM,0,VAT,0041.1,
-$TSMES,27/11/13,16:05:28.231,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0040.5,
-$TSMES,27/11/13,16:05:46.924,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.7,
-$TSMES,27/11/13,16:06:11.887,BLCAR, 0,R0483,1,002,MELA-AEG,G,VAT,0037.8,
-$TSMES,27/11/13,16:06:29.181,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0038.5,
-$TSMES,27/11/13,16:06:52.290,BLCAR, 0,R0483,1,002,SCYL-CAN,0,VAT,0032.9,
-$TSMES,27/11/13,16:07:14.568,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0039.6,
-$TSMES,27/11/13,16:07:31.751,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0039.8,
-$TSMES,27/11/13,16:08:04.245,BLCAR, 0,R0483,1,002,LOPH-PIS,0,VAT,0030.9,
-$TSMES,27/11/13,16:08:33.424,BLCAR, 0,R0483,1,002,CONG-CON,0,VAT,0023.2,
-$TSMES,27/11/13,16:08:57.169,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0039.8,
-$TSMES,27/11/13,16:09:30.997,BLCAR, 0,R0483,1,002,LEPI-WHI,0,VAT,0024.9,
-$TSMES,27/11/13,16:10:05.148,BLCAR, 0,R0483,1,002,SCOM-SCO,0,VAT,0020.7,
-$TSMES,27/11/13,16:10:39.324,BLCAR, 0,R0483,1,001,MICR-KIT,0,VAT,0000.8,
-$TSMES,27/11/13,16:11:07.157,BLCAR, 0,R0483,1,002,MERL-MCC,0,VAT,0031.9,
-$TSMES,27/11/13,16:11:35.229,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0037.3,
-$TSMES,27/11/13,16:12:26.292,BLCAR, 0,R0483,1,002,TRIS-ESM,0,VAT,0031.0,
-$TSMES,27/11/13,16:13:21.182,BLCAR, 0,R0483,1,001,GLYP-CYN,0,VAT,0001.0,
-$TSMES,27/11/13,16:13:47.758,BLCAR, 0,R0483,1,002,CLUP-HAR,0,VAT,0027.2,
-$TSMES,27/11/13,16:14:10.075,BLCAR, 0,R0483,1,002,LOLI-FOR,0,VAT,0022.6,
-$TSMES,27/11/13,16:14:35.253,BLCAR, 0,R0483,1,001,EUTR-GUR,0,VAT,0005.6,
-$TSMES,27/11/13,16:15:22.151,BLCAR, 0,R0483,1,001,MICR-POU,0,VAT,0001.1,
-$TSMES,27/11/13,16:16:14.956,BLCAR, 0,R0483,1,001,HIPP-PLA,0,VAT,0000.2,
-$TSMES,27/11/13,16:16:52.305,BLCAR, 0,R0483,1,001,TRAC-TRU,0,VAT,0000.4,
-$TSMES,27/11/13,16:17:13.456,BLCAR, 0,R0483,1,001,SPRA-SPR,0,VAT,0000.6,
-$TSMES,27/11/13,16:17:37.593,BLCAR, 0,R0483,1,001,ARGE-SPH,0,VAT,0000.8,
-$TSMES,27/11/13,16:18:08.358,BLCAR, 0,R0483,1,001,SEPI-OLZ,0,VAT,0000.1,
-$TSMES,27/11/13,16:18:44.478,BLCAR, 0,R0483,1,001,LOLI-FOR,P,VAT,0000.3,
-$TSMES,27/11/13,16:19:19.836,BLCAR, 0,R0483,1,002,MERL-MNG,0,VAT,0038.1,
-$TSMES,27/11/13,16:19:44.016,BLCAR, 0,R0483,1,002,MELA-AEG,0,VAT,0043.0,
-$TSMES,27/11/13,16:20:12.751,BLCAR, 0,R0483,1,001,TODA-EBL,0,VAT,0000.6,
-$TSMES,27/11/13,16:21:02.469,BLCAR, 0,R0483,1,001,CALL-LYR,0,VAT,0000.2,
-$TSMES,27/11/13,16:21:25.949,BLCAR, 0,R0483,1,001,CALL-MAC,0,VAT,0000.2,
-$TSMES,27/11/13,16:21:55.232,BLCAR, 0,R0483,1,002,MERL-MNG,P,VAT,0028.0,
-$TSMES,27/11/13,16:22:21.965,BLCAR, 0,R0483,1,001,ELED-CIR,0,VAT,0001.4,
-$TSMES,27/11/13,16:22:51.628,BLCAR, 0,R0483,1,001,TRIS-MIN,0,VAT,0003.6,
-$TSMES,27/11/13,18:49:59.855,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0019.8,
-$TSMES,27/11/13,18:50:19.448,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0016.8,
-$TSMES,27/11/13,18:55:48.008,BLCAR, 0,R0484,1,001,EUTR-GUR,0,VAT,0007.6,
-$TSMES,27/11/13,18:56:34.603,BLCAR, 0,R0484,1,002,EUTR-GUR,0,VAT,0011.7,
-$TSMES,27/11/13,18:58:57.070,BLCAR, 0,R0484,1,001,EUTR-GUR,0,VAT,0007.6,
-$TSMES,27/11/13,18:59:34.603,BLCAR, 0,R0484,1,002,MELA-NGE,0,VAT,0016.4,
-$TSMES,27/11/13,19:00:53.047,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0020.9,
-$TSMES,27/11/13,19:01:17.629,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0020.0,
-$TSMES,27/11/13,19:02:01.189,BLCAR, 0,R0484,1,002,EUTR-GUR,0,VAT,0008.5,
-$TSMES,27/11/13,19:02:23.329,BLCAR, 0,R0484,1,002,MELA-NGE,0,VAT,0016.1,
-$TSMES,27/11/13,19:04:11.551,BLCAR, 0,R0484,1,002,MERL-MNG,p,VAT,0020.9,
-$TSMES,27/11/13,19:04:54.312,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0017.9,
-$TSMES,27/11/13,19:05:31.029,BLCAR, 0,R0484,1,002,MELA-NGE,0,VAT,0016.0,
-$TSMES,27/11/13,19:06:32.679,BLCAR, 0,R0484,1,002,EUTR-GUR,0,VAT,0011.3,
-$TSMES,27/11/13,19:06:59.485,BLCAR, 0,R0484,1,001,EUTR-GUR,0,VAT,0007.3,
-$TSMES,27/11/13,19:10:50.599,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0019.0,
-$TSMES,27/11/13,19:12:32.300,BLCAR, 0,R0484,1,001,EUTR-GUR,0,VAT,0008.4,
-$TSMES,27/11/13,19:13:11.765,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0020.6,
-$TSMES,27/11/13,19:13:42.494,BLCAR, 0,R0484,1,002,MERL-MNG,p,VAT,0018.7,
-$TSMES,27/11/13,19:14:34.508,BLCAR, 0,R0484,1,002,MELA-NGE,0,VAT,0015.0,
-$TSMES,27/11/13,19:18:06.846,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0011.6,
-$TSMES,27/11/13,19:19:06.548,BLCAR, 0,R0484,1,001,EUTR-GUR,0,VAT,0008.6,
-$TSMES,27/11/13,19:19:29.730,BLCAR, 0,R0484,1,002,EUTR-GUR,0,VAT,0012.4,
-$TSMES,27/11/13,19:19:53.075,BLCAR, 0,R0484,1,002,MELA-AEG,0,VAT,0005.1,
-$TSMES,27/11/13,19:20:15.873,BLCAR, 0,R0484,1,002,EUTR-GUR,0,VAT,0013.7,
-$TSMES,27/11/13,19:20:42.508,BLCAR, 0,R0484,1,001,HIPP-PLA,0,VAT,0000.5,
-$TSMES,27/11/13,19:21:14.304,BLCAR, 0,R0484,1,001,SCYL-CAN,0,VAT,0000.9,
-$TSMES,27/11/13,19:22:30.586,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0021.2,
-$TSMES,27/11/13,19:22:50.150,BLCAR, 0,R0484,1,002,MERL-MNG,0,VAT,0009.2,
-$TSMES,27/11/13,19:23:12.550,BLCAR, 0,R0484,1,002,CLUP-HAR,0,VAT,0001.6,
-$TSMES,27/11/13,19:23:38.609,BLCAR, 0,R0484,1,002,MELA-NGE,0,VAT,0005.1,
-$TSMES,27/11/13,19:24:07.337,BLCAR, 0,R0484,1,001,MERL-MCC,0,VAT,0000.5,
-$TSMES,27/11/13,19:24:36.607,BLCAR, 0,R0484,1,001,HIPP-PLA,0,VAT,0001.7,
-$TSMES,27/11/13,19:25:36.793,BLCAR, 0,R0484,1,001,MICR-POU,0,VAT,0000.7,
-$TSMES,27/11/13,19:26:04.841,BLCAR, 0,R0484,1,002,MERL-MNG,p,VAT,0005.8,
-$TSMES,27/11/13,19:26:26.140,BLCAR, 0,R0484,1,001,SCOM-SCO,0,VAT,0000.0,
-$TSMES,27/11/13,19:26:47.870,BLCAR, 0,R0484,1,001,GLYP-CYN,0,VAT,0000.2,
-$TSMES,27/11/13,19:27:09.223,BLCAR, 0,R0484,1,001,TRIS-MIN,0,VAT,0000.6,
-$TSMES,27/11/13,19:27:29.741,BLCAR, 0,R0484,1,001,ARGE-SPH,0,VAT,0000.2,
-$TSMES,27/11/13,19:27:54.743,BLCAR, 0,R0484,1,001,TRAC-TRU,0,VAT,0000.2,
-$TSMES,27/11/13,19:28:15.821,BLCAR, 0,R0484,1,002,NEPH-NOR,0,VAT,0004.3,
-$TSMES,27/11/13,19:28:40.581,BLCAR, 0,R0484,1,001,SEPI-OLZ,0,VAT,0000.1,
-$TSMES,27/11/13,19:29:00.043,BLCAR, 0,R0484,1,001,LOLI-FOR,0,VAT,0000.1,
-$TSMES,27/11/13,19:29:34.076,BLCAR, 0,R0484,1,001,ROSS-MAC,0,VAT,0000.1,
-$TSMES,27/11/13,19:30:00.792,BLCAR, 0,R0484,1,001,ELED-CIR,0,VAT,0000.6,
-$TSMES,27/11/13,19:30:27.478,BLCAR, 0,R0484,1,001,TODA-EBL,0,VAT,0000.1,
+$TSMES,27/11/13,13:56:07.647,BLCAR, 0,R0482,1,002,MERLMNG,0,VAT,0039.5,
+$TSMES,27/11/13,13:56:47.621,BLCAR, 0,R0482,1,001,SEPIOLZ,0,VAT,0000.1,
+$TSMES,27/11/13,13:58:31.048,BLCAR, 0,R0482,1,001,HIPPPLA,0,VAT,0000.0,
+$TSMES,27/11/13,15:04:17.116,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0037.6,
+$TSMES,27/11/13,15:05:36.658,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0039.3,
+$TSMES,27/11/13,15:07:24.923,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0040.3,
+$TSMES,27/11/13,15:08:42.057,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.9,
+$TSMES,27/11/13,15:09:01.674,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0040.5,
+$TSMES,27/11/13,15:10:13.129,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.1,
+$TSMES,27/11/13,15:10:36.121,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0040.2,
+$TSMES,27/11/13,15:11:00.595,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0036.5,
+$TSMES,27/11/13,15:11:53.701,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.9,
+$TSMES,27/11/13,15:14:24.769,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0040.1,
+$TSMES,27/11/13,15:16:18.478,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0041.0,
+$TSMES,27/11/13,15:16:38.981,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.6,
+$TSMES,27/11/13,15:17:36.780,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0037.6,
+$TSMES,27/11/13,15:17:59.835,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0040.4,
+$TSMES,27/11/13,15:19:19.326,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0037.7,
+$TSMES,27/11/13,15:19:51.956,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0037.5,
+$TSMES,27/11/13,15:21:07.014,BLCAR, 0,R0483,1,002,TRISESM,0,VAT,0038.8,
+$TSMES,27/11/13,15:21:35.753,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0041.0,
+$TSMES,27/11/13,15:21:57.564,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0037.9,
+$TSMES,27/11/13,15:23:13.595,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0040.8,
+$TSMES,27/11/13,15:23:44.203,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.3,
+$TSMES,27/11/13,15:25:01.382,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0038.5,
+$TSMES,27/11/13,15:25:33.850,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.7,
+$TSMES,27/11/13,15:26:40.348,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.3,
+$TSMES,27/11/13,15:27:25.003,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0041.2,
+$TSMES,27/11/13,15:27:52.244,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0038.6,
+$TSMES,27/11/13,15:29:15.679,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.0,
+$TSMES,27/11/13,15:29:45.429,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0041.7,
+$TSMES,27/11/13,15:31:04.254,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.1,
+$TSMES,27/11/13,15:32:48.975,BLCAR, 0,R0483,1,002,TRISESM,0,VAT,0036.8,
+$TSMES,27/11/13,15:33:13.585,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0040.6,
+$TSMES,27/11/13,15:33:38.474,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0040.9,
+$TSMES,27/11/13,15:34:25.118,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0036.7,
+$TSMES,27/11/13,15:35:39.285,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0039.7,
+$TSMES,27/11/13,15:36:06.481,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0037.3,
+$TSMES,27/11/13,15:36:54.494,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0040.6,
+$TSMES,27/11/13,15:38:37.423,BLCAR, 0,R0483,1,002,MELAAEG,G,VAT,0039.6,
+$TSMES,27/11/13,15:39:06.734,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0037.4,
+$TSMES,27/11/13,15:39:30.356,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.2,
+$TSMES,27/11/13,15:42:01.949,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.5,
+$TSMES,27/11/13,15:42:32.622,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0040.3,
+$TSMES,27/11/13,15:43:53.560,BLCAR, 0,R0483,1,002,TRISESM,0,VAT,0034.4,
+$TSMES,27/11/13,15:44:53.834,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0039.7,
+$TSMES,27/11/13,15:45:20.674,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0037.5,
+$TSMES,27/11/13,15:45:42.151,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0039.8,
+$TSMES,27/11/13,15:46:36.631,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0038.5,
+$TSMES,27/11/13,15:47:46.081,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0041.1,
+$TSMES,27/11/13,15:48:09.796,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0036.9,
+$TSMES,27/11/13,15:49:07.011,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0040.1,
+$TSMES,27/11/13,15:50:20.735,BLCAR, 0,R0483,1,001,EUTRGUR,0,VAT,0009.3,
+$TSMES,27/11/13,15:50:46.736,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0037.4,
+$TSMES,27/11/13,15:51:54.878,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0041.3,
+$TSMES,27/11/13,15:52:30.751,BLCAR, 0,R0483,1,002,TRISESM,0,VAT,0035.9,
+$TSMES,27/11/13,15:53:51.579,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0039.5,
+$TSMES,27/11/13,15:54:27.228,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.8,
+$TSMES,27/11/13,15:55:52.975,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0041.6,
+$TSMES,27/11/13,15:56:16.404,BLCAR, 0,R0483,1,001,EUTRGUR,0,VAT,0008.4,
+$TSMES,27/11/13,15:57:44.638,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0039.2,
+$TSMES,27/11/13,15:58:03.736,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.4,
+$TSMES,27/11/13,15:59:20.147,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0037.1,
+$TSMES,27/11/13,15:59:42.581,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0038.5,
+$TSMES,27/11/13,16:00:05.526,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0038.5,
+$TSMES,27/11/13,16:01:05.295,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0039.2,
+$TSMES,27/11/13,16:01:38.199,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.2,
+$TSMES,27/11/13,16:02:43.037,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0037.8,
+$TSMES,27/11/13,16:03:48.080,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.5,
+$TSMES,27/11/13,16:04:19.938,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0040.8,
+$TSMES,27/11/13,16:04:44.532,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0039.0,
+$TSMES,27/11/13,16:05:05.076,BLCAR, 0,R0483,1,002,TRISESM,0,VAT,0041.1,
+$TSMES,27/11/13,16:05:28.231,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0040.5,
+$TSMES,27/11/13,16:05:46.924,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.7,
+$TSMES,27/11/13,16:06:11.887,BLCAR, 0,R0483,1,002,MELAAEG,G,VAT,0037.8,
+$TSMES,27/11/13,16:06:29.181,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0038.5,
+$TSMES,27/11/13,16:06:52.290,BLCAR, 0,R0483,1,002,SCYLCAN,0,VAT,0032.9,
+$TSMES,27/11/13,16:07:14.568,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0039.6,
+$TSMES,27/11/13,16:07:31.751,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0039.8,
+$TSMES,27/11/13,16:08:04.245,BLCAR, 0,R0483,1,002,LOPHPIS,0,VAT,0030.9,
+$TSMES,27/11/13,16:08:33.424,BLCAR, 0,R0483,1,002,CONGCON,0,VAT,0023.2,
+$TSMES,27/11/13,16:08:57.169,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0039.8,
+$TSMES,27/11/13,16:09:30.997,BLCAR, 0,R0483,1,002,LEPIWHI,0,VAT,0024.9,
+$TSMES,27/11/13,16:10:05.148,BLCAR, 0,R0483,1,002,SCOMSCO,0,VAT,0020.7,
+$TSMES,27/11/13,16:10:39.324,BLCAR, 0,R0483,1,001,MICRKIT,0,VAT,0000.8,
+$TSMES,27/11/13,16:11:07.157,BLCAR, 0,R0483,1,002,MERLMCC,0,VAT,0031.9,
+$TSMES,27/11/13,16:11:35.229,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0037.3,
+$TSMES,27/11/13,16:12:26.292,BLCAR, 0,R0483,1,002,TRISESM,0,VAT,0031.0,
+$TSMES,27/11/13,16:13:21.182,BLCAR, 0,R0483,1,001,GLYPCYN,0,VAT,0001.0,
+$TSMES,27/11/13,16:13:47.758,BLCAR, 0,R0483,1,002,CLUPHAR,0,VAT,0027.2,
+$TSMES,27/11/13,16:14:10.075,BLCAR, 0,R0483,1,002,LOLIFOR,0,VAT,0022.6,
+$TSMES,27/11/13,16:14:35.253,BLCAR, 0,R0483,1,001,EUTRGUR,0,VAT,0005.6,
+$TSMES,27/11/13,16:15:22.151,BLCAR, 0,R0483,1,001,MICRPOU,0,VAT,0001.1,
+$TSMES,27/11/13,16:16:14.956,BLCAR, 0,R0483,1,001,HIPPPLA,0,VAT,0000.2,
+$TSMES,27/11/13,16:16:52.305,BLCAR, 0,R0483,1,001,TRACTRU,0,VAT,0000.4,
+$TSMES,27/11/13,16:17:13.456,BLCAR, 0,R0483,1,001,SPRASPR,0,VAT,0000.6,
+$TSMES,27/11/13,16:17:37.593,BLCAR, 0,R0483,1,001,ARGESPH,0,VAT,0000.8,
+$TSMES,27/11/13,16:18:08.358,BLCAR, 0,R0483,1,001,SEPIOLZ,0,VAT,0000.1,
+$TSMES,27/11/13,16:18:44.478,BLCAR, 0,R0483,1,001,LOLIFOR,P,VAT,0000.3,
+$TSMES,27/11/13,16:19:19.836,BLCAR, 0,R0483,1,002,MERLMNG,0,VAT,0038.1,
+$TSMES,27/11/13,16:19:44.016,BLCAR, 0,R0483,1,002,MELAAEG,0,VAT,0043.0,
+$TSMES,27/11/13,16:20:12.751,BLCAR, 0,R0483,1,001,TODAEBL,0,VAT,0000.6,
+$TSMES,27/11/13,16:21:02.469,BLCAR, 0,R0483,1,001,CALLLYR,0,VAT,0000.2,
+$TSMES,27/11/13,16:21:25.949,BLCAR, 0,R0483,1,001,CALLMAC,0,VAT,0000.2,
+$TSMES,27/11/13,16:21:55.232,BLCAR, 0,R0483,1,002,MERLMNG,P,VAT,0028.0,
+$TSMES,27/11/13,16:22:21.965,BLCAR, 0,R0483,1,001,ELEDCIR,0,VAT,0001.4,
+$TSMES,27/11/13,16:22:51.628,BLCAR, 0,R0483,1,001,TRISMIN,0,VAT,0003.6,
+$TSMES,27/11/13,18:49:59.855,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0019.8,
+$TSMES,27/11/13,18:50:19.448,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0016.8,
+$TSMES,27/11/13,18:55:48.008,BLCAR, 0,R0484,1,001,EUTRGUR,0,VAT,0007.6,
+$TSMES,27/11/13,18:56:34.603,BLCAR, 0,R0484,1,002,EUTRGUR,0,VAT,0011.7,
+$TSMES,27/11/13,18:58:57.070,BLCAR, 0,R0484,1,001,EUTRGUR,0,VAT,0007.6,
+$TSMES,27/11/13,18:59:34.603,BLCAR, 0,R0484,1,002,MELANGE,0,VAT,0016.4,
+$TSMES,27/11/13,19:00:53.047,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0020.9,
+$TSMES,27/11/13,19:01:17.629,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0020.0,
+$TSMES,27/11/13,19:02:01.189,BLCAR, 0,R0484,1,002,EUTRGUR,0,VAT,0008.5,
+$TSMES,27/11/13,19:02:23.329,BLCAR, 0,R0484,1,002,MELANGE,0,VAT,0016.1,
+$TSMES,27/11/13,19:04:11.551,BLCAR, 0,R0484,1,002,MERLMNG,p,VAT,0020.9,
+$TSMES,27/11/13,19:04:54.312,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0017.9,
+$TSMES,27/11/13,19:05:31.029,BLCAR, 0,R0484,1,002,MELANGE,0,VAT,0016.0,
+$TSMES,27/11/13,19:06:32.679,BLCAR, 0,R0484,1,002,EUTRGUR,0,VAT,0011.3,
+$TSMES,27/11/13,19:06:59.485,BLCAR, 0,R0484,1,001,EUTRGUR,0,VAT,0007.3,
+$TSMES,27/11/13,19:10:50.599,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0019.0,
+$TSMES,27/11/13,19:12:32.300,BLCAR, 0,R0484,1,001,EUTRGUR,0,VAT,0008.4,
+$TSMES,27/11/13,19:13:11.765,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0020.6,
+$TSMES,27/11/13,19:13:42.494,BLCAR, 0,R0484,1,002,MERLMNG,p,VAT,0018.7,
+$TSMES,27/11/13,19:14:34.508,BLCAR, 0,R0484,1,002,MELANGE,0,VAT,0015.0,
+$TSMES,27/11/13,19:18:06.846,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0011.6,
+$TSMES,27/11/13,19:19:06.548,BLCAR, 0,R0484,1,001,EUTRGUR,0,VAT,0008.6,
+$TSMES,27/11/13,19:19:29.730,BLCAR, 0,R0484,1,002,EUTRGUR,0,VAT,0012.4,
+$TSMES,27/11/13,19:19:53.075,BLCAR, 0,R0484,1,002,MELAAEG,0,VAT,0005.1,
+$TSMES,27/11/13,19:20:15.873,BLCAR, 0,R0484,1,002,EUTRGUR,0,VAT,0013.7,
+$TSMES,27/11/13,19:20:42.508,BLCAR, 0,R0484,1,001,HIPPPLA,0,VAT,0000.5,
+$TSMES,27/11/13,19:21:14.304,BLCAR, 0,R0484,1,001,SCYLCAN,0,VAT,0000.9,
+$TSMES,27/11/13,19:22:30.586,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0021.2,
+$TSMES,27/11/13,19:22:50.150,BLCAR, 0,R0484,1,002,MERLMNG,0,VAT,0009.2,
+$TSMES,27/11/13,19:23:12.550,BLCAR, 0,R0484,1,002,CLUPHAR,0,VAT,0001.6,
+$TSMES,27/11/13,19:23:38.609,BLCAR, 0,R0484,1,002,MELANGE,0,VAT,0005.1,
+$TSMES,27/11/13,19:24:07.337,BLCAR, 0,R0484,1,001,MERLMCC,0,VAT,0000.5,
+$TSMES,27/11/13,19:24:36.607,BLCAR, 0,R0484,1,001,HIPPPLA,0,VAT,0001.7,
+$TSMES,27/11/13,19:25:36.793,BLCAR, 0,R0484,1,001,MICRPOU,0,VAT,0000.7,
+$TSMES,27/11/13,19:26:04.841,BLCAR, 0,R0484,1,002,MERLMNG,p,VAT,0005.8,
+$TSMES,27/11/13,19:26:26.140,BLCAR, 0,R0484,1,001,SCOMSCO,0,VAT,0000.0,
+$TSMES,27/11/13,19:26:47.870,BLCAR, 0,R0484,1,001,GLYPCYN,0,VAT,0000.2,
+$TSMES,27/11/13,19:27:09.223,BLCAR, 0,R0484,1,001,TRISMIN,0,VAT,0000.6,
+$TSMES,27/11/13,19:27:29.741,BLCAR, 0,R0484,1,001,ARGESPH,0,VAT,0000.2,
+$TSMES,27/11/13,19:27:54.743,BLCAR, 0,R0484,1,001,TRACTRU,0,VAT,0000.2,
+$TSMES,27/11/13,19:28:15.821,BLCAR, 0,R0484,1,002,NEPHNOR,0,VAT,0004.3,
+$TSMES,27/11/13,19:28:40.581,BLCAR, 0,R0484,1,001,SEPIOLZ,0,VAT,0000.1,
+$TSMES,27/11/13,19:29:00.043,BLCAR, 0,R0484,1,001,LOLIFOR,0,VAT,0000.1,
+$TSMES,27/11/13,19:29:34.076,BLCAR, 0,R0484,1,001,ROSSMAC,0,VAT,0000.1,
+$TSMES,27/11/13,19:30:00.792,BLCAR, 0,R0484,1,001,ELEDCIR,0,VAT,0000.6,
+$TSMES,27/11/13,19:30:27.478,BLCAR, 0,R0484,1,001,TODAEBL,0,VAT,0000.1,
Added: branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.car
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.car (rev 0)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.car 2014-05-05 13:31:26 UTC (rev 1747)
@@ -0,0 +1,8 @@
+$TSMES,27/11/13,09:12:04.612,BLCAR, 0,A,1,002,MERL-MNG,0,VAT,0015.6,
+$TSMES,27/11/13,09:13:21.994,BLCAR, 0,A,1,002,MERLMNG,0,VAT,0018.9,
+$TSMES,27/11/13,09:15:12.588,BLCAR, 0,A,1,002,ACAN-PEL,0,VAT,0021.4,
+$TSMES,27/11/13,09:15:58.396,BLCAR, 0,A,1,002,ACANPEL,0,VAT,0017.9,
+$TSMES,27/11/13,09:17:11.714,BLCAR, 0,A,1,002,ACANPAL,0,VAT,0017.2,
+$TSMES,27/11/13,09:17:40.272,BLCAR, 0,A,1,002,ACAN-PAL,0,VAT,0021.1,
+$TSMES,27/11/13,09:18:48.818,BLCAR, 0,A,1,002,ASRNATL,0,VAT,0018.0,
+$TSMES,27/11/13,09:19:33.335,BLCAR, 0,A,1,002,ASRN-ATL,0,VAT,0016.6,
\ No newline at end of file
Added: branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.tnk
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.tnk (rev 0)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.tnk 2014-05-05 13:31:26 UTC (rev 1747)
@@ -0,0 +1,149 @@
+$TSMES,27/11/13,09:08:45.130,BLTNK, 0,A,1,VAT,0045.4,
+$TSMES,27/11/13,09:10:10.522,BLTNK, 0,A,1,VAT,0045.0,
+$TSMES,27/11/13,09:12:14.730,BLTNK, 0,A,1,VAT,0043.9,
+$TSMES,27/11/13,09:14:06.033,BLTNK, 0,A,1,VAT,0044.0,
+$TSMES,27/11/13,09:16:08.907,BLTNK, 0,A,1,VAT,0042.4,
+$TSMES,27/11/13,09:17:47.515,BLTNK, 0,A,1,VAT,0044.3,
+$TSMES,27/11/13,09:19:44.039,BLTNK, 0,A,1,VAT,0043.6,
+$TSMES,27/11/13,09:21:49.166,BLTNK, 0,A,1,VAT,0044.2,
+$TSMES,27/11/13,09:26:57.681,BLTNK, 0,A,1,VAT,0045.9,
+$TSMES,27/11/13,09:29:20.020,BLTNK, 0,A,1,VAT,0045.8,
+$TSMES,27/11/13,09:30:37.535,BLTNK, 0,A,1,VAT,0047.0,
+$TSMES,27/11/13,09:32:16.153,BLTNK, 0,A,1,VAT,0046.6,
+$TSMES,27/11/13,09:33:30.882,BLTNK, 0,A,1,VAT,0044.4,
+$TSMES,27/11/13,09:34:50.649,BLTNK, 0,A,1,VAT,0044.5,
+$TSMES,27/11/13,09:36:36.933,BLTNK, 0,A,1,VAT,0043.7,
+$TSMES,27/11/13,09:37:53.424,BLTNK, 0,A,1,VAT,0046.4,
+$TSMES,27/11/13,09:41:40.944,BLTNK, 0,A,1,VAT,0048.6,
+$TSMES,27/11/13,09:43:33.377,BLTNK, 0,A,1,VAT,0046.4,
+$TSMES,27/11/13,09:44:46.487,BLTNK, 0,A,1,VAT,0046.4,
+$TSMES,27/11/13,09:46:12.192,BLTNK, 0,A,1,VAT,0045.2,
+$TSMES,27/11/13,09:47:34.846,BLTNK, 0,A,1,VAT,0045.4,
+$TSMES,27/11/13,09:48:55.920,BLTNK, 0,A,1,VAT,0048.4,
+$TSMES,27/11/13,09:51:12.724,BLTNK, 0,A,1,VAT,0046.4,
+$TSMES,27/11/13,09:54:14.063,BLTNK, 0,A,1,VAT,0040.4,
+$TSMES,27/11/13,09:56:11.000,BLTNK, 0,A,1,VAT,0044.2,
+$TSMES,27/11/13,09:57:38.344,BLTNK, 0,A,1,VAT,0047.3,
+$TSMES,27/11/13,09:59:23.603,BLTNK, 0,A,1,VAT,0047.6,
+$TSMES,27/11/13,10:00:51.868,BLTNK, 0,A,1,VAT,0047.9,
+$TSMES,27/11/13,10:02:29.655,BLTNK, 0,A,1,VAT,0044.2,
+$TSMES,27/11/13,10:04:14.101,BLTNK, 0,A,1,VAT,0045.9,
+$TSMES,27/11/13,10:06:08.886,BLTNK, 0,A,1,VAT,0043.2,
+$TSMES,27/11/13,10:08:35.000,BLTNK, 0,A,1,VAT,0007.5,
+$TSMES,27/11/13,12:02:28.762,BLTNK, 0,R0482,1,VAT,0043.5,
+$TSMES,27/11/13,12:04:44.125,BLTNK, 0,R0482,1,VAT,0046.8,
+$TSMES,27/11/13,12:06:40.650,BLTNK, 0,R0482,1,VAT,0043.0,
+$TSMES,27/11/13,12:07:46.288,BLTNK, 0,R0482,1,VAT,0045.0,
+$TSMES,27/11/13,12:09:09.246,BLTNK, 0,R0482,1,VAT,0043.3,
+$TSMES,27/11/13,12:10:12.001,BLTNK, 0,R0482,1,VAT,0042.6,
+$TSMES,27/11/13,12:11:21.956,BLTNK, 0,R0482,1,VAT,0044.0,
+$TSMES,27/11/13,12:13:43.666,BLTNK,-1,R0482,1,VAT,0045.2,
+$TSMES,27/11/13,12:15:11.401,BLTNK,-1,R0482,1,VAT,0043.5,
+$TSMES,27/11/13,12:16:59.327,BLTNK, 0,R0482,1,VAT,0045.3,
+$TSMES,27/11/13,12:23:10.921,BLTNK, 0,R0482,1,VAT,0043.8,
+$TSMES,27/11/13,12:25:31.204,BLTNK, 0,R0482,1,VAT,0046.4,
+$TSMES,27/11/13,12:26:34.685,BLTNK, 0,R0482,1,VAT,0046.1,
+$TSMES,27/11/13,12:28:25.995,BLTNK, 0,R0482,1,VAT,0046.0,
+$TSMES,27/11/13,12:32:28.875,BLTNK, 0,R0482,1,VAT,0046.0,
+$TSMES,27/11/13,12:34:31.332,BLTNK, 0,R0482,1,VAT,0050.7,
+$TSMES,27/11/13,12:37:08.304,BLTNK, 0,R0482,1,VAT,0045.2,
+$TSMES,27/11/13,12:38:45.284,BLTNK, 0,R0482,1,VAT,0043.0,
+$TSMES,27/11/13,12:40:05.862,BLTNK, 0,R0482,1,VAT,0044.6,
+$TSMES,27/11/13,12:41:48.358,BLTNK, 0,R0482,1,VAT,0046.3,
+$TSMES,27/11/13,12:43:25.952,BLTNK, 0,R0482,1,VAT,0046.3,
+$TSMES,27/11/13,12:45:08.656,BLTNK, 0,R0482,1,VAT,0048.0,
+$TSMES,27/11/13,12:47:16.330,BLTNK, 0,R0482,1,VAT,0045.6,
+$TSMES,27/11/13,12:50:11.853,BLTNK,-1,R0482,1,VAT,0046.4,
+$TSMES,27/11/13,12:54:11.280,BLTNK, 0,R0482,1,VAT,0044.6,
+$TSMES,27/11/13,12:56:04.995,BLTNK, 0,R0482,1,VAT,0049.2,
+$TSMES,27/11/13,12:57:07.161,BLTNK, 0,R0482,1,VAT,0040.9,
+$TSMES,27/11/13,12:58:07.564,BLTNK, 0,R0482,1,VAT,0042.8,
+$TSMES,27/11/13,12:59:10.843,BLTNK, 0,R0482,1,VAT,0041.2,
+$TSMES,27/11/13,13:09:10.060,BLTNK, 0,R0482,1,VAT,0043.0,
+$TSMES,27/11/13,13:11:01.570,BLTNK, 0,R0482,1,VAT,0046.8,
+$TSMES,27/11/13,13:12:27.276,BLTNK, 0,R0482,1,VAT,0045.8,
+$TSMES,27/11/13,13:14:58.308,BLTNK, 0,R0482,1,VAT,0043.4,
+$TSMES,27/11/13,13:17:16.558,BLTNK, 0,R0482,1,VAT,0047.4,
+$TSMES,27/11/13,13:18:53.624,BLTNK, 0,R0482,1,VAT,0044.2,
+$TSMES,27/11/13,13:21:47.998,BLTNK, 0,R0482,1,VAT,0050.2,
+$TSMES,27/11/13,13:24:51.176,BLTNK, 0,R0482,1,VAT,0047.4,
+$TSMES,27/11/13,13:27:50.882,BLTNK, 0,R0482,1,VAT,0045.6,
+$TSMES,27/11/13,13:29:07.983,BLTNK, 0,R0482,1,VAT,0044.9,
+$TSMES,27/11/13,13:32:21.819,BLTNK, 0,R0482,1,VAT,0047.2,
+$TSMES,27/11/13,13:34:12.304,BLTNK, 0,R0482,1,VAT,0046.1,
+$TSMES,27/11/13,13:35:59.627,BLTNK, 0,R0482,1,VAT,0009.7,
+$TSMES,27/11/13,15:00:25.110,BLTNK, 0,R0483,1,VAT,0044.8,
+$TSMES,27/11/13,15:02:37.403,BLTNK, 0,R0483,1,VAT,0043.0,
+$TSMES,27/11/13,15:04:24.302,BLTNK, 0,R0483,1,VAT,0045.7,
+$TSMES,27/11/13,15:06:10.284,BLTNK, 0,R0483,1,VAT,0043.5,
+$TSMES,27/11/13,15:07:39.675,BLTNK, 0,R0483,1,VAT,0046.0,
+$TSMES,27/11/13,15:09:12.136,BLTNK, 0,R0483,1,VAT,0046.8,
+$TSMES,27/11/13,15:12:51.981,BLTNK, 0,R0483,1,VAT,0044.7,
+$TSMES,27/11/13,15:14:31.819,BLTNK, 0,R0483,1,VAT,0042.9,
+$TSMES,27/11/13,15:15:30.692,BLTNK, 0,R0483,1,VAT,0044.2,
+$TSMES,27/11/13,15:16:48.616,BLTNK, 0,R0483,1,VAT,0046.5,
+$TSMES,27/11/13,15:18:09.200,BLTNK, 0,R0483,1,VAT,0044.1,
+$TSMES,27/11/13,15:19:57.739,BLTNK, 0,R0483,1,VAT,0045.3,
+$TSMES,27/11/13,15:22:06.859,BLTNK, 0,R0483,1,VAT,0042.8,
+$TSMES,27/11/13,15:23:50.486,BLTNK, 0,R0483,1,VAT,0044.3,
+$TSMES,27/11/13,15:25:40.151,BLTNK, 0,R0483,1,VAT,0042.1,
+$TSMES,27/11/13,15:27:58.998,BLTNK, 0,R0483,1,VAT,0043.2,
+$TSMES,27/11/13,15:29:58.390,BLTNK, 0,R0483,1,VAT,0045.9,
+$TSMES,27/11/13,15:31:36.691,BLTNK, 0,R0483,1,VAT,0045.8,
+$TSMES,27/11/13,15:34:30.965,BLTNK, 0,R0483,1,VAT,0041.5,
+$TSMES,27/11/13,15:37:02.307,BLTNK, 0,R0483,1,VAT,0047.2,
+$TSMES,27/11/13,15:39:44.502,BLTNK, 0,R0483,1,VAT,0047.8,
+$TSMES,27/11/13,15:42:40.825,BLTNK, 0,R0483,1,VAT,0043.4,
+$TSMES,27/11/13,15:43:59.669,BLTNK, 0,R0483,1,VAT,0041.2,
+$TSMES,27/11/13,15:45:48.106,BLTNK, 0,R0483,1,VAT,0045.1,
+$TSMES,27/11/13,15:46:57.635,BLTNK, 0,R0483,1,VAT,0044.1,
+$TSMES,27/11/13,15:48:15.557,BLTNK, 0,R0483,1,VAT,0042.8,
+$TSMES,27/11/13,15:49:27.850,BLTNK, 0,R0483,1,VAT,0043.6,
+$TSMES,27/11/13,15:50:53.655,BLTNK, 0,R0483,1,VAT,0045.9,
+$TSMES,27/11/13,15:52:37.073,BLTNK, 0,R0483,1,VAT,0045.6,
+$TSMES,27/11/13,15:54:32.985,BLTNK, 0,R0483,1,VAT,0045.9,
+$TSMES,27/11/13,15:56:22.345,BLTNK, 0,R0483,1,VAT,0045.1,
+$TSMES,27/11/13,15:58:09.594,BLTNK, 0,R0483,1,VAT,0047.0,
+$TSMES,27/11/13,16:00:11.605,BLTNK, 0,R0483,1,VAT,0049.6,
+$TSMES,27/11/13,16:01:44.993,BLTNK, 0,R0483,1,VAT,0048.7,
+$TSMES,27/11/13,16:02:59.022,BLTNK, 0,R0483,1,VAT,0002.0,
+$TSMES,27/11/13,17:07:25.365,BLTNK, 0,X0001,1,VAT,0004.9,
+$TSMES,27/11/13,17:07:55.368,BLTNK, 0,X0001,1,VAT,0008.1,
+$TSMES,27/11/13,17:08:34.277,BLTNK, 0,X0001,1,VAT,0010.7,
+$TSMES,27/11/13,17:09:20.254,BLTNK, 0,X0001,1,VAT,0010.8,
+$TSMES,27/11/13,17:10:02.032,BLTNK, 0,X0001,1,VAT,0010.1,
+$TSMES,27/11/13,17:24:37.302,BLTNK, 0,X0002,1,VAT,0007.1,
+$TSMES,27/11/13,17:30:28.420,BLTNK, 0,R0484,1,VAT,0046.9,
+$TSMES,27/11/13,17:31:39.582,BLTNK, 0,R0484,1,VNT,0048.7,
+$TSMES,27/11/13,18:25:31.485,BLTNK,-1,R0484,1,VNT,-000.1,
+$TSMES,27/11/13,18:36:52.526,BLTNK, 0,R0484,1,VNT,0050.7,
+$TSMES,27/11/13,18:40:06.918,BLTNK, 0,R0484,1,VAT,0052.3,
+$TSMES,27/11/13,18:41:09.838,BLTNK, 0,R0484,1,VNT,0042.8,
+$TSMES,27/11/13,18:42:25.816,BLTNK, 0,R0484,1,VNT,0041.2,
+$TSMES,27/11/13,18:43:31.552,BLTNK, 0,R0484,1,VNT,0044.4,
+$TSMES,27/11/13,18:44:40.157,BLTNK, 0,R0484,1,VAT,0044.9,
+$TSMES,27/11/13,18:46:01.666,BLTNK, 0,R0484,1,VNT,0055.3,
+$TSMES,27/11/13,18:46:46.412,BLTNK, 0,R0484,1,VNT,0045.8,
+$TSMES,27/11/13,18:47:39.146,BLTNK, 0,R0484,1,VNT,0045.1,
+$TSMES,27/11/13,18:48:38.741,BLTNK, 0,R0484,1,VAT,0045.6,
+$TSMES,27/11/13,18:50:46.533,BLTNK, 0,R0484,1,VNT,0044.5,
+$TSMES,27/11/13,18:51:31.485,BLTNK, 0,R0484,1,VNT,0043.6,
+$TSMES,27/11/13,18:52:15.619,BLTNK, 0,R0484,1,VNT,0045.1,
+$TSMES,27/11/13,18:53:01.588,BLTNK, 0,R0484,1,VAT,0046.7,
+$TSMES,27/11/13,18:54:15.725,BLTNK, 0,R0484,1,VNT,0045.1,
+$TSMES,27/11/13,18:55:55.559,BLTNK, 0,R0484,1,VNT,0045.7,
+$TSMES,27/11/13,18:56:41.434,BLTNK, 0,R0484,1,VNT,0047.9,
+$TSMES,27/11/13,18:59:41.649,BLTNK, 0,R0484,1,VAT,0045.3,
+$TSMES,27/11/13,19:01:24.349,BLTNK, 0,R0484,1,VNT,0047.0,
+$TSMES,27/11/13,19:02:31.112,BLTNK, 0,R0484,1,VNT,0045.2,
+$TSMES,27/11/13,19:04:19.036,BLTNK, 0,R0484,1,VNT,0045.3,
+$TSMES,27/11/13,19:05:39.010,BLTNK, 0,R0484,1,VAT,0048.6,
+$TSMES,27/11/13,19:07:07.066,BLTNK, 0,R0484,1,VNT,0049.1,
+$TSMES,27/11/13,19:07:47.001,BLTNK, 0,R0484,1,VNT,0042.7,
+$TSMES,27/11/13,19:08:31.646,BLTNK, 0,R0484,1,VNT,0046.7,
+$TSMES,27/11/13,19:09:18.030,BLTNK, 0,R0484,1,VAT,0046.4,
+$TSMES,27/11/13,19:10:11.686,BLTNK, 0,R0484,1,VNT,0048.0,
+$TSMES,27/11/13,19:10:57.668,BLTNK, 0,R0484,1,VNT,0045.6,
+$TSMES,27/11/13,19:11:44.968,BLTNK, 0,R0484,1,VNT,0048.1,
+$TSMES,27/11/13,19:15:02.592,BLTNK, 0,R0484,1,VAT,0040.2,
+$TSMES,27/11/13,19:16:20.308,BLTNK, 0,R0484,1,VNT,0003.7,
Added: branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.tuttiProtocol
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.tuttiProtocol (rev 0)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/pupitri/ano-5032.tuttiProtocol 2014-05-05 13:31:26 UTC (rev 1747)
@@ -0,0 +1,81 @@
+id: c6ee2088-9720-46c0-b8d2-8f21c902676f
+name: Protocole EVHOE 2013
+benthos:
+comment: Protocole pour les tests 2013 avec Jean Jacques Rivoalen
+gearUseFeaturePmfmId:
+- 131
+- 828
+- 884
+- 965
+lengthClassesPmfmId:
+- 306
+- 622
+- 307
+- 302
+- 299
+- 1394
+- 1417
+- 1425
+- 1426
+- 1427
+- 283
+- 284
+- 285
+- 294
+- 295
+- 300
+- 301
+- 304
+- 318
+- 319
+- 322
+- 323
+- 661
+- 662
+species:
+- !SpeciesProtocol
+ id: 2a8122cf-d238-4820-a7b9-eacaf1f302bd
+ calcifySampleEnabled: true
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 306
+ mandatorySampleCategoryId: []
+ speciesReferenceTaxonId: 1551
+ speciesSurveyCode: MERLMNG
+ weightEnabled: true
+- !SpeciesProtocol
+ id: 0de3f5c9-0ca9-4a7c-84aa-323d9eaa7f7f
+ countIfNoFrequencyEnabled: true
+ mandatorySampleCategoryId: []
+ speciesReferenceTaxonId: 872
+ speciesSurveyCode: ACAN-PEL
+ weightEnabled: true
+- !SpeciesProtocol
+ id: ddffa4c9-cbb5-447f-a829-e2ac0cfea0f5
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 306
+ mandatorySampleCategoryId: []
+ speciesReferenceTaxonId: 1732
+ speciesSurveyCode: ACANPAL
+ weightEnabled: true
+vesselUseFeaturePmfmId:
+- 173
+- 194
+- 230
+- 782
+- 843
+- 844
+- 846
+- 847
+- 848
+- 849
+- 850
+- 851
+- 857
+- 858
+- 859
+- 861
+- 862
+- 863
+- 881
+- 882
+- 883
\ No newline at end of file
1
0
r1746 - in branches/tutti-3.4.x: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 05 May '14
by tchemit＠users.forge.codelutin.com 05 May '14
05 May '14
Author: tchemit
Date: 2014-05-05 15:17:39 +0200 (Mon, 05 May 2014)
New Revision: 1746
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1746
Log:
prepare release 3.4.1
Modified:
branches/tutti-3.4.x/pom.xml
branches/tutti-3.4.x/tutti-ichtyometer/pom.xml
branches/tutti-3.4.x/tutti-persistence/pom.xml
branches/tutti-3.4.x/tutti-service/pom.xml
branches/tutti-3.4.x/tutti-ui-swing/pom.xml
Modified: branches/tutti-3.4.x/pom.xml
===================================================================
--- branches/tutti-3.4.x/pom.xml 2014-05-05 13:13:22 UTC (rev 1745)
+++ branches/tutti-3.4.x/pom.xml 2014-05-05 13:17:39 UTC (rev 1746)
@@ -32,7 +32,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4</version>
+ <version>3.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tutti</name>
@@ -99,13 +99,13 @@
<scm>
<url>
- https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.4
+ https://forge.codelutin.com/projects/tutti/repository/branches/tutti-3.4.x
</url>
<connection>
- scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.4
+ scm:svn:http://svn.codelutin.com/tutti/branches/tutti-3.4.x
</connection>
<developerConnection>
- scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.4
+ scm:svn:https://svn.codelutin.com/tutti/branches/tutti-3.4.x
</developerConnection>
</scm>
<distributionManagement>
Modified: branches/tutti-3.4.x/tutti-ichtyometer/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/pom.xml 2014-05-05 13:13:22 UTC (rev 1745)
+++ branches/tutti-3.4.x/tutti-ichtyometer/pom.xml 2014-05-05 13:17:39 UTC (rev 1746)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4</version>
+ <version>3.4.1-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-persistence/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/pom.xml 2014-05-05 13:13:22 UTC (rev 1745)
+++ branches/tutti-3.4.x/tutti-persistence/pom.xml 2014-05-05 13:17:39 UTC (rev 1746)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4</version>
+ <version>3.4.1-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-service/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/pom.xml 2014-05-05 13:13:22 UTC (rev 1745)
+++ branches/tutti-3.4.x/tutti-service/pom.xml 2014-05-05 13:17:39 UTC (rev 1746)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4</version>
+ <version>3.4.1-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-ui-swing/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/pom.xml 2014-05-05 13:13:22 UTC (rev 1745)
+++ branches/tutti-3.4.x/tutti-ui-swing/pom.xml 2014-05-05 13:17:39 UTC (rev 1746)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4</version>
+ <version>3.4.1-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
1
0
r1745 - in branches/tutti-3.4.x: tutti-service/src/main/java/fr/ifremer/tutti/service tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util
by tchemit＠users.forge.codelutin.com 05 May '14
by tchemit＠users.forge.codelutin.com 05 May '14
05 May '14
Author: tchemit
Date: 2014-05-05 15:13:22 +0200 (Mon, 05 May 2014)
New Revision: 1745
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1745
Log:
fixes #5033
Modified:
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2014-05-05 12:47:09 UTC (rev 1744)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2014-05-05 13:13:22 UTC (rev 1745)
@@ -63,6 +63,7 @@
public static final String CARACTERISTIC_PARAMETER_ONLY = "parameterOnly";
+ public static final String WITH_SURVEY_CODE = "withSurveyCode";
public static final String FROM_PROTOCOL = "fromProtocol";
public static final String GEAR_WITH_RANK_ORDER = "gearWithrankOrder";
@@ -141,6 +142,7 @@
registerTuttiDecorator(Program.class, ONLY_NAME, "${name}$s", SEPARATOR, " - ");
registerDecorator(new SpeciesDecorator());
+ registerDecorator(WITH_SURVEY_CODE, new SpeciesDecoratorWithSurveyCode());
registerDecorator(FROM_PROTOCOL, new SpeciesFromProtocolDecorator());
registerDecorator(CARACTERISTIC_WITH_UNIT, new SimpleCaracteristicDecorator("${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s"));
@@ -217,6 +219,31 @@
}
}
+ public static class SpeciesDecoratorWithSurveyCode extends TuttiDecorator<Species> implements Cloneable {
+
+ private static final long serialVersionUID = 1L;
+
+ public SpeciesDecoratorWithSurveyCode() throws IllegalArgumentException, NullPointerException {
+ super(Species.class, "${surveyCode}$s#${name}$s", DecoratorService.SEPARATOR, " - ");
+ }
+
+ @Override
+ protected Object onNullValue(Species bean, String token) {
+ Object result = null;
+ if (Species.PROPERTY_SURVEY_CODE.equals(token)) {
+
+ // try with refTaxCode
+ result = bean.getRefTaxCode();
+
+ if (result ==null) {
+
+ result = t("tutti.propety.no.species.speciesCode");
+ }
+ }
+ return result;
+ }
+ }
+
public static class SimpleCaracteristicDecorator extends TuttiDecorator<Caracteristic> implements Cloneable {
private static final long serialVersionUID = 1L;
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-05-05 12:47:09 UTC (rev 1744)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-05-05 13:13:22 UTC (rev 1745)
@@ -414,7 +414,7 @@
String prefix,
String suffix) {
return buildReminderLabelTitle(
- decorate(species),
+ decorate(species, DecoratorService.WITH_SURVEY_CODE),
categories,
prefix,
suffix);
1
0
Author: tchemit
Date: 2014-05-05 14:47:09 +0200 (Mon, 05 May 2014)
New Revision: 1744
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1744
Log:
for quick fixes on version 3.4.x
Added:
branches/tutti-3.4.x/
1
0
Author: tchemit
Date: 2014-05-05 14:43:41 +0200 (Mon, 05 May 2014)
New Revision: 1743
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1743
Log:
for quick fixes on version 3.4
Added:
branches/3.4.1/
1
0
Author: tchemit
Date: 2014-05-05 12:16:43 +0200 (Mon, 05 May 2014)
New Revision: 1742
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1742
Log:
for quick fixes on version 3.3.5
Added:
branches/3.3.6/
1
0
Build failed in Jenkins: tutti-nightly » Tutti :: Persistence #31
by admin+ci-codelutin.com＠codelutin.com 29 Apr '14
by admin+ci-codelutin.com＠codelutin.com 29 Apr '14
29 Apr '14
See <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
Changes:
[blavenier] Fix Issue #4995 : do not create a new entity when existing in the list of regulation area
[Tony CHEMIT] refs #4995 (add TU)
[Tony CHEMIT] refs #4958
------------------------------------------
[...truncated 193 lines...]
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] Scan 222 files header done in 436.857ms.
[INFO]
* update header on 4 files.
* uptodate header on 110 files.
* add header on 108 files.
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-persistence ---
[INFO] Compiling 178 source files to <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:[893,19] setName(java.lang.String) in fr.ifremer.adagio.core.dao.data.operation.Operation has been deprecated
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>: Some input files use unchecked or unsafe operations.
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>: Recompile with -Xlint:unchecked for details.
[INFO]
[INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ tutti-persistence ---
[INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0
[INFO]
[INFO] --- jredmine-maven-plugin:1.8.1:generate-changes (jredmine-generate-changes) @ tutti-persistence ---
[INFO] Skipping goal (skipGenerateChanges flag is on).
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ tutti-persistence ---
[INFO] Executing tasks
main:
[mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO] Executed tasks
[INFO]
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ tutti-persistence ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 5 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ tutti-persistence ---
[INFO] Compiling 27 source files to <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO]
[INFO] --- maven-surefire-plugin:2.17:test (default-test) @ tutti-persistence ---
[INFO] Surefire report directory: <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
-------------------------------------------------------
T E S T S
-------------------------------------------------------
Running fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTableMetadataTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.047 sec - in fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTableMetadataTest
Running fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocolsTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.109 sec - in fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocolsTest
Running fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.393 sec - in fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigTest
Running fr.ifremer.tutti.persistence.service.CruisePersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.CruisePersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest
2014-04-26 00:51:09,483 0 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest
2014-04-26 00:51:09,489 6 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write.properties
2014-04-26 00:51:09,492 9 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.018 sec - in fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.SpeciesBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.008 sec - in fr.ifremer.tutti.persistence.service.SpeciesBatchPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest
2014-04-26 00:51:09,509 26 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest
2014-04-26 00:51:09,513 30 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write.properties
2014-04-26 00:51:09,516 33 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceAno4995Test
2014-04-26 00:51:09,517 34 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceAno4995Test
2014-04-26 00:51:09,522 39 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS_ANO4995.properties
2014-04-26 00:51:09,524 41 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS_ANO4995, test [class fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceAno4995Test] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.007 sec - in fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceAno4995Test
Running fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest
2014-04-26 00:51:09,526 43 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest
2014-04-26 00:51:09,533 50 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…,> test [class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.009 sec - in fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec - in fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest
2014-04-26 00:51:09,535 52 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest
2014-04-26 00:51:09,537 54 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write.properties
2014-04-26 00:51:09,540 57 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest
2014-04-26 00:51:09,541 58 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest
2014-04-26 00:51:09,544 61 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write.properties
2014-04-26 00:51:09,547 64 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.002 sec - in fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.SpeciesBatchPersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.SpeciesBatchPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.CruisePersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.CruisePersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest
2014-04-26 00:51:09,549 66 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest
2014-04-26 00:51:09,552 69 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write.properties
2014-04-26 00:51:09,555 72 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest
2014-04-26 00:51:09,556 73 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest
2014-04-26 00:51:09,558 75 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write.properties
2014-04-26 00:51:09,561 78 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest
2014-04-26 00:51:09,568 85 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest
2014-04-26 00:51:09,573 90 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…,> test [class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.01 sec - in fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest
2014-04-26 00:51:09,574 91 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest
2014-04-26 00:51:09,579 96 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…,> test [class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec - in fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest
Running fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest
2014-04-26 00:51:09,581 98 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest
2014-04-26 00:51:09,583 100 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write.properties
2014-04-26 00:51:09,585 102 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec - in fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest
2014-04-26 00:51:09,586 103 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest
2014-04-26 00:51:09,588 105 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write.properties
2014-04-26 00:51:09,590 107 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec - in fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest
Running fr.ifremer.tutti.persistence.TuttiPersistenceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.persistence.TuttiPersistenceWriteTest
Results :
Tests run: 29, Failures: 0, Errors: 0, Skipped: 24
[JENKINS] Recording test results
[INFO]
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-persistence ---
[INFO] Building jar: <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO]
[INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ tutti-persistence >>>
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ tutti-persistence ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-persistence ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-release-properties) @ tutti-persistence ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ tutti-persistence ---
[INFO] Skipping goal (runOnce flag is on and goal was already executed).
[INFO]
[INFO] --- eugene-maven-plugin:2.9-SNAPSHOT:generate (default) @ tutti-persistence ---
[INFO] Process phase [zargo] for one entry.
[INFO] No file generated.
[INFO] Process phase [xmi] for one entry.
[INFO] No file generated.
[INFO] Process phase [model] for one entry.
WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:393) loadStereotype - Deprecated stereotype usage [fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol.attribute.mandatorySampleCategoryId.stereotype] : indexed
[INFO] No file generated.
[INFO] Process phase [java] for one entry.
[INFO] Apply generator JavaInterfaceTransformer
[INFO] Apply generator SimpleJavaBeanTransformer
[INFO] Apply generator JavaEnumerationTransformer
[INFO] No file generated.
[WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo
[INFO]
[INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ tutti-persistence <<<
[INFO]
[INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ tutti-persistence ---
[INFO] Building jar: <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO]
[INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ tutti-persistence ---
[INFO]
24 warnings
[WARNING] Javadoc Warnings
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see:illegal character: "123" in "{@link Cruise#getDepartureLocation()}"
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see:illegal character: "64" in "{@link Cruise#getDepartureLocation()}"
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see:illegal character: "123" in "{@link Cruise#setDepartureLocation(TuttiLocation)}"
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see:illegal character: "64" in "{@link Cruise#setDepartureLocation(TuttiLocation)}"
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see:illegal character: "123" in "{@link Cruise#getReturnLocation()}"
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see:illegal character: "64" in "{@link Cruise#getReturnLocation()}"
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see:illegal character: "123" in "{@link Cruise#setReturnLocation(TuttiLocation)}"
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see:illegal character: "64" in "{@link Cruise#setReturnLocation(TuttiLocation)}"
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#getDepartureLocation()}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#setDepartureLocation(TuttiLocation)}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#getReturnLocation()}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#setReturnLocation(TuttiLocation)}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#getDepartureLocation()}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#setDepartureLocation(TuttiLocation)}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#getReturnLocation()}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#setReturnLocation(TuttiLocation)}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#getDepartureLocation()}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#setDepartureLocation(TuttiLocation)}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#getReturnLocation()}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#setReturnLocation(TuttiLocation)}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#getDepartureLocation()}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#setDepartureLocation(TuttiLocation)}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#getReturnLocation()}
[WARNING] <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>:85: warning - Tag @see: reference not found: {@link Cruise#setReturnLocation(TuttiLocation)}
[INFO] Building jar: <http://ci.codelutin.com/jenkins/job/tutti-nightly/fr.ifremer.tutti$tutti-pe…>
[INFO]
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-persistence ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ tutti-persistence ---
[INFO] Exporting server [gpg-signer] username in ${gpg.keyname}
[INFO] Exporting server [gpg-signer] password in ${gpg.passphrase}
[INFO]
[INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ tutti-persistence ---
[INFO] Loaded /var/local/forge/data/codelutin.com/jenkins/workspace/tutti-nightly/trunk/target/collect-artifacts.txt
[INFO] Copying tutti-persistence-3.5-SNAPSHOT.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/tutti-nightly/trunk/target/collect/fr.ifremer.tutti--tutti-persistence/tutti-persistence-3.5-SNAPSHOT.jar
[INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/codelutin.com/jenkins/workspace/tutti-nightly/trunk/target/collect/fr.ifremer.tutti--tutti-persistence/THIRD-PARTY.properties
[INFO] Copying tutti-persistence-3.5-SNAPSHOT-sources.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/tutti-nightly/trunk/target/collect/fr.ifremer.tutti--tutti-persistence/tutti-persistence-3.5-SNAPSHOT-sources.jar
[INFO] Copying tutti-persistence-3.5-SNAPSHOT-javadoc.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/tutti-nightly/trunk/target/collect/fr.ifremer.tutti--tutti-persistence/tutti-persistence-3.5-SNAPSHOT-javadoc.jar
[INFO]
[INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ tutti-persistence ---
[WARNING] Skipping goal (No file to collect).
[INFO]
[INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ tutti-persistence ---
[INFO]
[INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ tutti-persistence ---
[INFO] Used declared dependencies found:
[INFO] org.nuiton.jaxx:jaxx-application-api:jar:2.8.4:compile
[INFO] fr.ifremer.adagio:adagio-core-shared:jar:3.5.2:compile
[INFO] fr.ifremer.adagio:adagio-core-allegro:jar:3.5.2:compile
[INFO] org.springframework:spring-beans:jar:4.0.1.RELEASE:provided
[INFO] org.springframework:spring-context:jar:4.0.1.RELEASE:provided
[INFO] org.springframework:spring-tx:jar:4.0.1.RELEASE:provided
[INFO] org.hibernate:hibernate-core:jar:4.3.1.Final:compile
[INFO] org.nuiton:nuiton-utils:jar:3.0-rc-2:compile
[INFO] org.nuiton:nuiton-config:jar:3.0-alpha-2:compile
[INFO] org.nuiton:nuiton-decorator:jar:3.0-alpha-3:compile
[INFO] org.nuiton:nuiton-updater:jar:3.0-alpha-2:compile
[INFO] org.nuiton.i18n:nuiton-i18n:jar:3.0:compile
[INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile
[INFO] commons-io:commons-io:jar:2.4:compile
[INFO] commons-beanutils:commons-beanutils:jar:1.9.1:compile
[INFO] commons-collections:commons-collections:jar:3.2.1:compile
[INFO] commons-logging:commons-logging:jar:1.1.3:compile
[INFO] com.google.guava:guava:jar:16.0.1:compile
[INFO] com.esotericsoftware.yamlbeans:yamlbeans:jar:1.06:compile
[INFO] hsqldb:hsqldb:jar:1.8.0.10:compile
[INFO] junit:junit:jar:4.11:provided
[WARNING] Used undeclared dependencies found:
[WARNING] commons-lang:commons-lang:jar:2.6:compile
[JENKINS] Archiving disabled
1
2
r1741 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 29 Apr '14
by tchemit＠users.forge.codelutin.com 29 Apr '14
29 Apr '14
Author: tchemit
Date: 2014-04-29 10:14:10 +0200 (Tue, 29 Apr 2014)
New Revision: 1741
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1741
Log:
refs #4995 (some location were lost)
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-04-29 07:45:29 UTC (rev 1740)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-04-29 08:14:10 UTC (rev 1741)
@@ -105,6 +105,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
/**
@@ -1322,9 +1323,11 @@
* @param fishingArea
* @param regulationLocationId
* @param createIfNotExists
- * @return a entity FishingArea2RegulationLocation, or null if not found and createIfNotExists=false
+ * @return a entity FishingArea2RegulationLocation, or {@code null} if not found and createIfNotExists=false
*/
- private FishingArea2RegulationLocation getFishingArea2RegulationLocation(FishingArea fishingArea, int regulationLocationId, boolean createIfNotExists) {
+ protected FishingArea2RegulationLocation getFishingArea2RegulationLocation(FishingArea fishingArea,
+ int regulationLocationId,
+ boolean createIfNotExists) {
Preconditions.checkNotNull(fishingArea);
// Create the PK
@@ -1332,13 +1335,14 @@
pk.setFishingArea((FishingAreaImpl) fishingArea);
pk.setLocation(load(LocationImpl.class, regulationLocationId));
- // Retrieve exiting regulation location
+ // Retrieve existing regulation location
FishingArea2RegulationLocation fa2rl = null;
if (CollectionUtils.isNotEmpty(fishingArea.getRegulationLocations())) {
for(FishingArea2RegulationLocation existingFa2rl: fishingArea.getRegulationLocations()) {
FishingArea2RegulationLocationPK existingPk = existingFa2rl.getFishingArea2RegulationLocationPk();
- if (ObjectUtils.equals(existingPk, pk)) {
- return fa2rl;
+ if (Objects.equals(existingPk, pk)) {
+ fa2rl = existingFa2rl;
+ break;
}
}
}
1
0