diff --git a/tableaudocumentapi/datasource.py b/tableaudocumentapi/datasource.py
index 0fdc3fb..7e3c2af 100644
--- a/tableaudocumentapi/datasource.py
+++ b/tableaudocumentapi/datasource.py
@@ -4,6 +4,7 @@
#
###############################################################################
import collections
+import itertools
import xml.etree.ElementTree as ET
import xml.sax.saxutils as sax
import zipfile
@@ -178,16 +179,17 @@ def fields(self):
return self._fields
def _get_all_fields(self):
- column_objects = [_column_object_from_column_xml(self._datasourceTree, xml)
- for xml in self._datasourceTree.findall('.//column')]
- existing_fields = [x.id for x in column_objects]
- metadata_fields = (x.text
- for x in self._datasourceTree.findall(".//metadata-record[@class='column']/local-name"))
-
- missing_fields = (x for x in metadata_fields if x not in existing_fields)
- column_objects.extend((
- _column_object_from_metadata_xml(_get_metadata_xml_for_field(self._datasourceTree, field_name))
- for field_name in missing_fields
- ))
-
- return FieldDictionary({k: v for k, v in column_objects})
+ column_field_objects = self._get_column_objects()
+ existing_column_fields = [x.id for x in column_field_objects]
+ metadata_only_field_objects = (x for x in self._get_metadata_objects() if x.id not in existing_column_fields)
+ field_objects = itertools.chain(column_field_objects, metadata_only_field_objects)
+
+ return FieldDictionary({k: v for k, v in field_objects})
+
+ def _get_metadata_objects(self):
+ return (_column_object_from_metadata_xml(x)
+ for x in self._datasourceTree.findall(".//metadata-record[@class='column']"))
+
+ def _get_column_objects(self):
+ return [_column_object_from_column_xml(self._datasourceTree, xml)
+ for xml in self._datasourceTree.findall('.//column')]
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy