amalgame/commit

Loading and somewhat working version

diff --git a/applications/evaluator/evaluator.pl b/applications/evaluator/evaluator.pl
index 795ccd0..d3f506c 100644
--- a/applications/evaluator/evaluator.pl
+++ b/applications/evaluator/evaluator.pl
@@ -28,7 +28,7 @@
 :- use_module(amalgame(mappings/edoal)).
 :- use_module(amalgame(mappings/opm)).
 
-:- use_module(amalgame(util/json_graph)).
+:- use_module(library(json_graph)).
 
 :- setting(evaluator:maxMappings, nonneg, 1000, 'Max number of mappings per mapping file to put in the todo list of the mapping evaluator').
 :- setting(evaluator:authorization, oneof([required, optional]), required, 'Login required to evaluate or not').
diff --git a/applications/vocabularies/components.pl b/applications/vocabularies/components.pl
index 204e32c..772aad0 100644
--- a/applications/vocabularies/components.pl
+++ b/applications/vocabularies/components.pl
@@ -29,7 +29,7 @@
 show_schemes -->
 	{
 	 \+  rdf_has(_Voc, skos:inScheme, _Scheme),!,
-	 http_link_to_id(load_library_ontology_form, [], LoadLink)
+	 http_link_to_id(load_library_rdf_form, [], LoadLink)
 	},
 	html(p([class('error novocs')],
 		 ['Warning: No SKOS concept schemes have been ',
diff --git a/compare/overlap.pl b/compare/overlap.pl
index d4bd279..74d64d0 100644
--- a/compare/overlap.pl
+++ b/compare/overlap.pl
@@ -25,7 +25,6 @@ matchers. It assumes matchers assert mappings in different name graphs.
 :- use_module(amalgame(mappings/alignment)).
 :- use_module(amalgame(mappings/edoal)).
 :- use_module(amalgame(mappings/opm)).
-:- use_module(amalgame(namespaces)).
 
 :- setting(overlaps_persistent, boolean, false, 'Set to true if you want overlaps to survive server restarts').
 
diff --git a/config-available/ag_skin.pl b/config-available/ag_skin.pl
index d83fa7c..2de0ac7 100644
--- a/config-available/ag_skin.pl
+++ b/config-available/ag_skin.pl
@@ -12,7 +12,7 @@
 :- use_module(library(semweb/rdf_label)).
 
 :- use_module(cliopatria(hooks)).
-:- use_module(cliopatria(skin)).
+:- use_module(skin(cliopatria)).
 :- use_module(components(label)).
 :- use_module(components(menu)).
 :- use_module(components(simple_search)).
diff --git a/mappings/edoal.pl b/mappings/edoal.pl
index 53b04ad..fa787ec 100644
--- a/mappings/edoal.pl
+++ b/mappings/edoal.pl
@@ -23,7 +23,6 @@ http://alignapi.gforge.inria.fr/edoal.html
 
 :- use_module(user(user_db)).
 
-:- use_module(amalgame(namespaces)).
 :- use_module(map).
 :- use_module(opm).
 
diff --git a/rdf/tool/Manifest.ttl b/rdf/tool/Manifest.ttl
index eeb0e6c..8c92765 100644
--- a/rdf/tool/Manifest.ttl
+++ b/rdf/tool/Manifest.ttl
@@ -1,4 +1,3 @@
-@prefix  clbase:  <../ClioPatria/ontologies/base/> .
 @prefix	   align: <http://knowledgeweb.semanticweb.org/heterogeneity/alignment#> .
 @prefix amalgame: <http://purl.org/vocabularies/amalgame#> .
 @prefix      lib: <http://www.swi-prolog.org/rdf/library/> .
@@ -44,9 +43,6 @@
 	dcterms:title "Schema for the Amalgame RDF vocabulary"@en ;
 	lib:source amalgame: ;
 	owl:imports
-		clbase:skos ,
 		<opmvc> ,
 		<alignmentschema> ,
 		<amalgame.ttl> .
-
-