amalgame/commit

FIXED: removed old dependency on prov that broke evaluator

diff --git a/api/evaluate.pl b/api/evaluate.pl
index 10c78a5..0022d90 100644
--- a/api/evaluate.pl
+++ b/api/evaluate.pl
@@ -16,8 +16,8 @@
 :- use_module(library(skos/util)).
 
 :- use_module(library(amalgame/caching)).
+:- use_module(library(amalgame/ag_strategy)).
 :- use_module(library(amalgame/ag_evaluation)).
-:- use_module(library(amalgame/ag_provenance)).
 :- use_module(library(amalgame/ag_stats)).
 :- use_module(library(amalgame/edoal)).
 :- use_module(library(amalgame/map)).
@@ -67,7 +67,7 @@ http_data_evaluate(Request) :-
 	->  evaluation_graph(Strategy, Mapping, Graph)
 	;   Graph = Mapping
 	),
-	process_entity(EvalProcess,  Graph),
+	process_entity(Strategy, EvalProcess,  Graph),
 	flush_expand_cache(EvalProcess, Strategy),  % graph cache is now outdated
 	flush_refs_cache(Strategy),                 % to recompute all reference stats
 	flush_stats_cache(Graph, Strategy),         % to recompute G's basic stats
diff --git a/lib/amalgame/ag_provenance.pl b/lib/amalgame/ag_provenance.pl
index a42bfb3..29d9873 100644
--- a/lib/amalgame/ag_provenance.pl
+++ b/lib/amalgame/ag_provenance.pl
@@ -1,7 +1,6 @@
 :- module(ag_provenance,
 	[
 	 provenance_graph/2,
-	 process_entity/2,
 	 add_amalgame_prov/3,
 	 update_amalgame_prov/2,                      % -Strategy, +Mapping
 	 flush_prov_cache/0,
@@ -29,7 +28,6 @@
 
 :- rdf_meta
 	provenance_graph(r,r),
-	process_entity(r,r),
 	add_amalgame_prov(r,r,+),
 	update_amalgame_prov(r,r),
 	remove_old_prov(r,r),
@@ -59,9 +57,6 @@ provenance_graph(Strategy, Graph) :-
 	    create_prov_graph(Strategy, Graph)
 	).
 
-process_entity(P,E) :-
-	rdf_has(E, prov:wasGeneratedBy, P).
-
 create_prov_graph(Strategy, Graph) :-
 	format(atom(Label), 'Provenance graph for strategy ~p', [Strategy]),
 	rdf_assert(Graph, rdf:type, prov:'Bundle', Graph),
diff --git a/lib/amalgame/ag_strategy.pl b/lib/amalgame/ag_strategy.pl
new file mode 100644
index 0000000..ad46a31
--- /dev/null
+++ b/lib/amalgame/ag_strategy.pl
@@ -0,0 +1,12 @@
+:- module(ag_strategy,
+	  [ process_entity/3
+	  ]).
+
+:- use_module(library(semweb/rdf_db)).
+
+:- rdf_meta
+	process_entity(r,r,r).
+
+process_entity(Strategy, Process,Entity) :-
+	rdf_has(Entity, amalgame:wasGeneratedBy, Process, RealProperty),
+	rdf(Entity, RealProperty, Process, Strategy).