From 6dfdd87b65bfce37d46371f0f1afe663fd366d90 Mon Sep 17 00:00:00 2001 From: stellamit Date: Wed, 26 Oct 2011 19:12:41 +0000 Subject: [PATCH] incremental devp for NIHVIVO-3206 --- .../WEB-INF/ontologies/update/diff.tab.txt | 3 +++ ...nk.sparql => EventSeriesProperties.sparql} | 14 ++++++----- .../additions/OrganizerRole.sparql | 24 ------------------- ...ink.sparql => SubjectAreaAsConcept.sparql} | 16 ++++++++++--- .../additions/VitroAdditionalLink.sparql | 22 ----------------- .../EventSeriesProperties.sparql} | 13 ++++++---- .../deletions/VIVODependentResource.sparql | 20 ---------------- .../deletions/VitroDependentResource.sparql | 20 ---------------- 8 files changed, 32 insertions(+), 100 deletions(-) rename productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/{VitroPrimaryLink.sparql => EventSeriesProperties.sparql} (70%) delete mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/OrganizerRole.sparql rename productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/{PrimaryURLLink.sparql => SubjectAreaAsConcept.sparql} (57%) delete mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/VitroAdditionalLink.sparql rename productMods/WEB-INF/ontologies/update/sparqlConstructs/{additions/Keyword.sparql => deletions/EventSeriesProperties.sparql} (71%) delete mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/VIVODependentResource.sparql delete mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/VitroDependentResource.sparql diff --git a/productMods/WEB-INF/ontologies/update/diff.tab.txt b/productMods/WEB-INF/ontologies/update/diff.tab.txt index cc604165..3d72bb03 100644 --- a/productMods/WEB-INF/ontologies/update/diff.tab.txt +++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt @@ -1,3 +1,6 @@ +http://vivoweb.org/ontology/core#SubjectArea No Delete Delete +http://vivoweb.org/ontology/core#hasSubjectArea No Delete Delete +http://vivoweb.org/ontology/core#hasResearchArea No Delete Delete http://vivoweb.org/ontology/core#subjectAreaOf No Delete Delete http://vivoweb.org/ontology/core#researchAreaOf No Delete Delete http://vivoweb.org/ontology/core#VocabularySourceReference http://vivoweb.org/ontology/core#URLLink Yes Map Directly-changed diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/VitroPrimaryLink.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/EventSeriesProperties.sparql similarity index 70% rename from productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/VitroPrimaryLink.sparql rename to productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/EventSeriesProperties.sparql index 89c9e368..715df80f 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/VitroPrimaryLink.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/EventSeriesProperties.sparql @@ -11,13 +11,15 @@ PREFIX dcterms: PREFIX event: PREFIX foaf: PREFIX skos: -PREFIX core: +PREFIX vivo: Construct { - ?link core:rank "1"^^ . - ?entity core:webpage ?link . - ?link core:webpageOf ?entity + ?something vivo:inEventSeries ?series . + ?series vivo:seriesForEvent ?something } where { - ?entity vitro:primaryLink ?link . - ?link a vitro:Link . + {?something vivo:eventWithin ?series} + union + {?series vivo:includesEvent ?something} + + ?series rdf:type vivo:EventSeries } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/OrganizerRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/OrganizerRole.sparql deleted file mode 100644 index dbd18b05..00000000 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/OrganizerRole.sparql +++ /dev/null @@ -1,24 +0,0 @@ -PREFIX rdf: -PREFIX rdfs: -PREFIX xsd: -PREFIX owl: -PREFIX swrl: -PREFIX swrlb: -PREFIX vitro: -PREFIX vivo: -PREFIX bibo: -PREFIX dcterms: -PREFIX event: -PREFIX foaf: -PREFIX skos: -PREFIX core: - -Construct { - _:role a core:OrganizerRole . - _:role core:roleIn ?something . - ?something core:relatedRole _:role . - ?person core:hasOrganizerRole _:role . - _:role core:organizerRoleOf ?person . -} where { - ?something bibo:organizer ?person . -} \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/PrimaryURLLink.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/SubjectAreaAsConcept.sparql similarity index 57% rename from productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/PrimaryURLLink.sparql rename to productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/SubjectAreaAsConcept.sparql index b3bfa7ed..c857aa6a 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/PrimaryURLLink.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/SubjectAreaAsConcept.sparql @@ -11,10 +11,20 @@ PREFIX dcterms: PREFIX event: PREFIX foaf: PREFIX skos: -PREFIX core: +PREFIX vivo: Construct { - ?link core:rank "1"^^ . + ?something vivo:terminologyAnnotation _:terminologyAnnotation . + _:terminologyAnnotation rdf:type vivo:TerminologyAnnotation . + _:terminologyAnnotation vivo:referencedTerm _:concept . + _:concept rdf:type skos:Concept . + _:concept rdfs:label ?label } where { - ?link a core:PrimaryURLLink . + {?something vivo:hasSubjectArea ?area} + union + {?something vivo:hasResearchArea ?area} + + ?something rdf:type vivo:SubjectArea + + optional {?area rdfs:label ?label} } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/VitroAdditionalLink.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/VitroAdditionalLink.sparql deleted file mode 100644 index 1cda22f2..00000000 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/VitroAdditionalLink.sparql +++ /dev/null @@ -1,22 +0,0 @@ -PREFIX rdf: -PREFIX rdfs: -PREFIX xsd: -PREFIX owl: -PREFIX swrl: -PREFIX swrlb: -PREFIX vitro: -PREFIX vivo: -PREFIX bibo: -PREFIX dcterms: -PREFIX event: -PREFIX foaf: -PREFIX skos: -PREFIX core: - -Construct { - ?entity core:webpage ?link . - ?link core:webpageOf ?entity -} where { - ?entity vitro:additionalLink ?link . - ?link a vitro:Link . -} \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/Keyword.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/EventSeriesProperties.sparql similarity index 71% rename from productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/Keyword.sparql rename to productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/EventSeriesProperties.sparql index 95ab878e..01a0fba5 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/Keyword.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/EventSeriesProperties.sparql @@ -11,12 +11,15 @@ PREFIX dcterms: PREFIX event: PREFIX foaf: PREFIX skos: -PREFIX core: +PREFIX vivo: Construct { - ?something core:freetextKeyword ?textKeyWord . + ?something vivo:eventWithin ?series . + ?series vivo:includesEvent ?something } where { - ?something vitro:keyword ?keywordIndividual . - ?keywordIndividual a vitro:Keyword . - ?keywordIndividual rdfs:label ?textKeyWord . + {?something vivo:eventWithin ?series} + union + {?series vivo:includesEvent ?something} + + ?series rdf:type vivo:EventSeries } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/VIVODependentResource.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/VIVODependentResource.sparql deleted file mode 100644 index b3699edd..00000000 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/VIVODependentResource.sparql +++ /dev/null @@ -1,20 +0,0 @@ -PREFIX rdf: -PREFIX rdfs: -PREFIX xsd: -PREFIX owl: -PREFIX swrl: -PREFIX swrlb: -PREFIX vitro: -PREFIX vivo: -PREFIX bibo: -PREFIX dcterms: -PREFIX event: -PREFIX foaf: -PREFIX skos: -PREFIX core: - -Construct { - ?s a core:DependentResource -} where { - ?s a core:DependentResource -} \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/VitroDependentResource.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/VitroDependentResource.sparql deleted file mode 100644 index c5c7a7de..00000000 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/VitroDependentResource.sparql +++ /dev/null @@ -1,20 +0,0 @@ -PREFIX rdf: -PREFIX rdfs: -PREFIX xsd: -PREFIX owl: -PREFIX swrl: -PREFIX swrlb: -PREFIX vitro: -PREFIX vivo: -PREFIX bibo: -PREFIX dcterms: -PREFIX event: -PREFIX foaf: -PREFIX skos: -PREFIX core: - -Construct { - ?s a vitro:DependentResource -} where { - ?s a vitro:DependentResource -} \ No newline at end of file