diff --git a/productMods/WEB-INF/ontologies/update/diff.tab.txt b/productMods/WEB-INF/ontologies/update/diff.tab.txt index 441ee456..07b924f5 100644 --- a/productMods/WEB-INF/ontologies/update/diff.tab.txt +++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt @@ -18,7 +18,7 @@ http://vivoweb.org/ontology/core#AwardOrHonor http://vivoweb.org/ontology/core#A http://vivoweb.org/ontology/core#conferringOrganization http://vivoweb.org/ontology/core#awardConferredBy Yes Map Directly-changed http://vivoweb.org/ontology/core#awardSponsoredBy No Delete not set http://vivoweb.org/ontology/core#sponsorsAward No Delete not set -http://vivoweb.org/ontology/core#AbstractInformation No Delete not set +http://vivoweb.org/ontology/core#AbstractInformation No Delete Delete http://vivoweb.org/ontology/core#reviewedDocumentTitle No Delete not set http://vivoweb.org/ontology/core#count No Delete not set http://vivoweb.org/ontology/core#displayOrder No Delete not set @@ -58,6 +58,6 @@ http://vivoweb.org/ontology/core#endDateTime No Delete Delete http://vivoweb.org/ontology/core#endDate No Delete Delete http://vivoweb.org/ontology/core#endYearMonth No Delete Delete http://vivoweb.org/ontology/core#endTime No Delete Delete -http://vivoweb.org/ontology/core#TimeInterval No Delete not set +http://vivoweb.org/ontology/core#TimeInterval No Delete Delete http://vivoweb.org/ontology/core#timeIntervalFor No Delete not set http://vivoweb.org/ontology/core#hasTimeInterval No Delete not set \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/endDate.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endDate.sparql similarity index 90% rename from productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/endDate.sparql rename to productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endDate.sparql index c45e6cde..24fe0ece 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/endDate.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endDate.sparql @@ -23,4 +23,10 @@ Construct { _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:endDate ?theEndDate . + + Optional { + ?thing core:startDate ?theStartDate + } + + FILTER (!bound(?theStartDate)) } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/endYear.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endYear.sparql similarity index 90% rename from productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/endYear.sparql rename to productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endYear.sparql index cc5ebdf4..eb68f672 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/endYear.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endYear.sparql @@ -23,4 +23,10 @@ Construct { _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:endYear ?theEndYear . + + Optional { + ?thing core:startYear ?theStartYear + } + + FILTER (!bound(?theStartYear)) } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/startDate.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startDate.sparql similarity index 90% rename from productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/startDate.sparql rename to productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startDate.sparql index 23cebf5b..6b87e4b2 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/startDate.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startDate.sparql @@ -23,4 +23,10 @@ Construct { _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:startDate ?theStartDate . + + Optional { + ?thing core:endDate ?theEndDate + } + + FILTER (!bound(?theEndDate)) } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/startYear.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startYear.sparql similarity index 90% rename from productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/startYear.sparql rename to productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startYear.sparql index 55459a1c..e734a375 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions-pass2/startYear.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startYear.sparql @@ -23,4 +23,10 @@ Construct { _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:startYear ?theStartYear . + + Optional { + ?thing core:endYear ?theEndYear + } + + FILTER (!bound(?theEndYear)) } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/startAndEndDate.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/startAndEndDate.sparql deleted file mode 100644 index abab4870..00000000 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/startAndEndDate.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 { - ?thing core:startDate ?theStartDate . - ?thing core:endDate ?theEndDate . -} where { - ?thing core:startDate ?theStartDate . - ?thing core:endDate ?theEndDate . -} \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/startAndEndYear.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/startAndEndYear.sparql deleted file mode 100644 index 01b5a150..00000000 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/startAndEndYear.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 { - ?thing core:startYear ?theStartYear . - ?thing core:endYear ?theEndYear . -} where { - ?thing core:startYear ?theStartYear . - ?thing core:endYear ?theEndYear . -} \ No newline at end of file