Update SIARD 2.2 import/export content strategy

Author: hmiguim

dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/in/content/SIARD22ContentImportStrategy.java

@@ -297,9 +297,10 @@ public void startElement(String uri, String localName, String qName, Attributes
         if (columnLobsDir == null) {
           columnLobsDir = "";
         }
+
         String lobFile = attr.getValue(FILE_KEYWORD);
         String lobPath;
-        if (lobFile.startsWith(File.separator)) {
+        if (lobFile.startsWith(File.separator) || lobFile.startsWith("content")) {
           lobPath = lobFile;
         } else if (columnLobsDir.startsWith(File.separator)) {
           lobPath = Path.of(columnLobsDir, lobFile).toString();

dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/content/SIARD22ContentExportStrategy.java

@@ -413,7 +413,7 @@ protected void writeLargeObjectData(String cellPrefix, Cell cell, int columnInde
         byte[] messageDigest = digest.getMessageDigest().digest();
 
         currentWriter.beginOpenTag(cellPrefix + columnIndex, 2).space().append("file=\"")
-          .append(FilenameUtils.separatorsToUnix(contentPathStrategy.getInternalBlobFileName(currentRowIndex + 1)))
+          .append(FilenameUtils.separatorsToUnix(contentPathStrategy.getBlobFilePath(currentSchema.getIndex(), currentTable.getIndex(), columnIndex, currentRowIndex + 1)))
           .append('"').space().append("length=\"").append(String.valueOf(binCell.getSize())).append("\"").space()
           .append("digest=\"").append(MessageDigestUtils.getHexFromMessageDigest(messageDigest, lowerCase)).append("\"")
           .space().append("digestType=\"").append(messageDigestAlgorithm.toUpperCase()).append("\"");
@@ -452,7 +452,7 @@ protected void writeLargeObjectData(String cellPrefix, Cell cell, int columnInde
         byte[] messageDigest = digest.getMessageDigest().digest();
 
         currentWriter.beginOpenTag(cellPrefix + columnIndex, 2).space().append("file=\"")
-          .append(contentPathStrategy.getInternalClobFileName(currentRowIndex + 1)).append('"').space()
+          .append(contentPathStrategy.getClobFilePath(currentSchema.getIndex(),currentTable.getIndex(), columnIndex, currentRowIndex + 1)).append('"').space()
           .append("length=\"").append(String.valueOf(txtCell.getBytesSize())).append("\"").space().append("digest=\"")
           .append(MessageDigestUtils.getHexFromMessageDigest(messageDigest, lowerCase)).append("\"").space()
           .append("digestType=\"").append(messageDigestAlgorithm.toUpperCase()).append("\"");