Fixed administrative metadata by also taking rightsMD, techMD and sou…

…rceMD into account #118
keeps · Jun 16, 2023 · b0a33e8 · b0a33e8
1 parent c098058
commit b0a33e8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/...r/component/administritiveMetadataComponent/AdministritiveMetadataComponentValidator.java b/...r/component/administritiveMetadataComponent/AdministritiveMetadataComponentValidator.java
@@ -369,7 +369,12 @@ private ReporterDetails validateCSIP31(final StructureValidatorState structureVa
           metadataFiles = metadataFiles.entrySet().stream().filter(entry -> !entry.getKey().contains("/descriptive/"))
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
           for (AmdSecType amd : metsValidatorState.getMets().getAmdSec()) {
-            for (MdSecType md : amd.getDigiprovMD()) {
+            final List<MdSecType> allMdSecTypes = new ArrayList<>();
+            allMdSecTypes.addAll(amd.getDigiprovMD());
+            allMdSecTypes.addAll(amd.getRightsMD());
+            allMdSecTypes.addAll(amd.getTechMD());
+            allMdSecTypes.addAll(amd.getSourceMD());
+            for (MdSecType md : allMdSecTypes) {
               final MdSecType.MdRef mdRef = md.getMdRef();
               if (mdRef != null && mdRef.getHref() != null) {
                 final String hrefDecoded = URLDecoder.decode(mdRef.getHref(), UTF_8);

diff --git a/...lidator/component/descriptiveMetadataComponent/DescriptiveMetadataComponentValidator.java b/...lidator/component/descriptiveMetadataComponent/DescriptiveMetadataComponentValidator.java
@@ -252,7 +252,12 @@ private ReporterDetails validateCSIP17(final StructureValidatorState structureVa
           }
           if (metadataFiles.containsValue(false)) {
             for (AmdSecType amd : mets.getAmdSec()) {
-              for (MdSecType md : amd.getDigiprovMD()) {
+              final List<MdSecType> allMdSecTypes = new ArrayList<>();
+              allMdSecTypes.addAll(amd.getDigiprovMD());
+              allMdSecTypes.addAll(amd.getRightsMD());
+              allMdSecTypes.addAll(amd.getTechMD());
+              allMdSecTypes.addAll(amd.getSourceMD());
+              for (MdSecType md : allMdSecTypes) {
                 final MdSecType.MdRef mdRef = md.getMdRef();
                 if (mdRef != null && mdRef.getHref() != null) {
                   final String hrefDecoded = URLDecoder.decode(mdRef.getHref(), ENCODING_UTF_8);

diff --git a/...mmons_ip2/validator/component/structuralMapComponent/StructuralMapComponentValidator.java b/...mmons_ip2/validator/component/structuralMapComponent/StructuralMapComponentValidator.java
@@ -774,8 +774,12 @@ private ReporterDetails validateCSIP91(final MetsValidatorState metsValidatorSta
     final List<String> amdSecIDs = new ArrayList<>();
     if (amdSec != null && !amdSec.isEmpty()) {
       for (AmdSecType amdSecType : amdSec) {
-        final List<MdSecType> digiProv = amdSecType.getDigiprovMD();
-        for (MdSecType mdSecType : digiProv) {
+        final List<MdSecType> allMDS = new ArrayList<>();
+        allMDS.addAll(amdSecType.getDigiprovMD());
+        allMDS.addAll(amdSecType.getRightsMD());
+        allMDS.addAll(amdSecType.getTechMD());
+        allMDS.addAll(amdSecType.getSourceMD());
+        for (MdSecType mdSecType : allMDS) {
           amdSecIDs.add(mdSecType.getID());
         }
       }