Revert rdf-toolkit-action usage

An issue was discovered with rdf-toolkit being used multiple times in succession on a file, via testing with the CASE-Examples repository. To avoid this issue causing an impact in this repository, the rdf-toolkit action is being reverted. References: * casework/CASE-Examples#75 Signed-off-by: Alex Nelson <[email protected]>
casework · Jun 23, 2022 · ac30faf · ac30faf
1 parent ee567d2
commit ac30faf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,12 +14,6 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-  - repo: https://github.com/kchason/rdf-toolkit-action
-    rev: 0.1.2
-    hooks:
-      - id: rdf-toolkit-normalizer
-        args:
-          - --autofix
   - repo: https://github.com/pycqa/flake8
     rev: 4.0.1
     hooks:

diff --git a/tests/CASE-Examples/examples/illustrations/src/illustration.mk b/tests/CASE-Examples/examples/illustrations/src/illustration.mk
@@ -19,10 +19,10 @@ subjectdir_basename := $(shell basename $$PWD)
 
 qc_srcdir := $(top_srcdir)/dependencies/CASE-Examples-QC
 
-case_srcdir := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/CASE-Utilities-Python/dependencies/CASE
-
 example_srcdir := $(qc_srcdir)/dependencies/CASE-Examples/examples/illustrations/$(subjectdir_basename)
 
+rdf_toolkit_jar := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/UCO-develop/lib/rdf-toolkit.jar
+
 subject_json := $(example_srcdir)/$(subjectdir_basename).json
 
 sparql_files := $(wildcard $(top_srcdir)/case_prov/queries/construct-*.sparql)
@@ -55,8 +55,15 @@ $(subjectdir_basename)-prov.ttl: \
 	  && case_prov_rdf \
 	    --allow-empty-results \
 	    --debug \
-	    _$@ \
+	    __$@ \
 	    $<
+	java -jar $(rdf_toolkit_jar) \
+	  --inline-blank-nodes \
+	  --source __$@ \
+	  --source-format turtle \
+	  --target _$@ \
+	  --target-format turtle
+	rm __$@
 	mv _$@ $@
 
 $(subjectdir_basename)-prov_activities.dot: \

diff --git a/tests/casework.github.io/examples/src/example.mk b/tests/casework.github.io/examples/src/example.mk
@@ -19,10 +19,10 @@ subjectdir_basename := $(shell basename $$PWD)
 
 qc_srcdir := $(top_srcdir)/dependencies/CASE-Examples-QC
 
-case_srcdir := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/CASE-Utilities-Python/dependencies/CASE
-
 example_srcdir := $(qc_srcdir)/dependencies/casework.github.io/examples/$(subjectdir_basename)
 
+rdf_toolkit_jar := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/UCO-develop/lib/rdf-toolkit.jar
+
 subject_json := $(example_srcdir)/$(subjectdir_basename).json
 
 sparql_files := $(wildcard $(top_srcdir)/case_prov/queries/construct-*.sparql)
@@ -54,8 +54,15 @@ $(subjectdir_basename)-prov.ttl: \
 	  && case_prov_rdf \
 	    --allow-empty-results \
 	    --debug \
-	    _$@ \
+	    __$@ \
 	    $<
+	java -jar $(rdf_toolkit_jar) \
+	  --inline-blank-nodes \
+	  --source __$@ \
+	  --source-format turtle \
+	  --target _$@ \
+	  --target-format turtle
+	rm __$@
 	mv _$@ $@
 
 $(subjectdir_basename)-prov-activities.dot: \