- T3-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-t3][develop] [N0.2] Questions sur le log ( Closes #311 ) - amélioration du log
by Tony CHEMIT April 11, 2018

April 11, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 4ab2024f by Tony CHEMIT at 2018-04-11T12:18:10Z [N0.2] Questions sur le log ( Closes #311 ) - amélioration du log - - - - - 4 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties - t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties - t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java @@ -55,7 +55,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.l; ===================================== t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties ===================================== --- a/t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties +++ b/t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties @@ -38,7 +38,7 @@ t3.level0.computeRF1.warning.too.high.rf1=For complete trip %s from %s to %s com t3.level0.computeRF1.warning.too.low.rf1=For complete trip %s from %s to %s computed rf1 is too small (less than %s) t3.level0.computeRF1.warning.trip.is.not.complete=Trip %s is not compelte, can not compute any rf1 for it t3.level0.computeRF2.computed.rf2.for.stratum=Computed rf2 for stratum \: %s -t3.level0.computeRF2.nbTrips.for.stratum=%s trip(s) for Stratum (%s) [%s/%s/%s/%s] +t3.level0.computeRF2.nbTrips.for.stratum=%s complete trip(s) for Stratum (%s) [%s/%s/%s/%s] t3.level0.computeRF2.resume.rf1.for.trip=Trip %s total rf1 catches weight %s / total landing weight %s t3.level0.computeRF2.resume.skip.for.trip=Trip %s has not elementary landing (trip not used to compute rf2) t3.level0.computeRF2.resume.total.rf1=Sum total rf1 catches weight %s / Sum total landing weight %s ===================================== t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties ===================================== --- a/t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties +++ b/t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties @@ -38,7 +38,7 @@ t3.level0.computeRF1.warning.too.high.rf1=Pour la marée complète %s de %s à % t3.level0.computeRF1.warning.too.low.rf1=Pour la marée complète %s de %s à %s le rf1 calculé %s est trop petit (inférieur à %s) t3.level0.computeRF1.warning.trip.is.not.complete=La marée %s n'est pas complète, calcul du rf1 impossible t3.level0.computeRF2.computed.rf2.for.stratum=Valeur du rf2 calculé pour la strate \: %s -t3.level0.computeRF2.nbTrips.for.stratum=%s marée(s) pour la Strate (%s) [%s/%s/%s/%s] +t3.level0.computeRF2.nbTrips.for.stratum=%s marée(s) complête(s) pour la Strate (%s) [%s/%s/%s/%s] t3.level0.computeRF2.resume.rf1.for.trip=Marée %s Poids total des captures rf1isées %s / Poids total des ventes %s t3.level0.computeRF2.resume.skip.for.trip=La marée %s ne possède pas de lots commerciaux (non prise en compte dans le calcul du rf2) t3.level0.computeRF2.resume.total.rf1=Poids cumulé des captures rf1isées %s / Poids cumulé des ventes %s ===================================== t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java @@ -157,10 +157,10 @@ public class DecoratorService extends T3ServiceSupport implements T3ServiceSingl registerJXPathDecorator(locale, Trip.class, WITH_ID, "${vesselLabel}$s - ${landingDate}$td/%2$tm/%2$tY [${topiaId}$s]"); // trip (with topiaid) decorator - registerJXPathDecorator(locale, CompleteTrip.class, "${landingTrip/vesselLabel}$s - ${landingTrip/landingDate}$td/%2$tm/%2$tY (nb trip(s) ${nbTrips}$s)"); + registerJXPathDecorator(locale, CompleteTrip.class, "${landingTrip/vesselLabel}$s - ${departureTrip/departureDate}$td/%2$tm/%2$tY - ${landingTrip/landingDate}$td/%3$tm/%3$tY (nb trip(s) ${nbTrips}$s)"); // trip (with topiaid) decorator - registerJXPathDecorator(locale, CompleteTrip.class, WITH_ID, "${landingTrip/vesselLabel}$s - ${landingTrip/landingDate}$td/%2$tm/%2$tY [${landingTrip/topiaId}$s] (nb trip(s) ${nbTrips}$s)"); + registerJXPathDecorator(locale, CompleteTrip.class, WITH_ID, "${landingTrip/vesselLabel}$s - ${departureTrip/departureDate}$td/%2$tm/%2$tY - ${landingTrip/landingDate}$td/%3$tm/%3$tY [${landingTrip/topiaId}$s] (nb trip(s) ${nbTrips}$s)"); // well (with topiaid) decorator registerJXPathDecorator(locale, Well.class, "Number ${wellNumber}$s - Position ${wellPosition}$s [${topiaId}$s]"); View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/4ab2024fed6b00fd9aaba6f70fa97a83… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/4ab2024fed6b00fd9aaba6f70fa97a83… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N0.2] Questions sur le log (Closes #311)
by Tony CHEMIT April 11, 2018

April 11, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 738aa303 by Tony CHEMIT at 2018-04-11T11:37:58Z [N0.2] Questions sur le log (Closes #311) - - - - - 2 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java @@ -53,7 +53,9 @@ import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.l; @@ -121,16 +123,22 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati } tripDone = TreeMultimap.create(); List<Trip> tripList = getUsableTrips(landingHarbours, true); + log.info("Trip count: "+tripList.size()); setTrips(tripList); completeTripsByVessel = ArrayListMultimap.create(); // get all trips group by the vessel ListMultimap<Vessel, Trip> tripsByVessel = TripTopiaDao.groupByVessel(tripList); + log.info("Trip vessel count: "+tripsByVessel.keySet().size()); + // compute for each vessel list of complete trip - for (Vessel vessel : tripsByVessel.keys()) { - List<Trip> tripsForVessel = new ArrayList<>(tripsByVessel.get(vessel)); + for (Map.Entry<Vessel, Collection<Trip>> entry : tripsByVessel.asMap().entrySet()) { + Vessel vessel = entry.getKey(); + List<Trip> tripsForVessel = new ArrayList<>(entry.getValue()); + log.info("Trip vessel ["+vessel.getLabel1()+"] count: "+tripsForVessel.size()); TripTopiaDao.sortTrips(tripsForVessel); // get all complete trips List<CompleteTrip> completeTrips = tripDAO.toCompleteTrip(tripsForVessel); + log.info("Complete trip vessel ["+vessel.getLabel1()+"] count: "+completeTrips.size()); completeTripsByVessel.putAll(vessel, completeTrips); } @@ -165,8 +173,9 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati } Multimap<T3Date, CompleteTrip> tripsByMonth = TripTopiaDao.splitTripsByMonth(completeTrips); log.info(String.format("found %d months.", tripsByMonth.keySet().size())); - for (T3Date month : tripsByMonth.keySet()) { - Collection<CompleteTrip> stratumTrips = tripsByMonth.get(month); + for (Map.Entry<T3Date, Collection<CompleteTrip>> entry : tripsByMonth.asMap().entrySet()) { + T3Date month = entry.getKey(); + Collection<CompleteTrip> stratumTrips = entry.getValue(); nbStratum++; String message = l(locale, "t3.level0.computeRF2.nbTrips.for.stratum", stratumTrips.size(), ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java @@ -103,7 +103,7 @@ public class TripImpl extends TripAbstract { public boolean isLevel2Computed() { if (level2Computed == null) { level2Computed = false; - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity a : getActivity()) { Boolean b = a.getUseMeanStratumCompositionN2(); if (b != null) { @@ -121,7 +121,7 @@ public class TripImpl extends TripAbstract { public boolean isLevel3Computed() { if (level3Computed == null) { level3Computed = false; - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity a : getActivity()) { Boolean b = a.getUseMeanStratumCompositionN3(); if (b != null) { @@ -163,7 +163,7 @@ public class TripImpl extends TripAbstract { // @Override // public float getTotalSetsDuration() { // float result = 0; -// if (!isActivityEmpty()) { +// if (isActivityNotEmpty()) { // for (Activity activity : getActivity()) { // // // get the setDuration @@ -178,7 +178,7 @@ public class TripImpl extends TripAbstract { @Override public float getElementaryCatchTotalWeight(Collection<Species> species) { float result = 0; - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity activity : getActivity()) { result += activity.getElementaryCatchTotalWeight(species); } @@ -189,7 +189,7 @@ public class TripImpl extends TripAbstract { @Override public float getElementaryCatchTotalWeightRf1(Collection<Species> species) { float result = 0; - if (getRf1() != null && !isActivityEmpty()) { + if (getRf1() != null && isActivityNotEmpty()) { for (Activity activity : getActivity()) { if (activity.isElementaryCatchEmpty()) { @@ -211,7 +211,7 @@ public class TripImpl extends TripAbstract { @Override public float getElementaryCatchTotalWeightRf2(Collection<Species> species) { float result = 0; - if (getRf1() != null && !isActivityEmpty()) { + if (getRf1() != null && isActivityNotEmpty()) { for (Activity activity : getActivity()) { if (activity.isElementaryCatchEmpty()) { @@ -246,7 +246,7 @@ public class TripImpl extends TripAbstract { @Override public float getElementaryLandingTotalWeight(Collection<Species> species) { float result = 0; - if (!isElementaryLandingEmpty()) { + if (isElementaryLandingNotEmpty()) { for (ElementaryLanding elementaryLanding : getElementaryLanding()) { if (species.contains(elementaryLanding.getWeightCategoryLanding().getSpecies())) { result += elementaryLanding.getWeight(); @@ -260,7 +260,7 @@ public class TripImpl extends TripAbstract { @Override public Set<Species> getElementaryCatchSpecies() { Set<Species> result = new HashSet<>(); - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity activity : getActivity()) { if (!activity.isElementaryCatchEmpty()) { for (ElementaryCatch aCatch : activity.getElementaryCatch()) { @@ -275,7 +275,7 @@ public class TripImpl extends TripAbstract { @Override public Set<Species> getElementaryLandingSpecies() { Set<Species> result = new HashSet<>(); - if (!isElementaryLandingEmpty()) { + if (isElementaryLandingNotEmpty()) { for (ElementaryLanding landing : getElementaryLanding()) { result.add(landing.getWeightCategoryLanding().getSpecies()); } @@ -286,7 +286,7 @@ public class TripImpl extends TripAbstract { @Override public Set<Ocean> getAllOceans() { Set<Ocean> result = new HashSet<>(); - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity activity : getActivity()) { result.add(activity.getOcean()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/738aa303241ddeef5412a0693eac77fb… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/738aa303241ddeef5412a0693eac77fb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N0.2] Questions sur le log (Closes #311)
by Tony CHEMIT April 11, 2018

April 11, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: c406f4d5 by Tony CHEMIT at 2018-04-11T11:28:45Z [N0.2] Questions sur le log (Closes #311) - - - - - 2 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java @@ -53,7 +53,9 @@ import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.l; @@ -121,16 +123,22 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati } tripDone = TreeMultimap.create(); List<Trip> tripList = getUsableTrips(landingHarbours, true); + log.info("Trip count: "+tripList.size()); setTrips(tripList); completeTripsByVessel = ArrayListMultimap.create(); // get all trips group by the vessel ListMultimap<Vessel, Trip> tripsByVessel = TripTopiaDao.groupByVessel(tripList); + log.info("Trip vessel count: "+tripsByVessel.keySet().size()); + // compute for each vessel list of complete trip - for (Vessel vessel : tripsByVessel.keys()) { - List<Trip> tripsForVessel = new ArrayList<>(tripsByVessel.get(vessel)); + for (Map.Entry<Vessel, Collection<Trip>> entry : tripsByVessel.asMap().entrySet()) { + Vessel vessel = entry.getKey(); + List<Trip> tripsForVessel = new ArrayList<>(entry.getValue()); + log.info("Trip vessel ["+vessel.getLabel1()+"] count: "+tripsForVessel.size()); TripTopiaDao.sortTrips(tripsForVessel); // get all complete trips List<CompleteTrip> completeTrips = tripDAO.toCompleteTrip(tripsForVessel); + log.info("Complete trip vessel ["+vessel.getLabel1()+"] count: "+completeTrips.size()); completeTripsByVessel.putAll(vessel, completeTrips); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java @@ -103,7 +103,7 @@ public class TripImpl extends TripAbstract { public boolean isLevel2Computed() { if (level2Computed == null) { level2Computed = false; - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity a : getActivity()) { Boolean b = a.getUseMeanStratumCompositionN2(); if (b != null) { @@ -121,7 +121,7 @@ public class TripImpl extends TripAbstract { public boolean isLevel3Computed() { if (level3Computed == null) { level3Computed = false; - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity a : getActivity()) { Boolean b = a.getUseMeanStratumCompositionN3(); if (b != null) { @@ -163,7 +163,7 @@ public class TripImpl extends TripAbstract { // @Override // public float getTotalSetsDuration() { // float result = 0; -// if (!isActivityEmpty()) { +// if (isActivityNotEmpty()) { // for (Activity activity : getActivity()) { // // // get the setDuration @@ -178,7 +178,7 @@ public class TripImpl extends TripAbstract { @Override public float getElementaryCatchTotalWeight(Collection<Species> species) { float result = 0; - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity activity : getActivity()) { result += activity.getElementaryCatchTotalWeight(species); } @@ -189,7 +189,7 @@ public class TripImpl extends TripAbstract { @Override public float getElementaryCatchTotalWeightRf1(Collection<Species> species) { float result = 0; - if (getRf1() != null && !isActivityEmpty()) { + if (getRf1() != null && isActivityNotEmpty()) { for (Activity activity : getActivity()) { if (activity.isElementaryCatchEmpty()) { @@ -211,7 +211,7 @@ public class TripImpl extends TripAbstract { @Override public float getElementaryCatchTotalWeightRf2(Collection<Species> species) { float result = 0; - if (getRf1() != null && !isActivityEmpty()) { + if (getRf1() != null && isActivityNotEmpty()) { for (Activity activity : getActivity()) { if (activity.isElementaryCatchEmpty()) { @@ -246,7 +246,7 @@ public class TripImpl extends TripAbstract { @Override public float getElementaryLandingTotalWeight(Collection<Species> species) { float result = 0; - if (!isElementaryLandingEmpty()) { + if (isElementaryLandingNotEmpty()) { for (ElementaryLanding elementaryLanding : getElementaryLanding()) { if (species.contains(elementaryLanding.getWeightCategoryLanding().getSpecies())) { result += elementaryLanding.getWeight(); @@ -260,7 +260,7 @@ public class TripImpl extends TripAbstract { @Override public Set<Species> getElementaryCatchSpecies() { Set<Species> result = new HashSet<>(); - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity activity : getActivity()) { if (!activity.isElementaryCatchEmpty()) { for (ElementaryCatch aCatch : activity.getElementaryCatch()) { @@ -275,7 +275,7 @@ public class TripImpl extends TripAbstract { @Override public Set<Species> getElementaryLandingSpecies() { Set<Species> result = new HashSet<>(); - if (!isElementaryLandingEmpty()) { + if (isElementaryLandingNotEmpty()) { for (ElementaryLanding landing : getElementaryLanding()) { result.add(landing.getWeightCategoryLanding().getSpecies()); } @@ -286,7 +286,7 @@ public class TripImpl extends TripAbstract { @Override public Set<Ocean> getAllOceans() { Set<Ocean> result = new HashSet<>(); - if (!isActivityEmpty()) { + if (isActivityNotEmpty()) { for (Activity activity : getActivity()) { result.add(activity.getOcean()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/c406f4d5234d2c8627508b19bc4a4621… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/c406f4d5234d2c8627508b19bc4a4621… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: Anomalie suite au chargement d'une base dont le nom contient un lettre accentuée (Closes #310)
by Tony CHEMIT April 11, 2018

April 11, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 0b6cb8bd by Tony CHEMIT at 2018-04-11T10:21:02Z Anomalie suite au chargement d'une base dont le nom contient un lettre accentuée (Closes #310) - - - - - d7b705b8 by Tony CHEMIT at 2018-04-11T10:21:04Z [N0.2] Questions sur le log (See #311° - add more logs - - - - - 2 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java @@ -158,13 +158,13 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati String vesselSimpleTypeStr = vesselSimpleType.getLabel1(); // obtain all trips for harbour / fleet / vesselSimpleType List<CompleteTrip> completeTrips = getStratumCompleteTrips(stratumVessels, harbour); - log.debug(String.format("For [%s/%s/%s] nb trips = %d", harbourStr, countryStr, vesselSimpleTypeStr, completeTrips.size())); + log.info(String.format("For [%s/%s/%s] nb trips = %d", harbourStr, countryStr, vesselSimpleTypeStr, completeTrips.size())); if (completeTrips.isEmpty()) { // no trip for this stratum continue; } Multimap<T3Date, CompleteTrip> tripsByMonth = TripTopiaDao.splitTripsByMonth(completeTrips); - log.debug(String.format("found %d months.", tripsByMonth.size())); + log.info(String.format("found %d months.", tripsByMonth.keySet().size())); for (T3Date month : tripsByMonth.keySet()) { Collection<CompleteTrip> stratumTrips = tripsByMonth.get(month); nbStratum++; ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java @@ -39,6 +39,7 @@ import org.nuiton.util.ZipUtil; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; @@ -154,8 +155,8 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn File targetDirectory = getTreatmentDirectory(); String filename = getSourceToLoadFileName(); if (ZipUtil.isZipFile(upload)) { - // let's decompress input stream it - ZipFile zipfile = new ZipFile(upload); + // let's decompress input stream it (always in iso 8869_1) + ZipFile zipfile = new ZipFile(upload, StandardCharsets.ISO_8859_1); Enumeration<? extends ZipEntry> entries = zipfile.entries(); if (!entries.hasMoreElements()) { String message = t("t3.error.required.one.entry.in.zip.to.upload"); @@ -166,7 +167,7 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn // get first entry ZipEntry zipEntry = entries.nextElement(); // keep the filename of the zip entry - filename = zipEntry.getName(); + filename = new String(zipEntry.getName().getBytes(),StandardCharsets.ISO_8859_1); File target = new File(targetDirectory, filename); log.info(String.format("Will copy loaded zipped entry file %s to treatment configuration directory %s", filename, target)); try (InputStream in = zipfile.getInputStream(zipEntry)) { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/13be965b77f4b00d73eb980712764de… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/13be965b77f4b00d73eb980712764de… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Anomalie suite au chargement d'une base dont le nom contient un lettre accentuée (Closes #310)
by Tony CHEMIT April 10, 2018

April 10, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 13be965b by Tony CHEMIT at 2018-04-10T20:36:25Z Anomalie suite au chargement d'une base dont le nom contient un lettre accentuée (Closes #310) - - - - - 1 changed file: - t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java Changes: ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java @@ -39,6 +39,7 @@ import org.nuiton.util.ZipUtil; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; @@ -154,8 +155,8 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn File targetDirectory = getTreatmentDirectory(); String filename = getSourceToLoadFileName(); if (ZipUtil.isZipFile(upload)) { - // let's decompress input stream it - ZipFile zipfile = new ZipFile(upload); + // let's decompress input stream it (always in iso 8869_1) + ZipFile zipfile = new ZipFile(upload, StandardCharsets.ISO_8859_1); Enumeration<? extends ZipEntry> entries = zipfile.entries(); if (!entries.hasMoreElements()) { String message = t("t3.error.required.one.entry.in.zip.to.upload"); View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/13be965b77f4b00d73eb980712764de4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/13be965b77f4b00d73eb980712764de4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Update CHANGELOG.md
by Tony CHEMIT April 5, 2018

April 5, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: e6a3b4b5 by Tony CHEMIT at 2018-04-05T17:42:01Z Update CHANGELOG.md - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ * Author [Tony Chemit](mailto:dev@tchemit.fr) * Last generated at 2018-04-05 19:27. - ## Version [2.6](https://gitlab.com/ultreiaio/ird-t3/milestones/36) +## Version [2.6](https://gitlab.com/ultreiaio/ird-t3/milestones/36) **Closed at 2018-04-05.** View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/e6a3b4b5434301b2cf5bb01a29783ecd… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/e6a3b4b5434301b2cf5bb01a29783ecd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3 :: Pom
by Tony CHEMIT April 5, 2018

April 5, 2018

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: fe05a9ad by 166231 at 2018-04-05T17:30:43Z Site checkin for project T3 :: Pom - - - - - 19 changed files: - aggregate-third-party-report.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install.html - installer.html - integration.html - issue-tracking.html - license.html - model.html - plugin-management.html - plugin-updates-report.html - plugins.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/fe05a9adaf69aaa80e0cf708dee2675a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/fe05a9adaf69aaa80e0cf708dee2675a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] update changelog after release 2.6 [skip ci]
by Tony CHEMIT April 5, 2018

April 5, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 7fcfc174 by Tony CHEMIT at 2018-04-05T17:29:17Z update changelog after release 2.6 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,22 @@ # T3 changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2018-03-23 18:32. + * Last generated at 2018-04-05 19:27. + + ## Version [2.6](https://gitlab.com/ultreiaio/ird-t3/milestones/36) + + **Closed at 2018-04-05.** + + ### Download + * [Installer (t3-2.6.zip)](https://oss.sonatype.org/content/repositories/frirdt3-1018/fr/…) + * [Application (t3-2.6.war)](https://oss.sonatype.org/content/repositories/frirdt3-1018/fr/…) + + ### Issues + * [[Evolution 306]](https://gitlab.com/ultreiaio/ird-t3/issues/306) **Mise en page de certains écrans de configuration** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 307]](https://gitlab.com/ultreiaio/ird-t3/issues/307) **[N3] Option à supprimer sur le N3** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Tâche 303]](https://gitlab.com/ultreiaio/ird-t3/issues/303) **Problème avec l'installeur 2.5** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Tâche 304]](https://gitlab.com/ultreiaio/ird-t3/issues/304) **[IMPORT] Il manque un lien "Importer une autre marée"** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Tâche 305]](https://gitlab.com/ultreiaio/ird-t3/issues/305) **Pour une base OI 2018, l'assistant import exige un code port a priori non pertinent** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [2.5](https://gitlab.com/ultreiaio/ird-t3/milestones/35) View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7fcfc1740bb2a787743f61f32c3601ff… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7fcfc1740bb2a787743f61f32c3601ff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Deleted branch release/2.6
by Tony CHEMIT April 5, 2018

April 5, 2018

Tony CHEMIT deleted branch release/2.6 at ultreiaio / ird-t3 --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Pushed new tag v2.6
by Tony CHEMIT April 5, 2018

April 5, 2018

Tony CHEMIT pushed new tag v2.6 at ultreiaio / ird-t3 --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/tree/v2.6 You're receiving this email because of your account on gitlab.com.

1 0