fix: normalize file and name so that the digital media list has no bl…

…ank items
cleydyr · May 28, 2024 · fcd2c9c · fcd2c9c
1 parent d1520ca
commit fcd2c9c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/main/java/biblivre/cataloging/RecordAttachmentDTO.java b/src/main/java/biblivre/cataloging/RecordAttachmentDTO.java
@@ -24,6 +24,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 
 @Setter
@@ -37,6 +38,20 @@ public class RecordAttachmentDTO extends AbstractDTO {
     private String path;
     private String uri;
 
+    public void normalizeFileAndName() {
+        if (StringUtils.isBlank(file)) {
+            file = name;
+        }
+
+        if (StringUtils.isBlank(file)) {
+            file = uri;
+        }
+
+        if (StringUtils.isBlank(name)) {
+            name = file;
+        }
+    }
+
     @Override
     public JSONObject toJSONObject() {
         JSONObject json = new JSONObject();

diff --git a/src/main/java/biblivre/marc/MarcDataReader.java b/src/main/java/biblivre/marc/MarcDataReader.java
@@ -98,12 +98,18 @@ public List<RecordAttachmentDTO> getAttachments() {
 
         return fields.stream()
                 .map(
-                        field ->
-                                new RecordAttachmentDTO(
-                                        getFirstSubfieldData(field, 'f'),
-                                        getFirstSubfieldData(field, 'y'),
-                                        getFirstSubfieldData(field, 'd'),
-                                        getFirstSubfieldData(field, 'u')))
+                        field -> {
+                            RecordAttachmentDTO recordAttachmentDTO =
+                                    new RecordAttachmentDTO(
+                                            getFirstSubfieldData(field, 'f'),
+                                            getFirstSubfieldData(field, 'y'),
+                                            getFirstSubfieldData(field, 'd'),
+                                            getFirstSubfieldData(field, 'u'));
+
+                            recordAttachmentDTO.normalizeFileAndName();
+
+                            return recordAttachmentDTO;
+                        })
                 .toList();
     }