Merge pull request hed-standard#991 from IanCa/develop

Fix crash in unmerged schema validation.
IanCa · Jul 25, 2024 · e0d4a21 · e0d4a21
2 parents 763e0fb + 0a2056c
commit e0d4a21
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/hed/schema/schema_attribute_validator_hed_id.py b/hed/schema/schema_attribute_validator_hed_id.py
@@ -35,8 +35,11 @@ def __init__(self, hed_schema):
         # Add the standard schema if we have a with_standard
         if "" not in prev_versions and self.hed_schema.with_standard:
             prev_version = self._get_previous_version(self.hed_schema.with_standard, "")
-            prev_versions[""] = prev_version
-            self.library_data[""] = get_library_data("")
+            if prev_version:
+                prev_versions[""] = prev_version
+            library_data = get_library_data("")
+            if library_data:
+                self.library_data[""] = get_library_data("")
 
         if prev_versions:
             self._previous_schemas = {library: load_schema_version(full_version) for library, full_version in

diff --git a/hed/schema/schema_io/base2schema.py b/hed/schema/schema_io/base2schema.py
@@ -107,7 +107,8 @@ def _load(self):
         """
         self._loading_merged = True
         # Do a full load of the standard schema if this is a partnered schema
-        if not self.appending_to_schema and self._schema.with_standard and not self._schema.merged:
+        # todo: this could simply cache the schema, rather than a full load, if it's not a merged schema.
+        if not self.appending_to_schema and self._schema.with_standard:
             from hed.schema.hed_schema_io import load_schema_version
             saved_attr = self._schema.header_attributes
             saved_format = self._schema.source_format
@@ -117,13 +118,14 @@ def _load(self):
                 raise HedFileError(HedExceptions.BAD_WITH_STANDARD,
                                    message=f"Cannot load withStandard schema '{self._schema.with_standard}'",
                                    filename=e.filename)
-            # Copy the non-alterable cached schema
-            self._schema = copy.deepcopy(base_version)
-            self._schema.filename = self.filename
-            self._schema.name = self.name  # Manually set name here as we don't want to pass it to load_schema_version
-            self._schema.header_attributes = saved_attr
-            self._schema.source_format = saved_format
-            self._loading_merged = False
+            if not self._schema.merged:
+                # Copy the non-alterable cached schema
+                self._schema = copy.deepcopy(base_version)
+                self._schema.filename = self.filename
+                self._schema.name = self.name  # Manually set name here as we don't want to pass it to load_schema_version
+                self._schema.header_attributes = saved_attr
+                self._schema.source_format = saved_format
+                self._loading_merged = False
 
         self._parse_data()
         self._schema.finalize_dictionaries()