Fix update_refs with fragments

opengeospatial · Sep 4, 2023 · 5fb209e · 5fb209e
1 parent acffe86
commit 5fb209e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ogc/bblocks/entrypoint.py b/ogc/bblocks/entrypoint.py
@@ -129,6 +129,8 @@
     if bb_config_file and bb_config_file.is_file():
         bb_config = load_yaml(filename=bb_config_file)
         id_prefix = bb_config.get('identifier-prefix', id_prefix)
+        if id_prefix and id_prefix[-1] != '.':
+            id_prefix += '.'
         subdirs = id_prefix.split('.')[1:]
         schema_mapping_config = bb_config.get('schema-mapping', {})
 

diff --git a/ogc/bblocks/util.py b/ogc/bblocks/util.py
@@ -459,7 +459,7 @@ def annotate_schema(bblock: BuildingBlock,
     result.append(annotated_schema_fn)
 
     # JSON
-    update_refs(annotated_schema, lambda s: re.sub(r'\.yaml$', '.json', s))
+    update_refs(annotated_schema, lambda s: re.sub(r'\.yaml(#.*)?$', r'.json\1', s))
     annotated_schema_json_fn = annotated_schema_fn.with_suffix('.json')
     with open(annotated_schema_json_fn, 'w') as f:
         json.dump(annotated_schema, f, indent=2)