simplified handling of xml namespaces for reading documents

makes code more robust
stephanstapel · Jul 4, 2024 · bd15684 · bd15684
1 parent a656da4
commit bd15684
Show file tree

Hide file tree

Showing 4 changed files with 627 additions and 621 deletions.
diff --git a/ZUGFeRD/IInvoiceDescriptorReader.cs b/ZUGFeRD/IInvoiceDescriptorReader.cs
@@ -59,6 +59,25 @@ public bool IsReadableByThisReaderVersion(string filename)
  } // !IsReadableByThisReaderVersion()
 
 
+ protected XmlNamespaceManager _GenerateNamespaceManagerFromNode(XmlNode node)
+ {
+ XmlNamespaceManager nsmgr = new XmlNamespaceManager(node.OwnerDocument.NameTable); 
+ foreach (XmlAttribute attr in node.Attributes)
+ {
+ if (attr.Prefix == "xmlns")
+ {
+ nsmgr.AddNamespace(attr.LocalName, attr.Value);
+ }
+ else if (attr.Name == "xmlns")
+ {
+ nsmgr.AddNamespace(string.Empty, attr.Value);
+ }
+ }
+
+ return nsmgr;
+ } // !_GenerateNamespaceManagerFromNode()
+
+
  protected static bool _nodeAsBool(XmlNode node, string xpath, XmlNamespaceManager nsmgr = null, bool defaultValue = true)
  {
  if (node == null)

diff --git a/ZUGFeRD/InvoiceDescriptor1Reader.cs b/ZUGFeRD/InvoiceDescriptor1Reader.cs
@@ -45,10 +45,7 @@ public override InvoiceDescriptor Load(Stream stream)
 
  XmlDocument doc = new XmlDocument();
  doc.Load(stream);
- XmlNamespaceManager nsmgr = new XmlNamespaceManager(doc.DocumentElement.OwnerDocument.NameTable);
- nsmgr.AddNamespace("rsm", "urn:ferd:CrossIndustryDocument:invoice:1p0");
- nsmgr.AddNamespace("ram", "urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:12");
- nsmgr.AddNamespace("udt", "urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15");
+ XmlNamespaceManager nsmgr = _GenerateNamespaceManagerFromNode(doc.DocumentElement);
 
  InvoiceDescriptor retval = new InvoiceDescriptor
  {

diff --git a/ZUGFeRD/InvoiceDescriptor20Reader.cs b/ZUGFeRD/InvoiceDescriptor20Reader.cs
@@ -46,12 +46,7 @@ public override InvoiceDescriptor Load(Stream stream)
 
  XmlDocument doc = new XmlDocument();
  doc.Load(stream);
- XmlNamespaceManager nsmgr = new XmlNamespaceManager(doc.DocumentElement.OwnerDocument.NameTable);
- nsmgr.AddNamespace("qdt", "urn:un:unece:uncefact:data:standard:QualifiedDataType:100");
- nsmgr.AddNamespace("a", "urn:un:unece:uncefact:data:standard:QualifiedDataType:100");
- nsmgr.AddNamespace("rsm", "urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100");
- nsmgr.AddNamespace("ram", "urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100");
- nsmgr.AddNamespace("udt", "urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100");
+ XmlNamespaceManager nsmgr = _GenerateNamespaceManagerFromNode(doc.DocumentElement);
 
  InvoiceDescriptor retval = new InvoiceDescriptor
  {