From 7fb6a8896d49aaa11545cd8db0c6cfa7050266e1 Mon Sep 17 00:00:00 2001 From: Jonathan Yu Date: Fri, 3 Jun 2022 13:13:14 +1000 Subject: [PATCH 1/2] minor change to scan nc variables for prefix lists --- lib/bald/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/bald/__init__.py b/lib/bald/__init__.py index 59b6779..4659815 100644 --- a/lib/bald/__init__.py +++ b/lib/bald/__init__.py @@ -823,12 +823,12 @@ def _prefixes_and_aliases(fhandle, identity, alias_dict, prefix_contexts, cache) prefixes = {} skipped_variables = [] - for prefix_group in prefix_groups: - if prefix_group != {}: - prefixes = (dict([(prefix, getattr(prefix_group, prefix)) for - prefix in prefix_group.ncattrs() if prefix.endswith('__')])) - if isinstance(prefix_group, netCDF4._netCDF4.Variable): - skipped_variables.append(prefix_var.name) + for prefix_obj in prefix_groups: + if prefix_obj != {}: + prefixes = (dict([(prefix, getattr(prefix_obj, prefix)) for + prefix in prefix_obj.ncattrs() if prefix.endswith('__')])) + if isinstance(prefix_obj, netCDF4._netCDF4.Variable): + skipped_variables.append(prefix_obj.name) # else: # for k in fhandle.ncattrs(): # if k.endswith('__'): @@ -1085,6 +1085,8 @@ def _load_netcdf_group_vars(fhandle, agroup, root_container, baseuri, identity_p response = cache['https://www.opengis.net/def/binary-array-ld'] reference_graph.parse(data=response.text, format='n3') + #reference_graph.parse(data=response.text, format='turtle') + # # reference_graph.parse('https://www.opengis.net/def/binary-array-ld') # qstr = ('prefix bald: ' From 055d0545115c33e0b2c206d31a78b7a0fc3373c3 Mon Sep 17 00:00:00 2001 From: Jonathan Yu Date: Fri, 3 Jun 2022 10:13:04 +1000 Subject: [PATCH 2/2] initial changes to bald to allow variables handling --- lib/bald/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bald/__init__.py b/lib/bald/__init__.py index 4659815..d3a2186 100644 --- a/lib/bald/__init__.py +++ b/lib/bald/__init__.py @@ -818,6 +818,8 @@ def _prefixes_and_aliases(fhandle, identity, alias_dict, prefix_contexts, cache) for pid in prefix_ids.split(' '): if pid in fhandle.groups: prefix_groups.append(fhandle.groups[pid]) + elif pid in fhandle.variables: + prefix_groups.append(fhandle.variables[pid]) elif pid.startswith('http://') or pid.startswith('https://'): prefix_urls.append(pid) prefixes = {}