Merge pull request #169 from SciCatProject/tranche-1-instrument-fixes

nitrosx · web-flow · commit 544c83ab1a63 · 2025-05-28T15:59:05.000+02:00
latest bug fixes from configuring tranche 1 instruments
diff --git a/src/scicat_metadata.py b/src/scicat_metadata.py
@@ -160,7 +160,7 @@ def render_variable_value(var_value: Any, variable_registry: dict) -> str:
             "<" + reg_var_name + ">", str(reg_var_value)
         )
 
-    if "<" in var_value and ">" in var_value:
+    if "<" in output_value and ">" in output_value:
         raise Exception(f"Unresolved variable: {var_value}")
 
     output_value = (
diff --git a/src/scicat_offline_ingestor.py b/src/scicat_offline_ingestor.py
@@ -131,6 +131,7 @@ def main() -> None:
 
     # Collect all metadata schema configurations
     schemas = collect_schemas(config.ingestion.schemas_directory)
+    logger.info("Found %s schemas", len(schemas))
 
     with handle_exceptions(logger):
         nexus_file_path = Path(config.nexus_file)

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ def render_variable_value(var_value: Any, variable_registry: dict) -> str:`
`160`	`160`	`"<" + reg_var_name + ">", str(reg_var_value)`
`161`	`161`	`)`
`162`	`162`
`163`		`- if "<" in var_value and ">" in var_value:`
	`163`	`+ if "<" in output_value and ">" in output_value:`
`164`	`164`	`raise Exception(f"Unresolved variable: {var_value}")`
`165`	`165`
`166`	`166`	`output_value = (`