Fixed wrong path when lobfolder is missing

keeps · Jan 8, 2024 · ff144a3 · ff144a3
1 parent 0cddcff
commit ff144a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/...n/java/com/databasepreservation/modules/siard/in/content/SIARD2ContentImportStrategy.java b/...n/java/com/databasepreservation/modules/siard/in/content/SIARD2ContentImportStrategy.java
@@ -295,6 +295,7 @@ public void startElement(String uri, String localName, String qName, Attributes
         SIARDArchiveContainer container;
         if (lobDir.startsWith("..")) {
           container = lobContainer;
+          lobPath = lobContainer.getPath().toString() + '/' + lobPath.replace("../", "");
         } else {
           container = contentContainer;
         }

diff --git a/.../java/com/databasepreservation/modules/siard/in/path/SIARD2ContentPathImportStrategy.java b/.../java/com/databasepreservation/modules/siard/in/path/SIARD2ContentPathImportStrategy.java
@@ -78,6 +78,8 @@ public String getLobPath(String basePath, String schemaName, String tableId, Str
 
     if (".".equals(basePath) && ".".equals(columnPart) && lobFileName.startsWith("..")) {
       return lobFileName.substring(3);
+    } else if (".".equals(columnPart)) {
+      return lobFileName;
     } else {
       return new StringBuilder().append(basePath).append(RESOURCE_FILE_SEPARATOR).append(schemaPart)
         .append(RESOURCE_FILE_SEPARATOR).append(tablePart).append(RESOURCE_FILE_SEPARATOR).append(columnPart)