Merge pull request #2254 from BEXIS2/rc

Rc

Author: DavidBlaa

Components/XML/BExIS.Xml.Helpers/BExIS.Xml.Helpers.csproj

@@ -71,6 +71,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DatasetStore.cs" />
+    <Compile Include="Extensions\XmlExtensions.cs" />
     <Compile Include="Mapping\XmlMapperManager.cs" />
     <Compile Include="Mapping\XmlSchemaManager.cs" />
     <Compile Include="ExtensionStore.cs" />

Components/XML/BExIS.Xml.Helpers/Extensions/XmlExtensions.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Xml;
+
+namespace BExIS.Xml.Helpers.Extensions
+{
+    public static class XmlExtensions
+    {
+        public static void TransformXmlToMatchClassTypes(XmlNode node, Type classType)
+        {
+            foreach (XmlNode childNode in node.ChildNodes)
+            {
+                string propertyName = childNode.Name;
+                PropertyInfo propertyInfo = classType.GetProperty(propertyName, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance);
+
+                if (propertyInfo != null)
+                {
+                    // If it's a list or array type, ensure the XML node appropriately reflects that
+                    if (propertyInfo.PropertyType.IsGenericType && propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(List<>))
+                    {
+                        Type itemType = propertyInfo.PropertyType.GetGenericArguments()[0];
+
+                        foreach (XmlNode listItem in childNode.ChildNodes)
+                        {
+                            // Recursively transform the XML node to match the item type of the collection
+                            TransformXmlToMatchClassTypes(listItem, itemType);
+                        }
+                    }
+                    else if (childNode.HasChildNodes)
+                    {
+                        TransformXmlToMatchClassTypes(childNode, propertyInfo.PropertyType);
+                    }
+                }
+                else
+                {
+                    // Handle cases where the property is not found in the class type
+                    Console.WriteLine($"Property '{propertyName}' not found in '{classType.Name}'.");
+                }
+            }
+        }
+    }
+}

Modules/DIM/BExIS.Dim.Helper/Export/GBIFDataRepoConverter.cs

@@ -15,6 +15,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -98,11 +99,11 @@ public string Convert(long datasetVersionId)
                     {
                         // generate metadata
                         string metadataFilePath = helper.GenerateResourceMetadata(concept.Id, metadatastructureId, datasetversion.Metadata, folder, xsdPath);
-                        if (File.Exists(metadataFilePath)) archive.AddFileToArchive(metadataFilePath, "");
+                        if (File.Exists(metadataFilePath)) archive.AddFileToArchive(metadataFilePath, Path.GetFileName(metadataFilePath));
 
                         // get data
                         string datapath = helper.GenerateData(id, versionId);
-                        if (File.Exists(datapath)) archive.AddFileToArchive(datapath, "");
+                        if (File.Exists(datapath)) archive.AddFileToArchive(datapath, Path.GetFileName(datapath));
 
                         // has links to extentions? (IsDwcEventOf,IsDwcHumboltExtensionOf, IsEwcEMofExtensionOf)
                         // has links?
@@ -126,14 +127,14 @@ public string Convert(long datasetVersionId)
                                     var extention = helper.GetExtention(r.ReferenceType);
 
                                     extentions.Add(new ExtentionEntity() { IdIndex = 0, Version = r.SourceVersion, StructureId = structureId, Extention = extention, dataPath = Path.GetFileName(rPath) });
-                                    archive.AddFileToArchive(rPath, "");
+                                    archive.AddFileToArchive(rPath, Path.GetFileName(rPath));
                                 }
                             }
                         }
 
                         // generate meta file
                         string metaFilePath = helper.GenerateMeta(_type, dataset.DataStructure.Id, folder, Path.GetFileName(datapath), extentions);
-                        if (File.Exists(metaFilePath)) archive.AddFileToArchive(metaFilePath, "");
+                        if (File.Exists(metaFilePath)) archive.AddFileToArchive(metaFilePath, Path.GetFileName(metaFilePath));
                     }
 
                     return zipfilepath;