Skip to content

Commit 0453d7b

Browse files
committed
SciDataLib-79 Code does not recognize ontological value
reworked example 2 on ruff data
1 parent f2f09e3 commit 0453d7b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

examples/example2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
def convert_rruff():
88
""" load and process rruff file """
9-
f = open("tests/data/rruff/raman_soddyite.rruff", "r")
9+
f = open("../tests/data/rruff/raman_soddyite.rruff", "r")
1010
lines = f.read().splitlines()
1111
rruff, seriesx, seriesy = {}, [], []
1212
for line in lines:
@@ -179,7 +179,7 @@ def convert_rruff():
179179
'relating to the database and software, ',
180180
'nor in any copy of any part of the database and software.'
181181
)
182-
example2.rights(holder, lic)
182+
example2.rights([{'holder': holder, 'license': lic}])
183183

184184
print(json.dumps(example2.output, indent=4))
185185
exit()

tests/io/test_rruff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def test_read_rruff(raman_soddyite_file):
3737
assert "RRUFF" in graph["sources"][1]["citation"]
3838
assert graph["sources"][1]["url"] == "https://rruff.info/R060361"
3939

40-
assert graph["scidata"]["discipline"] == "w3i:Chemistry"
41-
assert graph["scidata"]["subdiscipline"] == "w3i:AnalyticalChemistry"
40+
assert graph["scidata"]["discipline#"] == "w3i:Chemistry"
41+
assert graph["scidata"]["subdiscipline#"] == "w3i:AnalyticalChemistry"
4242

4343
# Check description has all the keywords from RRUFF file
4444
description = graph.get("description")

0 commit comments

Comments
 (0)