amalgame/commit

IMPROVED: strategy_backward_compatability stuff

authorJacco van Ossenbruggen
Tue Sep 9 12:29:51 2014 +0200
committerJacco van Ossenbruggen
Tue Sep 9 12:29:51 2014 +0200
commitd340630bc2f384950eb21ec68834a4f4675ea74d
treeaa80fd1d6de9582a8c5527ac9dce35ec20a2e8b9
parentf534c9e8133a02e21693cd04c6d7a4bca4dd2e4e
Diff style: patch stat
diff --git a/lib/amalgame/ag_strategy.pl b/lib/amalgame/ag_strategy.pl
index bbb0d6d..e820c28 100644
--- a/lib/amalgame/ag_strategy.pl
+++ b/lib/amalgame/ag_strategy.pl
@@ -222,6 +222,7 @@ new_output(Type, Process, P, Input, Strategy, OutputURI) :-
         rdf_assert(OutputURI, P, Process, Strategy),
 
 	rdfs_individual_of(Process, PType),
+	!,
 	(   rdf_has(PType, amalgame:materialize, amalgame:always)
 	->  rdf_assert(OutputURI, amalgame:recordEvidence, amalgame:enabled, Strategy)
 	;   true
diff --git a/lib/amalgame/hooks/strategy_backward_compatability.pl b/lib/amalgame/hooks/strategy_backward_compatability.pl
index 67e1e48..8f00fef 100644
--- a/lib/amalgame/hooks/strategy_backward_compatability.pl
+++ b/lib/amalgame/hooks/strategy_backward_compatability.pl
@@ -15,18 +15,19 @@
 	is_old_vocab_selecter_triple(r,r,r,r).
 
 amalgame:prebuilder(Strategy) :-
-	backward_compatibilty_fixes(Strategy).
+	backward_compatibility_fixes(Strategy).
 
-backward_compatibilty_fixes(Strategy) :-
-	fix_vocab_selecters(Strategy),
+backward_compatibility_fixes(Strategy) :-
 	fix_opmv_ns(Strategy),
+	fix_vocab_selecters(Strategy),
 	fix_sec_inputs(Strategy),
 	fix_arity_params(Strategy),
-	fix_publish_ns(Strategy).
+	fix_publish_ns(Strategy),
+	!. % do not do this again
 
 fix_vocab_selecters(Strategy) :-
 	findall(rdf(S,P,O,Strategy), is_old_vocab_selecter_triple(S,P,O,Strategy), OldTriples),
-	% maplist(old_vocab_selecter_to_new(OldTriples),
+	maplist(old_vocab_selecter_to_new, OldTriples),
 	rdf_retract_list(OldTriples).
 
 rdf_retract_list([]).