diff --git a/etl/pdfReader/sitenotes.py b/etl/pdfReader/sitenotes.py index 8ab31dd..d10f20a 100644 --- a/etl/pdfReader/sitenotes.py +++ b/etl/pdfReader/sitenotes.py @@ -162,22 +162,22 @@ class QuidosSiteNotes(SiteNotes): else: self.main_property_age_band = None - if self.extension_1: + if self.extension_1 and "Extension 1" in data: self.extension_1_age_band = get_value("Extension 1") else: self.extension_1_age_band = None - if self.extension_2: + if self.extension_2 and "Extension 2" in data: self.extension_2_age_band = get_value("Extension 2") else: self.extension_2_age_band = None - if self.extension_3: + if self.extension_3 and "Extension 3" in data: self.extension_3_age_band = get_value("Extension 3") else: self.extension_3_age_band = None - if self.extension_4: + if self.extension_4 and "Extension 4 " in data: self.extension_4_age_band = get_value("Extension 4") else: self.extension_4_age_band = None @@ -216,28 +216,28 @@ class QuidosSiteNotes(SiteNotes): allNumbers.append(details) return allNumbers - if self.main_property: + if self.main_property and "Main Property" in data: self.main_property_dimensions = create_dimensions_array("Main Property", int(self.main_property)) else: self.main_property_dimensions = None - if self.extension_1: - self.extension_1_dimensions = create_dimensions_array("Extension 1", int(self.extension_1)) + if self.extension_1 and "Extension 1 Property" in data: + self.extension_1_dimensions = create_dimensions_array("Extension 1 Property", int(self.extension_1)) else: self.extensions_1_dimensions = None - if self.extension_2: - self.extension_2_dimensions = create_dimensions_array("Extension 2", int(self.extension_2)) + if self.extension_2 and "Extension 2 Property" in data: + self.extension_2_dimensions = create_dimensions_array("Extension 2 Property", int(self.extension_2)) else: self.extension_2_dimensions = None - if self.extension_3: - self.extension_3_dimensions = create_dimensions_array("Extension 3", int(self.extension_3)) + if self.extension_3 and "Extension 3 Property" in data: + self.extension_3_dimensions = create_dimensions_array("Extension 3 Property", int(self.extension_3)) else: self.extension_3_dimensions = None - if self.extension_4: - self.extension_4_dimensions = create_dimensions_array("Extension 4", int(self.extension_4)) + if self.extension_4 and "Extension 4 Property" in data: + self.extension_4_dimensions = create_dimensions_array("Extension 4 Property", int(self.extension_4)) else: self.extension_4_dimensions = None