amalgame/commit

IMPROVED: evidence tracking for preloaded

diff --git a/components/amalgame/correspondence.pl b/components/amalgame/correspondence.pl
index decc4f3..c888e50 100644
--- a/components/amalgame/correspondence.pl
+++ b/components/amalgame/correspondence.pl
@@ -155,13 +155,23 @@ html_evidences([E|Es],Source,Target) -->
 	  ->  By = span([class(who)], [' by: ', \rdf_link(User)])
 	  ;   By = ''
 	  ),
+	  (   option(graph(Graph), E), atom(Graph)
+	  ->  Gr = span([class(graph)], [' from: ', \rdf_link(Graph)])
+	  ;   Gr = ''
+	  ),
+	  (   option(relation(Rel), E), atom(Rel)
+	  ->  Re = span([class(relation)], [' relation: ', \rdf_link(Rel)])
+	  ;   Re = ''
+	  ),
 	  (   option(comment(Comment), E)
 	  ->  Cm = span([class(comment)], [' with comment: ', Comment])
 	  ;   Cm = ''
 	  )
 	},
 	html(div(class(evidence),
-		 [ div(class(method), ['match: ', Method, By, At, Mt, Src, Trg, Ss, Ts, Scs, Cm]),
+		 [ div(class(method),
+		       ['match: ',
+			Method, By, Gr, Re, At, Mt, Src, Trg, Ss, Ts, Scs, Cm]),
 		   div(class('graph yui3-g'),
 		       [ div(class('source yui3-u-1-2'),
 			     \html_evidence_graph(Graph, Source, 'LR')),
diff --git a/lib/amalgame/map.pl b/lib/amalgame/map.pl
index bfa0ebc..25d2361 100644
--- a/lib/amalgame/map.pl
+++ b/lib/amalgame/map.pl
@@ -187,7 +187,8 @@ has_map([E1, E2], edoal, Properties, Graph) :-
 		Properties).
 
 has_map([E1, E2], Format, [[method(preloaded),
-			    relation(RealProp)]], Graph) :-
+			    relation(RealProp),
+			    graph(Graph)]], Graph) :-
 	mapping_relation(Format,MappingProp),
 	(   ground(E1), ground(E2)
 	->  rdf_has(E1, MappingProp, E2, RealProp),