amalgame/commit

rdf11

diff --git a/api/ag_process.pl b/api/ag_process.pl
index c3c3ca9..8cfa9dd 100644
--- a/api/ag_process.pl
+++ b/api/ag_process.pl
@@ -8,7 +8,7 @@
 :- use_module(library(http/http_dispatch)).
 :- use_module(library(http/http_parameters)).
 :- use_module(library(http/http_json)).
-:- use_module(library(semweb/rdf_db)).
+:- use_module(library(semweb/rdf11)).
 :- use_module(library(semweb/rdfs)).
 :- use_module(user(user_db)).
 
@@ -183,12 +183,12 @@ change_namespace(Old, New, Strategy, NewStrategy) :-
 		       ).
 
 tainted_s_ns(S,P,O,Old,Strategy) :-
-	rdf(S,P,O,Strategy:_),
+	rdf(S,P,O,Strategy),
 	sub_atom(S, 0,_,_,Old).
 
 tainted_o_ns(S,P,O,Old,Strategy) :-
-	rdf(S,P,O,Strategy:_),
-	rdf_is_resource(O),
+	rdf(S,P,O,Strategy),
+	rdf_is_object(O),
 	sub_atom(O, 0,_,_,Old).
 
 
diff --git a/api/evaluate.pl b/api/evaluate.pl
index 5f802f9..15742a4 100644
--- a/api/evaluate.pl
+++ b/api/evaluate.pl
@@ -9,7 +9,7 @@
 :- use_module(library(http/http_parameters)).
 :- use_module(library(http/http_json)).
 :- use_module(library(http/json)).
-:- use_module(library(semweb/rdf_db)).
+:- use_module(library(semweb/rdf11)).
 
 :- use_module(user(user_db)).
 
diff --git a/api/hints.pl b/api/hints.pl
index 2e10edc..5c4359a 100644
--- a/api/hints.pl
+++ b/api/hints.pl
@@ -4,7 +4,7 @@
 :- use_module(library(http/http_dispatch)).
 :- use_module(library(http/http_parameters)).
 :- use_module(library(http/http_json)).
-:- use_module(library(semweb/rdf_db)).
+:- use_module(library(semweb/rdf11)).
 :- use_module(library(semweb/rdfs)).
 :- use_module(library(semweb/rdf_label)).
 :- use_module(library(amalgame/ag_strategy)).
diff --git a/api/mappinglist.pl b/api/mappinglist.pl
index e2f2da2..b4d5241 100644
--- a/api/mappinglist.pl
+++ b/api/mappinglist.pl
@@ -2,7 +2,7 @@
 	  [
 	  ]).
 
-:- use_module(library(semweb/rdf_db)).
+:- use_module(library(semweb/rdf11)).
 :- use_module(library(semweb/rdf_label)).
 :- use_module(library(http/http_dispatch)).
 :- use_module(library(http/http_parameters)).
diff --git a/api/virtual_concepts.pl b/api/virtual_concepts.pl
index 117460d..c8197c5 100644
--- a/api/virtual_concepts.pl
+++ b/api/virtual_concepts.pl
@@ -5,7 +5,7 @@
 :- use_module(library(http/http_dispatch)).
 :- use_module(library(http/http_parameters)).
 :- use_module(library(http/http_json)).
-:- use_module(library(semweb/rdf_db)).
+:- use_module(library(semweb/rdf11)).
 :- use_module(library(semweb/rdf_label)).
 
 :- use_module(library(amalgame/ag_stats)).
@@ -88,7 +88,9 @@ concept(related, Parent, Concept) :-
 %	True if Query matches a literal value of R.
 
 label_prefix(Query, R, Lit) :-
-	rdf_has(R, rdfs:label, literal(prefix(Query), Lit)).
+	{ prefix(Lit, Query) },
+	rdf_has(R, rdfs:label, Lit).
 label_prefix(Query, R, Lit) :-
-	rdf_has(O, rdf:value, literal(prefix(Query), Lit)),
+	{ prefix(Lit, Query) },
+	rdf_has(O, rdf:value, Lit),
 	rdf_has(R, rdfs:label, O).
diff --git a/config-available/ag_strat_prov_graph_viz.pl b/config-available/ag_strat_prov_graph_viz.pl
index 7fb34e5..d2c1d45 100644
--- a/config-available/ag_strat_prov_graph_viz.pl
+++ b/config-available/ag_strat_prov_graph_viz.pl
@@ -2,7 +2,7 @@
 
 
 :- use_module(cliopatria(hooks)).
-:- use_module(library(semweb/rdf_db)).
+:- use_module(library(semweb/rdf11)).
 :- use_module(library(semweb/rdfs)).
 :- use_module(library(semweb/rdf_abstract)).