amalgame/commit

moved out skos stuff to skos cpack

diff --git a/lib/ag_modules/voc_exclude.pl b/lib/ag_modules/voc_exclude.pl
index 4e43d4a..e959165 100644
--- a/lib/ag_modules/voc_exclude.pl
+++ b/lib/ag_modules/voc_exclude.pl
@@ -1,6 +1,10 @@
 :- module(voc_exclude, []).
 
+:- use_module(library(option)).
+:- use_module(library(apply)).
+:- use_module(library(ordsets)).
 :- use_module(library(semweb/rdf_db)).
+:- use_module(library(skos/util)).
 :- use_module(library(amalgame/vocabulary)).
 
 :- public amalgame_module/1.
@@ -14,24 +18,15 @@ parameter(type, oneof([source,target]), source,
 
 exclude(Vocab, Mapping, scheme(NewScheme), Options) :-
 	option(type(Type), Options),
-	(   option(new_scheme(NewScheme), Options)
-	->  true
-	;   rdf_bnode(NewScheme)
-	),
+	option(new_scheme(NewScheme), Options),
 	findall(C, vocab_member(C, Vocab), Concepts0),
 	mapping_concepts(Type, Mapping, Exclude0),
 	sort(Concepts0, Concepts),
 	sort(Exclude0, Exclude),
 	ord_subtract(Concepts, Exclude, Rest),
 	rdf_transaction(forall(member(R,Rest),
-			       add_to_scheme(R, NewScheme))),
-	rdf_assert(NewScheme, rdf:type, skos:'ConceptScheme', NewScheme).
-
-add_to_scheme(R, Scheme) :-
-	rdf_has(R, skos:inScheme, Scheme),
-	!.
-add_to_scheme(R, Scheme) :-
-	rdf_assert(R, skos:inScheme, Scheme, Scheme).
+			       skos_add_to_scheme(R, NewScheme, NewScheme))),
+	skos_assert_scheme(NewScheme, NewScheme).
 
 mapping_concepts(source, Mapping, Concepts) :-
 	maplist(arg(1), Mapping, Concepts).