Merge pull request #67 from statisticssweden/fix/misc-corrections

Fixes for misc problems found when using generating file for SCB:s database
statisticssweden · Nov 30, 2023 · 6dbbc68 · 6dbbc68
2 parents 24aa2c8 + bbf7897
commit 6dbbc68
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/Px.Dcat/DataClasses/Catalog.cs b/Px.Dcat/DataClasses/Catalog.cs
@@ -10,5 +10,6 @@ public class Catalog
         public List<string> Languages;
         public List<Dataset> Datasets;
         public Organization Publisher;
+        public string Refrence { get; set; }
     }
 }
diff --git a/Px.Dcat/DataCollector.cs b/Px.Dcat/DataCollector.cs
@@ -975,6 +975,7 @@ private Catalog getCatalog()
             c.License = _settings.License;
             c.Datasets = getDatasets();
             c.Languages = convertLanguages(_settings.Languages);
+            c.Refrence = _settings.BaseUri;
             setPublisher();
             setOrganizationResources();
             setProducers(c.Datasets);

diff --git a/Px.Dcat/DcatWriter.cs b/Px.Dcat/DcatWriter.cs
@@ -38,6 +38,7 @@ private static void WriteToFile(Catalog c, List<Organization> orgs, List<Contact
             _nsm.AddNamespace("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
             _nsm.AddNamespace("dcat", "http://www.w3.org/ns/dcat#");
             _nsm.AddNamespace("foaf", "http://xmlns.com/foaf/0.1/");
+            _nsm.AddNamespace("vcard", "http://www.w3.org/2006/vcard/ns#");
 
             XmlDeclaration declaration = _doc.CreateXmlDeclaration("1.0", "utf-8", null);
             _doc.AppendChild(declaration);
@@ -143,7 +144,7 @@ private static XmlAttribute createAttr(string ns, string tagName, string value)
         /// <returns>XmlElement</returns>
         public static XmlElement generateCatalog(Catalog c)
         {
-            XmlElement catElem = createElem("dcat", "catalog");
+            XmlElement catElem = createElem("dcat", "Catalog", "rdf", "about", c.Refrence);
 
             // languages
             foreach (string lang in c.Languages)
@@ -184,7 +185,7 @@ public static XmlElement generateCatalog(Catalog c)
             // Dataset references
             foreach (Dataset d in c.Datasets)
             {
-                XmlElement dElem = createElem("dcat", "Dataset", "rdf", "resource", d.Resource);
+                XmlElement dElem = createElem("dcat", "dataset", "rdf", "resource", d.Resource);
                 catElem.AppendChild(dElem);
             }
             return catElem;
@@ -341,19 +342,19 @@ public static XmlElement generateContact(ContactPerson cp)
 
             // Email
             string trimmedEmail = cp.Email.Replace(" ", "");
-            XmlElement emailElem = createElem("vcard", "hasEmail", "rdf", "Resource", "mailto:" + trimmedEmail);
+            XmlElement emailElem = createElem("vcard", "hasEmail", "rdf", "resource", "mailto:" + trimmedEmail);
             individual.AppendChild(emailElem);
 
             // Phone
-            XmlElement phoneElem = createElem("vcard", "hasTelephone");
-            XmlElement descElem = createElem("dcterms", "description");
+            //XmlElement phoneElem = createElem("vcard", "hasTelephone");
+            //XmlElement descElem = createElem("dcterms", "description");
 
-            string phone = "tel:" + cp.Phone.Replace(" ", "");
-            XmlElement phoneVal = createElem("vcard", "hasValue", "rdf", "Resource", phone);
+            //string phone = "tel:" + cp.Phone.Replace(" ", "");
+            //XmlElement phoneVal = createElem("vcard", "hasValue", "rdf", "Resource", phone);
 
-            phoneElem.AppendChild(descElem);
-            descElem.AppendChild(phoneVal);
-            individual.AppendChild(phoneElem);
+            //phoneElem.AppendChild(descElem);
+            //descElem.AppendChild(phoneVal);
+            //individual.AppendChild(phoneElem);
 
             return individual;
         }