amalgame/commit

FIXED: rdf11:rdf_create_bnode/1 iso rdf_bnode/1

authorJacco van Ossenbruggen
Fri Apr 3 16:15:12 2020 +0200
committerJacco van Ossenbruggen
Fri Apr 3 16:15:12 2020 +0200
commitca4503d4b8922065a89b778025a348b3398862de
treefd90025560f80121b453920ec100f1943013ff2c
parentd1e2abecfb2c67a5594f3912d5472b16ec54d300
Diff style: patch stat
diff --git a/lib/amalgame/ag_provenance.pl b/lib/amalgame/ag_provenance.pl
index 7c4cfb7..6841ed7 100644
--- a/lib/amalgame/ag_provenance.pl
+++ b/lib/amalgame/ag_provenance.pl
@@ -261,7 +261,7 @@ prov_program(Graph, Program)  :-
 	rdf_assert(Program, amalgame:cwd, CWDF, Graph),
 	rdf_assert(Program, amalgame:host, LocalHost^^xsd:string, Graph),
 	forall(member(M-U-V-D, All),
-	       (   rdf_bnode(B),
+	       (   rdf_create_bnode(B),
 	           rdf_assert(Program, amalgame:component, B, Graph),
 		   rdf_assert(B, 'http://usefulinc.com/ns/doap#revision',
 			      V^^xsd:string, Graph),
@@ -291,7 +291,7 @@ prov_person(Graph, Person) :-
 	   ;   UserName = Person
 	   )
 	;
-	 rdf_bnode(Person),
+	 rdf_create_bnode(Person),
 	 UserName = 'anonymous user (not logged in)'
 	),
 	assert(current_prov_uri(Graph, person(Person))),
@@ -305,7 +305,7 @@ prov_association(Agent, Strategy, Graph, Association):-
 	->  rdf_equal(Role, amalgame:user_executing_strategy)
 	;   rdf_equal(Role, amalgame:program_executing_strategy)
 	),
-	rdf_bnode(Association),
+	rdf_create_bnode(Association),
 	rdf_assert(Association, rdf:type, prov:'Association', Graph),
 	rdf_assert(Association, prov:agent, Agent, Graph),
 	rdf_assert(Association, prov:hadPlan, Strategy, Graph),
diff --git a/lib/amalgame/ag_strategy.pl b/lib/amalgame/ag_strategy.pl
index d019b53..0db3984 100644
--- a/lib/amalgame/ag_strategy.pl
+++ b/lib/amalgame/ag_strategy.pl
@@ -109,7 +109,7 @@ strategy_new_process(Strategy, Type, Source, Target, Input, SecInputs, Params, F
 	% hack needed till we have nested rdf transactions:
 	retractall(ag_map:nickname_cache(Strategy,_,_)),
 
-	rdf_bnode(URI),
+	rdf_create_bnode(URI),
 	rdf_transaction( % this rdf_transaction is to make it MT safe
 	    (	assert_process(URI, Type, Strategy, Params),
 		assert_user_provenance(URI, Strategy),
diff --git a/lib/amalgame/edoal.pl b/lib/amalgame/edoal.pl
index 852f7c8..71e631c 100644
--- a/lib/amalgame/edoal.pl
+++ b/lib/amalgame/edoal.pl
@@ -19,6 +19,7 @@ http://alignapi.gforge.inria.fr/edoal.html
 
 :- use_module(library(semweb/rdf11)).
 :- use_module(ag_provenance).
+:- use_module(library(amalgame/mapping_graph)). %has_correspondence
 
 %%	assert_alignment(+URI, +OptionList) is det.
 %
@@ -79,7 +80,7 @@ assert_alignment(URI, Options) :-
 
 assert_cell(C1, C2, Options) :-
 	option(graph(Graph), Options, align),
-	rdf_bnode(Cell),
+	rdf_create_bnode(Cell),
 	rdf_assert(Cell, rdf:type, align:'Cell', Graph),
 	(var(C1) -> true; rdf_assert(Cell, align:entity1, C1, Graph)),
 	(var(C2) -> true; rdf_assert(Cell, align:entity2, C2, Graph)),
@@ -129,7 +130,7 @@ assert_provlist([[]|ProvList], Cell, Graph, Options) :-
 	assert_provlist(ProvList, Cell, Graph, Options).
 
 assert_provlist([P|ProvList], Cell, Graph, Options) :-
-	rdf_bnode(B),
+	rdf_create_bnode(B),
 	rdf_assert(Cell, amalgame:evidence, B, Graph),
 	forall(member(ProvElem, P),
 	       (   ProvElem =.. [Key, Value],
@@ -182,7 +183,7 @@ edoal_to_triples(EdoalGraph, TargetGraph, Options) :-
 			       assert_as_single_triple(align(C1,C2,MatchOptions), Options, TargetGraph)
 			      )
 		       ),
-	rdf_bnode(Process),
+	rdf_create_bnode(Process),
 	prov_was_generated_by(Process, TargetGraph, TargetGraph,
 			     [was_derived_from([EdoalGraph])
 			     |Options]).