Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
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:
| ... | ... | @@ -158,13 +158,13 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati |
| 158 | 158 |
String vesselSimpleTypeStr = vesselSimpleType.getLabel1();
|
| 159 | 159 |
// obtain all trips for harbour / fleet / vesselSimpleType
|
| 160 | 160 |
List<CompleteTrip> completeTrips = getStratumCompleteTrips(stratumVessels, harbour);
|
| 161 |
- log.debug(String.format("For [%s/%s/%s] nb trips = %d", harbourStr, countryStr, vesselSimpleTypeStr, completeTrips.size()));
|
|
| 161 |
+ log.info(String.format("For [%s/%s/%s] nb trips = %d", harbourStr, countryStr, vesselSimpleTypeStr, completeTrips.size()));
|
|
| 162 | 162 |
if (completeTrips.isEmpty()) {
|
| 163 | 163 |
// no trip for this stratum
|
| 164 | 164 |
continue;
|
| 165 | 165 |
}
|
| 166 | 166 |
Multimap<T3Date, CompleteTrip> tripsByMonth = TripTopiaDao.splitTripsByMonth(completeTrips);
|
| 167 |
- log.debug(String.format("found %d months.", tripsByMonth.size()));
|
|
| 167 |
+ log.info(String.format("found %d months.", tripsByMonth.keySet().size()));
|
|
| 168 | 168 |
for (T3Date month : tripsByMonth.keySet()) {
|
| 169 | 169 |
Collection<CompleteTrip> stratumTrips = tripsByMonth.get(month);
|
| 170 | 170 |
nbStratum++;
|
| ... | ... | @@ -39,6 +39,7 @@ import org.nuiton.util.ZipUtil; |
| 39 | 39 |
import java.io.File;
|
| 40 | 40 |
import java.io.IOException;
|
| 41 | 41 |
import java.io.InputStream;
|
| 42 |
+import java.nio.charset.StandardCharsets;
|
|
| 42 | 43 |
import java.util.Arrays;
|
| 43 | 44 |
import java.util.Collections;
|
| 44 | 45 |
import java.util.Enumeration;
|
| ... | ... | @@ -154,8 +155,8 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn |
| 154 | 155 |
File targetDirectory = getTreatmentDirectory();
|
| 155 | 156 |
String filename = getSourceToLoadFileName();
|
| 156 | 157 |
if (ZipUtil.isZipFile(upload)) {
|
| 157 |
- // let's decompress input stream it
|
|
| 158 |
- ZipFile zipfile = new ZipFile(upload);
|
|
| 158 |
+ // let's decompress input stream it (always in iso 8869_1)
|
|
| 159 |
+ ZipFile zipfile = new ZipFile(upload, StandardCharsets.ISO_8859_1);
|
|
| 159 | 160 |
Enumeration<? extends ZipEntry> entries = zipfile.entries();
|
| 160 | 161 |
if (!entries.hasMoreElements()) {
|
| 161 | 162 |
String message = t("t3.error.required.one.entry.in.zip.to.upload");
|
| ... | ... | @@ -166,7 +167,7 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn |
| 166 | 167 |
// get first entry
|
| 167 | 168 |
ZipEntry zipEntry = entries.nextElement();
|
| 168 | 169 |
// keep the filename of the zip entry
|
| 169 |
- filename = zipEntry.getName();
|
|
| 170 |
+ filename = new String(zipEntry.getName().getBytes(),StandardCharsets.ISO_8859_1);
|
|
| 170 | 171 |
File target = new File(targetDirectory, filename);
|
| 171 | 172 |
log.info(String.format("Will copy loaded zipped entry file %s to treatment configuration directory %s", filename, target));
|
| 172 | 173 |
try (InputStream in = zipfile.getInputStream(zipEntry)) {
|