FM documents now use the identification as the key, and refer to the doc info instead of doc reference

This commit is contained in:
Dion Moult
2022-10-27 09:46:11 +11:00
parent 65288eac04
commit 706b925f4c
+7 -8
View File
@@ -325,17 +325,16 @@ class Parser:
if element.is_a("IfcDocumentInformation"): if element.is_a("IfcDocumentInformation"):
continue continue
for related_object in rel.RelatedObjects: for related_object in rel.RelatedObjects:
name = element.Name
worksheet_row = related_object.Name worksheet_row = related_object.Name
if ifc.schema == "IFC2X3": if ifc.schema == "IFC2X3":
submittal_id = element.ItemReference
referenced_document = element.ReferenceToDocument[0] referenced_document = element.ReferenceToDocument[0]
identification = referenced_document.ItemReference
author_date = None author_date = None
if referenced_document.CreationTime: if referenced_document.CreationTime:
author_date = ifcopenshell.util.date.ifc2datetime(referenced_document.CreationTime).isoformat() author_date = ifcopenshell.util.date.ifc2datetime(referenced_document.CreationTime).isoformat()
else: else:
submittal_id = element.Identification
referenced_document = element.ReferencedDocument referenced_document = element.ReferencedDocument
identification = referenced_document.Identification
author_date = referenced_document.CreationTime author_date = referenced_document.CreationTime
worksheet_name = None worksheet_name = None
@@ -344,17 +343,17 @@ class Parser:
elif related_object.is_a("IfcTypeObject"): elif related_object.is_a("IfcTypeObject"):
worksheet_name = "Type" worksheet_name = "Type"
self.documents[element.Name + worksheet_name + worksheet_row] = { self.documents[identification + worksheet_name + worksheet_row] = {
"Name": name, "Name": identification,
"AuthorOrganizationName": referenced_document.DocumentOwner.Name, "AuthorOrganizationName": referenced_document.DocumentOwner.Name,
"AuthorDate": author_date, "AuthorDate": author_date,
"Category": referenced_document.Purpose, "Category": referenced_document.Purpose,
"WorksheetName": worksheet_name, "WorksheetName": worksheet_name,
"WorksheetRow": worksheet_row, "WorksheetRow": worksheet_row,
"Revision": referenced_document.Revision, "Revision": referenced_document.Revision,
"Location": referenced_document.Name, "Location": referenced_document.Location,
"Description": referenced_document.Description, "Description": referenced_document.Name,
"SpecificationSection": None, "SpecificationSection": None,
"SubmittalID": submittal_id, "SubmittalID": None,
"SourceURL": None, "SourceURL": None,
} }