Skip to content

Added test that fail and some pritn statements that show error #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
francescalb wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Added test that fail and some pritn statements that show error #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33c1f5a
Added test that fail and some pritn statements that show error
francescalb Nov 3, 2025
71fd122
Hack to get a commit that works for alcopop release, while waiting fo…
francescalb Nov 4, 2025
eb2493f
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Nov 4, 2025
358cc18
Merge branch 'master' into issue458
jesper-friis Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/datadoc/test_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,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
Expand Down Expand Up @@ -886,6 +887,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
Expand Down
10 changes: 8 additions & 2 deletions tripper/datadoc/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,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())

Expand Down Expand Up @@ -1506,6 +1506,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)
Expand Down Expand Up @@ -1539,7 +1541,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)
Expand All @@ -1558,6 +1560,10 @@ def add_crit(k, v, regex=False, s="iri"):
{where_statements}
}}
"""
# print("---")
# print(query)
# print("---")

return query


Expand Down
Loading