From 33c1f5a2af726277785db316a1f14c3cdcc54124 Mon Sep 17 00:00:00 2001 From: "Francesca.L.Bleken@sintef.no" Date: Mon, 3 Nov 2025 11:08:51 +0100 Subject: [PATCH 1/3] Added test that fail and some pritn statements that show error --- tests/datadoc/test_dataset.py | 6 ++++++ tripper/datadoc/dataset.py | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/datadoc/test_dataset.py b/tests/datadoc/test_dataset.py index 642ffcf4..121f4cbe 100644 --- a/tests/datadoc/test_dataset.py +++ b/tests/datadoc/test_dataset.py @@ -397,6 +397,7 @@ def test_datadoc(): # Test load dict-representation of a dataset from the triplestore SEM = ts.namespaces["sem"] SEMDATA = ts.namespaces["semdata"] + ts.bind("par", "http://sintef.no/dlite/parser#") iri = SEMDATA["SEM_cement_batch2/77600-23-001/77600-23-001_5kV_400x_m001"] d = acquire(ts, iri, use_sparql=False) assert d["@id"] == iri @@ -528,6 +529,11 @@ def test_datadoc(): SEMDATA.SEM_cement_batch2, ] + # Search on criterion when the value is an individual + assert search(ts, criteria={"distribution.parser": "par:Hitachi"}) == [ + SEMDATA["SEM_cement_batch2/77600-23-001/77600-23-001_5kV_400x_m001"], + ] + title = "Nested series of SEM images of cement batch2" dset = [SEMDATA.SEM_cement_batch2] # Search with predefined keyword diff --git a/tripper/datadoc/dataset.py b/tripper/datadoc/dataset.py index c82938ab..628adf19 100644 --- a/tripper/datadoc/dataset.py +++ b/tripper/datadoc/dataset.py @@ -1213,7 +1213,7 @@ def make_query( context = get_context(keywords=keywords) context._create_caches() # pylint: disable=protected-access expanded = context._expanded # pylint: disable=protected-access - + print("expanded", expanded) # Add prefixes to triplestore ts.namespaces.update(keywords.get_prefixes()) @@ -1253,6 +1253,8 @@ def add_crit(k, v, regex=False, s="iri"): """Add criteria to SPARQL query.""" nonlocal n key = f"@{k[1:]}" if k.startswith("_") else k + print("key", key) + print("value", v) if isinstance(v, list): for ele in v: add_crit(key, ele, regex=regex, s=s) @@ -1305,6 +1307,10 @@ def add_crit(k, v, regex=False, s="iri"): {where_statements} }} """ + print("---") + print(query) + print("---") + return query From 71fd1228a6a640359ef5e636c2b9b0dd8af632fa Mon Sep 17 00:00:00 2001 From: "Francesca.L.Bleken@sintef.no" Date: Tue, 4 Nov 2025 09:08:13 +0100 Subject: [PATCH 2/3] Hack to get a commit that works for alcopop release, while waiting for proper fix --- tripper/datadoc/dataset.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tripper/datadoc/dataset.py b/tripper/datadoc/dataset.py index 628adf19..d811715f 100644 --- a/tripper/datadoc/dataset.py +++ b/tripper/datadoc/dataset.py @@ -1213,7 +1213,7 @@ def make_query( context = get_context(keywords=keywords) context._create_caches() # pylint: disable=protected-access expanded = context._expanded # pylint: disable=protected-access - print("expanded", expanded) + #print("expanded", expanded) # Add prefixes to triplestore ts.namespaces.update(keywords.get_prefixes()) @@ -1253,8 +1253,8 @@ def add_crit(k, v, regex=False, s="iri"): """Add criteria to SPARQL query.""" nonlocal n key = f"@{k[1:]}" if k.startswith("_") else k - print("key", key) - print("value", v) + #print("key", key) + #print("value", v) if isinstance(v, list): for ele in v: add_crit(key, ele, regex=regex, s=s) @@ -1288,7 +1288,7 @@ def add_crit(k, v, regex=False, s="iri"): f"FILTER REGEX(STR(?{var}), {value}{flags_arg}) ." ) else: - filters.append(f"FILTER(STR(?{var}) = {value}) .") + filters.append(f"FILTER(?{var} = {value}) .") for k, v in criteria.items(): add_crit(k, v) @@ -1307,9 +1307,9 @@ def add_crit(k, v, regex=False, s="iri"): {where_statements} }} """ - print("---") - print(query) - print("---") + #print("---") + #print(query) + #print("---") return query From eb2493f49517e1257f69411d2531b1a097864348 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Nov 2025 08:08:59 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit hooks For more information, see https://pre-commit.ci --- tripper/datadoc/dataset.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tripper/datadoc/dataset.py b/tripper/datadoc/dataset.py index d811715f..ac2000af 100644 --- a/tripper/datadoc/dataset.py +++ b/tripper/datadoc/dataset.py @@ -1213,7 +1213,7 @@ def make_query( context = get_context(keywords=keywords) context._create_caches() # pylint: disable=protected-access expanded = context._expanded # pylint: disable=protected-access - #print("expanded", expanded) + # print("expanded", expanded) # Add prefixes to triplestore ts.namespaces.update(keywords.get_prefixes()) @@ -1253,8 +1253,8 @@ def add_crit(k, v, regex=False, s="iri"): """Add criteria to SPARQL query.""" nonlocal n key = f"@{k[1:]}" if k.startswith("_") else k - #print("key", key) - #print("value", v) + # print("key", key) + # print("value", v) if isinstance(v, list): for ele in v: add_crit(key, ele, regex=regex, s=s) @@ -1307,9 +1307,9 @@ def add_crit(k, v, regex=False, s="iri"): {where_statements} }} """ - #print("---") - #print(query) - #print("---") + # print("---") + # print(query) + # print("---") return query