From 93a7af321218eedacd3c052c061838f4d41d22ce Mon Sep 17 00:00:00 2001
From: Riegel <alexander.riegel@hft-stuttgart.de>
Date: Wed, 4 Dec 2024 13:54:36 +0100
Subject: [PATCH] Fix: Correct ZipEntry name parsing
---
.../stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java b/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
index dd80c8a..b25ab71 100644
--- a/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
+++ b/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
@@ -32,7 +32,7 @@ public class CityGmlZipEntry {
try {
CityGmlParser.gagLogger(true);
CityDoctorModel model = CityGmlParser.parseCityGmlZipEntry(entry, archive, config);
- return new CityGmlZipEntry(entry.getName(), model);
+ return new CityGmlZipEntry(entry, model);
} catch (CityGmlParseException | InvalidGmlFileException e) {
logger.error(e);
return new ErroneousEntry(entry, ZipEntryErrorType.INVALID_CITY_GML_FILE);
@@ -43,13 +43,13 @@ public class CityGmlZipEntry {
}
}
- private CityGmlZipEntry(String filename, CityDoctorModel model){
- this.fileName = filename;
+ private CityGmlZipEntry(ZipEntry entry, CityDoctorModel model){
+ this.fileName = entry.getName().substring(entry.getName().lastIndexOf('/') + 1);
this.model = model;
}
protected CityGmlZipEntry(ZipEntry entry) {
- this.fileName = entry.getName();
+ this.fileName = entry.getName().substring(entry.getName().lastIndexOf('/') + 1);
this.model = null;
}
--
GitLab