Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 8a3cd0de by Tony CHEMIT at 2018-03-20T15:40:53Z [N0.2][LOG] Petite bizarerie dans les logs (See #239) - - - - - 1 changed file: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.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 @@ -23,6 +23,7 @@ package fr.ird.t3.actions.data.level0; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimap; +import com.google.common.collect.TreeMultimap; import fr.ird.t3.entities.data.CompleteTrip; import fr.ird.t3.entities.data.RaisingFactor2; import fr.ird.t3.entities.data.RaisingFactor2TopiaDao; @@ -53,7 +54,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.TreeSet; import static org.nuiton.i18n.I18n.l; @@ -83,7 +83,7 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati private VesselSimpleTypeTopiaDao vesselSimpleTypeDAO; /** usable complete trips group by vessel */ private ListMultimap<Vessel, CompleteTrip> completeTripsByVessel; - private Set<String> tripStrDone; + private Multimap<String, String> tripDone; public ComputeRF2Action() { super(Level0Step.COMPUTE_RF2); @@ -119,7 +119,7 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati // use all fleets fleets = countryDAO.findAll(); } - tripStrDone = new TreeSet<>(); + tripDone = TreeMultimap.create(); List<Trip> tripList = getUsableTrips(landingHarbours, true); setTrips(tripList); completeTripsByVessel = ArrayListMultimap.create(); @@ -253,15 +253,17 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati // must update it raisingFactor2DAO.update(raisingFactor); } - if (rf2 != 1) { - nbTripsWithRF2 += trips.size(); - } // set rf2 to all trips for (CompleteTrip trip : trips) { String tripStr = decorate(trip); - String message = l(locale, "t3.level0.computeRF1.resume.rf2.for.trip", tripStr, rf2); - log.info(message); - addInfoMessage(message); + if (canLog(tripStr,"nbTrips")) { + if (rf2 != 1) { + nbTripsWithRF2++; + } + String message = l(locale, "t3.level0.computeRF1.resume.rf2.for.trip", tripStr, rf2); + log.info(message); + addInfoMessage(message); + } trip.applyRf2(rf2); markTripAsTreated(trip); } @@ -283,12 +285,12 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati tripCatchWeight = trip.getElementaryCatchTotalWeightRf1(species); } totalCatchWeight += tripCatchWeight; - if (tripStrDone.add(tripStr)) { + if (canLog(tripStr,"compute")) { addInfoMessage(l(locale, "t3.level0.computeRF2.resume.rf1.for.trip", tripStr, tripCatchWeight, tripLandingWeight)); } } else { // this trip does not have any landing catches for given species - if (tripStrDone.add(tripStr)) { + if (canLog(tripStr,"compute")) { addWarningMessage(l(locale, "t3.level0.computeRF2.resume.skip.for.trip", tripStr)); } } @@ -308,4 +310,12 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati } } + private boolean canLog(String key, String method) { + boolean exist = tripDone.containsEntry(key, method); + if (!exist) { + tripDone.put(key, method); + } + return !exist; + } + } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8a3cd0de840836f479078253c3173063b... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8a3cd0de840836f479078253c3173063b... You're receiving this email because of your account on gitlab.com.