#2187 fix issue with choice elements in package

Author: DavidBlaa

Components/DLM/BExIS.Dlm.Services/MetadataStructure/MetadataPackageManager.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Xml;
 using Vaiona.Persistence.Api;
 
 namespace BExIS.Dlm.Services.MetadataStructure
@@ -128,7 +129,7 @@ public MetadataPackage Update(MetadataPackage entity)
 
         #region Associations
 
-        public MetadataAttributeUsage AddMetadataAtributeUsage(MetadataPackage package, MetadataAttribute attribute, string label, string description, int minCardinality, int maxCardinality, string defaultValue, string fixedValue)
+        public MetadataAttributeUsage AddMetadataAtributeUsage(MetadataPackage package, MetadataAttribute attribute, string label, string description, int minCardinality, int maxCardinality, string defaultValue, string fixedValue, XmlDocument extra = null )
         {
             Contract.Requires(package != null && package.Id >= 0);
             Contract.Requires(attribute != null && attribute.Id >= 0);
@@ -166,6 +167,10 @@ select v
                     DefaultValue = defaultValue,
                     FixedValue = fixedValue
                 };
+
+                if (extra != null && !string.IsNullOrEmpty(extra.OuterXml))
+                    usage.Extra = extra;
+
                 package.MetadataAttributeUsages.Add(usage);
                 attribute.UsedIn.Add(usage);
 

Components/XML/BExIS.Xml.Helpers/Mapping/XmlSchemaManager.cs

@@ -1218,12 +1218,38 @@ private void addUsageFromMetadataCompoundAttributeToPackage(MetadataPackage pack
                      *
                      */
 
+                    //if element is a choise
+                    XmlDocument extra = null;
+                    //check if element is a choice
                     if (XmlSchemaUtility.IsChoiceType(element))
                     {
                         min = 0;
+                        Dictionary<string, string> additionalAttributes = new Dictionary<string, string>();
+
+                        XmlSchemaComplexType ct = element.ElementSchemaType as XmlSchemaComplexType;
+
+                        if (ct != null)
+                        {
+                            #region choice
+
+                            // check if it is e choice
+                            XmlSchemaChoice choice = ct.ContentTypeParticle as XmlSchemaChoice;
+                            if (choice != null)
+                            {
+                                additionalAttributes.Add("min", choice.MinOccurs.ToString());
+                                if (choice.MaxOccurs > 10)
+                                    additionalAttributes.Add("max", "10");
+                                else
+                                    additionalAttributes.Add("max", choice.MaxOccurs.ToString());
+                            }
+
+                            #endregion choice
+                        }
+
+                        extra = xmlDatasetHelper.AddReferenceToXml(new XmlDocument(), "choice", "true", "elementType", @"extra/type", additionalAttributes);
                     }
 
-                    metadataPackageManager.AddMetadataAtributeUsage(package, compoundAttribute, element.Name, GetDescription(element.Annotation), min, max, element.DefaultValue, element.FixedValue);
+                    metadataPackageManager.AddMetadataAtributeUsage(package, compoundAttribute, element.Name, GetDescription(element.Annotation), min, max, element.DefaultValue, element.FixedValue, extra);
                 }
             }
             finally

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs

@@ -285,9 +285,9 @@ public void GenerateSeedData()
                 if (!metadataStructureManager.Repo.Get().Any(m => m.Name.Equals("Basic ABCD")))
                 {
                     string titleXPath =
-                        "Metadata/Metadata/MetadataType/Description/DescriptionType/Representation/MetadataDescriptionRepr/Title/TitleType";
+                        "Metadata/Metadata/ContentMetadata/Description/DescriptionXmlSchemaComplexType/Representation/MetadataDescriptionRepr/Title/String255";
                     string descriptionXpath =
-                        "Metadata/Metadata/MetadataType/Description/DescriptionType/Representation/MetadataDescriptionRepr/Details/DetailsType";
+                        "Metadata/Metadata/ContentMetadata/Description/DescriptionXmlSchemaComplexType/Representation/MetadataDescriptionRepr/Details/String";
 
                     ImportSchema("Basic ABCD", "ABCD_2.06.XSD", "DataSet", entity.Name, entity.EntityType.FullName,
                         titleXPath, descriptionXpath);
@@ -297,17 +297,17 @@ public void GenerateSeedData()
 
                 if (!metadataStructureManager.Repo.Get().Any(m => m.Name.Equals("GBIF")))
                 {
-                    string titleXPath = "Metadata/Basic/BasicType/title/titleType";
-                    string descriptionXpath = "Metadata/abstract/abstractType/para/paraType";
+                    string titleXPath = "Metadata/Basic/BasicType/title/i18nString";
+                    string descriptionXpath = "Metadata/abstract/abstractXmlSchemaComplexType/para/paraDatatype_string";
 
                     ImportSchema("GBIF", "eml.xsd", "Dataset", entity.Name, entity.EntityType.FullName, titleXPath,
                         descriptionXpath);
                 }
 
                 if (!metadataStructureManager.Repo.Get().Any(m => m.Name.Equals("Publication")))
                 {
-                    string titleXPath = "Metadata/publication/publicationType/Title/TitleType";
-                    string descriptionXpath = "Metadata/publication/publicationType/Abstract/AbstractType";
+                    string titleXPath = "Metadata/publication/publication/Title/TitleDatatype_string";
+                    string descriptionXpath = "Metadata/publication/publication/Abstract/AbstractXmlSchemaSimpleType";
 
                     ImportSchema("Publication", "BEXIS2-Publication-Schema-draft.xsd", "Metadata", publication.Name, publication.EntityType.FullName, titleXPath, descriptionXpath);
                 }

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/routes/search/+page.svelte

@@ -16,6 +16,5 @@
 	contentLayoutType={pageContentLayoutType.full}
 	{links}
 >
-<h1>eric is cool</h1>
 	<Search {controller} />
 </Page>

Modules/DIM/BExIS.Dim.NH.ORM/Mappings/Default/Mappings/LinkElement.hbm.xml

@@ -23,8 +23,8 @@
       <column name="Name" />
     </property>
 
-    <property name="XPath" type="string">
-      <column name="XPath" />
+    <property name="XPath" type="StringClob">
+      <column name="XPath" sql-type="text" />
     </property>
 
     <property name="IsSequence" type="boolean">

database update scripts/4.0.2-4.1.0.sql

@@ -19,8 +19,6 @@ Set
  where type  in (5,6) and complexity = 1 and xpath !='';
 	*/
 
-BEGIN TRANSACTION;
-
 -- TEXT - string
 update datatypes
 	set 

database update scripts/4.1.0-4.2.0.sql

@@ -0,0 +1,11 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE public.dim_linkelements
+    ALTER COLUMN xpath TYPE text COLLATE pg_catalog."default";
+
+    -- BEXIS2 Version Update
+INSERT INTO public.versions(
+	versionno, extra, module, value, date)
+	VALUES (1, null, 'Shell', '4.2.0',NOW());
+
+commit;