amalgame/commit
fixed broken alignable scheme logic around empty schemes
author | Jacco van Ossenbruggen |
---|---|
Fri Feb 21 17:52:29 2020 +0100 | |
committer | Jacco van Ossenbruggen |
Fri Feb 21 17:52:29 2020 +0100 | |
commit | b4083e90215ecf56be52e522e3fb8f94a3c25ec0 |
tree | ff271b8baeec6c78776664279ebf275158e07fb9 |
parent | aba7831414c719ad35be3d456d568ee7bb94d72b |
Diff style: patch stat
diff --git a/lib/amalgame/vocabulary.pl b/lib/amalgame/vocabulary.pl index 34aba40..c59ffc1 100644 --- a/lib/amalgame/vocabulary.pl +++ b/lib/amalgame/vocabulary.pl @@ -219,11 +219,14 @@ materialize_concept(Concept, Graph) :- % skos:ConceptScheme. amalgame_alignable_scheme(S) :- - explicit_non_empty_scheme(S). + explicit_scheme(S). amalgame_alignable_scheme(S) :- derived_scheme(S). +amalgame_non_empty_scheme(S) :- + amalgame_alignable_scheme(S), + skos_in_scheme_chk(S,_). %% amalgame_alignable_schemes(-Schemes) is det. % @@ -233,7 +236,7 @@ amalgame_alignable_scheme(S) :- % Sorting is based on case insensitive scheme labels. amalgame_alignable_schemes(Schemes) :- - findall(S, amalgame_alignable_scheme(S), All0), + findall(S, amalgame_non_empty_scheme(S), All0), sort(All0, All), maplist(scheme_label, All, Labeled), keysort(Labeled, Sorted), @@ -243,9 +246,8 @@ derived_scheme(Scheme) :- skos_in_scheme(Scheme, _Concept), \+ skos_is_vocabulary(Scheme). -explicit_non_empty_scheme(S) :- - skos_is_vocabulary(S), - skos_in_scheme_chk(S, _). +explicit_scheme(S) :- + skos_is_vocabulary(S). skos_in_scheme_chk(Scheme, Concept) :- skos_in_scheme(Scheme, Concept), !.