amalgame/commit
avoid direct queries on skos:ConceptScheme to create hookable test
author | Jacco van Ossenbruggen |
---|---|
Wed Aug 13 18:09:19 2014 +0200 | |
committer | Jacco van Ossenbruggen |
Wed Aug 13 18:09:19 2014 +0200 | |
commit | 0c8c764dea11b937771b1b67dfb627c30980c180 |
tree | 727c449ac5c631fbf03c29848151147001fffd29 |
parent | 1b8a8b77e8637073a72848bf2efe56de69037416 |
Diff style: patch stat
diff --git a/config-available/ag_strat_prov_graph_viz.pl b/config-available/ag_strat_prov_graph_viz.pl index 7ae6c78..00b0054 100644 --- a/config-available/ag_strat_prov_graph_viz.pl +++ b/config-available/ag_strat_prov_graph_viz.pl @@ -6,6 +6,8 @@ :- use_module(library(semweb/rdfs)). :- use_module(library(semweb/rdf_abstract)). +:- use_module(library(skos/util)). + :- rdf_meta context_triple(r, t), transitive_context(r). @@ -14,7 +16,7 @@ cliopatria:context_graph(URI, RDF) :- ( rdfs_individual_of(URI, prov:'Entity') ; rdfs_individual_of(URI, prov:'Activity') ; rdfs_individual_of(URI, prov:'Agent') - ; rdfs_individual_of(URI, skos:'ConceptScheme') + ; skos_is_vocabulary(URI) ; rdfs_individual_of(URI, amalgame:'Alignment') ), findall(T, prov_context_triple(URI, T), RDF0), @@ -113,5 +115,5 @@ cliopatria:node_shape(URI, Shape, _Options) :- % Vocabulary (up)loaded, typically not made with amalgame cliopatria:node_shape(URI, Shape, _Options) :- - rdfs_individual_of(URI, skos:'ConceptScheme'), + skos_is_vocabulary(URI), Shape = [shape(box3d),style(filled),fillcolor('#AAAAAA')]. diff --git a/lib/amalgame/ag_provenance.pl b/lib/amalgame/ag_provenance.pl index 72fad07..9fbff6d 100644 --- a/lib/amalgame/ag_provenance.pl +++ b/lib/amalgame/ag_provenance.pl @@ -393,7 +393,7 @@ assert_counts([URI|Tail], Strategy, ProvGraph) :- assert_counts(Tail, Strategy, ProvGraph). assert_count(VocUri, _Strategy, ProvGraph) :- - rdfs_individual_of(VocUri, skos:'ConceptScheme'), + skos_is_vocabulary(VocUri), rdf_retractall(VocUri, amalgame:totalCount, _, ProvGraph), voc_property(VocUri, numberOfConcepts(Count), []), rdf_assert(VocUri, amalgame:totalCount, literal(type(xsd:int, Count)), ProvGraph). diff --git a/lib/amalgame/caching.pl b/lib/amalgame/caching.pl index 1b5ce2c..1c709ed 100644 --- a/lib/amalgame/caching.pl +++ b/lib/amalgame/caching.pl @@ -15,6 +15,7 @@ :- use_module(library(semweb/rdf_db)). :- use_module(library(semweb/rdfs)). +:- use_module(library(skos/util)). :- use_module(library(amalgame/ag_provenance)). :- use_module(library(amalgame/map)). :- use_module(library(amalgame/voc_stats)). @@ -252,7 +253,7 @@ mapping_to_delete(Id, Strategy) :- del_materialized_vocs(Strategy) :- findall(Voc, - ( rdfs_individual_of(Voc, skos:'ConceptScheme'), + ( skos_is_vocabulary(Voc), rdf_graph(Voc), rdf_has(Voc, amalgame:wasGeneratedBy, Process, RP), rdf(Voc, RP, Process, Strategy) diff --git a/lib/amalgame/voc_stats.pl b/lib/amalgame/voc_stats.pl index 0f71202..71d05da 100644 --- a/lib/amalgame/voc_stats.pl +++ b/lib/amalgame/voc_stats.pl @@ -112,7 +112,7 @@ voc_ensure_stats(Voc, virtual(Result), _) :- Result = Virtual. voc_ensure_stats(Voc, format(Format),_) :- - rdfs_individual_of(Voc, skos:'ConceptScheme'), + skos_is_vocabulary(Voc), ( voc_stats_cache(Voc, format(Format)) -> true ; voc_find_format(Voc, Format), @@ -321,7 +321,7 @@ count_mapped_concepts(Voc, Count) :- voc_languages_used(all, Langs) :- findall(L, - ( rdfs_individual_of(Voc, skos:'ConceptScheme'), + ( skos_is_vocabulary(Voc), voc_languages_used(Voc, L) ), Ls), diff --git a/lib/amalgame/vocabulary.pl b/lib/amalgame/vocabulary.pl index 5df52fa..c66b709 100644 --- a/lib/amalgame/vocabulary.pl +++ b/lib/amalgame/vocabulary.pl @@ -4,6 +4,7 @@ :- use_module(library(semweb/rdf_db)). :- use_module(library(semweb/rdfs)). +:- use_module(library(skos/util)). :- use_module(voc_stats). :- use_module(expand_graph). % for virtual vocab schemes @@ -70,7 +71,7 @@ vocab_member(F, 'http://sws.geonames.org/') :- rdfs_individual_of(F, 'http://www.geonames.org/ontology#Feature'). vocab_member(E, Scheme) :- atom(Scheme), - rdfs_individual_of(Scheme, skos:'ConceptScheme'), + skos_is_vocabulary(Scheme), !, vocab_member(E, scheme(Scheme)).