litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-11-22 09:21:09 -05:00
commit 96b88bfe2e
6 changed files with 140 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/WEB-INF/ontologies/update/diff.tab.txt
View file

File diff suppressed because one or more lines are too long

54
rdf/tbox/filegraph/dataset.owl Normal file
View file

@ -0,0 +1,54 @@
<?xml version="1.0"?>
<rdf:RDF xmlns="http://purl.obolibrary.org/obo/arg/publication.owl#"
xml:base="http://purl.obolibrary.org/obo/arg/publication.owl"
xmlns:obo="http://purl.obolibrary.org/obo/"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:ns="http://www.w3.org/2003/06/sw-vocab-status/ns#"
xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
xmlns:owl="http://www.w3.org/2002/07/owl#"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:core="http://vivoweb.org/ontology/core#">
<!-- http://purl.obolibrary.org/obo/TODO_Dataset -->
<owl:Class rdf:about="http://purl.obolibrary.org/obo/TODO_Dataset">
<rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A named collection of data, usually containing only one type of data</obo:IAO_0000115>
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">US Patent Data; US Job Data</obo:IAO_0000112>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="http://purl.org/spar/cito/isCitedAsDataSourceBy"/>
<owl:allValuesFrom rdf:resource="http://purl.org/ontology/bibo/Document"/>
</owl:Restriction>
</rdfs:subClassOf>
</owl:Class>
<owl:Class rdf:about="http://purl.org/ontology/bibo/Document">
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="http://purl.org/spar/cito/citesAsDataSource"/>
<owl:allValuesFrom rdf:resource="http://purl.obolibrary.org/obo/TODO_Dataset"/>
</owl:Restriction>
</rdfs:subClassOf>
</owl:Class>
<!-- http://purl.org/spar/cito/isCitedAsDataSourceBy -->
<owl:ObjectProperty rdf:about="http://purl.org/spar/cito/isCitedAsDataSourceBy">
<rdfs:label xml:lang="en">is cited as data source by</rdfs:label>
<rdfs:comment xml:lang="en">The cited entity is cited as a data source by the citing entity.</rdfs:comment>
<owl:inverseOf rdf:resource="http://purl.org/spar/cito/citesAsDataSource"/>
</owl:ObjectProperty>
<!-- http://purl.org/spar/cito/citesAsDataSource -->
<owl:ObjectProperty rdf:about="http://purl.org/spar/cito/citesAsDataSource">
<rdfs:label xml:lang="en">cites as data source</rdfs:label>
<rdfs:comment xml:lang="en">The citing entity cites the cited entity as source of data.</rdfs:comment>
</owl:ObjectProperty>
</rdf:RDF>

8
rdf/tbox/filegraph/ontologies.owl
View file

@ -14,7 +14,11 @@
<owl:Ontology rdf:about="http://purl.obolibrary.org/obo/"/>
<owl:Ontology rdf:about="http://www.w3.org/2006/vcard/ns"/>
<owl:Ontology rdf:about="http://aims.fao.org/aos/geopolitical.owl"/>
<owl:Ontology rdf:about="http://purl.org/net/OCRe/statistics.owl"/>
<owl:Ontology rdf:about="http://purl.org/net/OCRe/study_protocol.owl"/>
<owl:Ontology rdf:about="http://purl.org/net/OCRe/research.owl"/>
<owl:Ontology rdf:about="http://purl.org/net/OCRe/study_design.owl"/>
<owl:Ontology rdf:about="http://www.w3.org/2004/02/skos/core"/>
<owl:Ontology rdf:about="http://vivoweb.org/ontology/scientific-research"/>
<owl:Ontology rdf:about="http://purl.org/spar/fabio/"/>
<owl:Ontology rdf:about="http://purl.org/spar/c4o/"/>
<owl:Ontology rdf:about="http://purl.org/spar/cito/"/>
</rdf:RDF>

20
rdf/tbox/filegraph/publication.owl
View file

@ -984,17 +984,6 @@ This class allows for linking an author to a publication while indicating inform
<!-- http://vivoweb.org/ontology/core#Dataset -->
<owl:Class rdf:about="http://vivoweb.org/ontology/core#Dataset">
<rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A named collection of data, usually containing only one type of data</obo:IAO_0000115>
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">US Patent Data; US Job Data</obo:IAO_0000112>
</owl:Class>
<!-- http://vivoweb.org/ontology/core#EditorRole -->
<owl:Class rdf:about="http://vivoweb.org/ontology/core#EditorRole">
@ -1204,9 +1193,14 @@ Contents
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Document to be published</obo:IAO_0000115>
</owl:NamedIndividual>
<owl:Class rdf:about="http://vivoweb.org/ontology/core#Abstract">
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An abstract that is published as a standalone document or in a journal of abstracts</obo:IAO_0000115>
<rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
</owl:Class>
</rdf:RDF>
<!-- Generated by the OWL API (version 3.3.1957) http://owlapi.sourceforge.net -->

77
rdf/tbox/firsttime/initialTBoxAnnotations.n3
View file

@ -402,7 +402,7 @@ obo:OBI_0000643
rdfs:label "has grain"@en-US .
obo:OBI_0000272
rdfs:label "protocol"@en-US .
rdfs:label "Protocol"@en-US .
vcard:Identification
rdfs:label "Identification"@en-US .
@ -1390,6 +1390,14 @@ bibo:Article
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
vivo:Abstract
rdfs:label "Abstract"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
vivo:Position
rdfs:label "Position"@en-US ;
vitro:displayLimitAnnot
@ -1578,8 +1586,9 @@ geo:population
vcard:Geographical
rdfs:label "Geographical"@en-US .
vivo:Dataset
obo:TODO_Dataset
rdfs:label "Dataset"@en-US ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> ;
vitro:displayLimitAnnot
"-1"^^xsd:int ;
vitro:displayRankAnnot
@ -2051,8 +2060,9 @@ vivo:Location
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
<http://purl.org/net/OCRe/study_protocol.owl>
rdfs:label "OCRe study protocol"@en-US .
<http://purl.org/net/OCRe/study_design.owl>
rdfs:label "OCRe study design"@en-US ;
vitro:ontologyPrefixAnnot "ocresd"^^xsd:string .
vivo:WorkingPaper
rdfs:label "Working Paper"@en-US ;
@ -2654,7 +2664,7 @@ vivo:contributingRole
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupbiography> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@ -5161,6 +5171,24 @@ obo: rdfs:label "OBO Foundry"@en-US ;
vitro:ontologyPrefixAnnot
"obo"^^xsd:string .
<http://vivoweb.org/ontology/scientific-research>
rdfs:label "VIVO Scientific Research Ontology"@en-US ;
vitro:ontologyPrefixAnnot
"scires"^^xsd:string .
<http://purl.org/spar/fabio/>
rdfs:label "FaBiO (FRBR-Aligned Bibliographic Ontology)"@en-US ;
vitro:ontologyPrefixAnnot
"fabio"^^xsd:string .
<http://purl.org/spar/c4o/>
vitro:ontologyPrefixAnnot "c4o"^^xsd:string ;
rdfs:label "Citation Counting and Context Characterization Ontology"@en-US .
<http://purl.org/spar/cito/>
vitro:ontologyPrefixAnnot "cito"^^xsd:string ;
rdfs:label "CiTO (Citation Typing Ontology)"@en-US .
vivo:providesFundingThrough
rdfs:label "provides funding through"@en-US ;
vitro:displayLimitAnnot
@ -5508,8 +5536,9 @@ bibo:
vitro:ontologyPrefixAnnot
"bibo"^^xsd:string .
<http://purl.org/net/OCRe/statistics.owl>
rdfs:label "OCRe statistics"@en-US .
<http://purl.org/net/OCRe/research.owl>
rdfs:label "OCRe research"@en-US ;
vitro:ontologyPrefixAnnot "ocrer"^^xsd:string .
geo:special_group
rdfs:label "Special Group"@en-US ;
@ -7308,3 +7337,37 @@ vivo:hasEquipment
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
rdfs:label "has equipment"@en-US .
<http://purl.org/spar/cito/isCitedAsDataSourceBy>
rdfs:label "is cited as data source by"@en-US ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"4"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupbibliographiconline> ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
<http://purl.org/spar/cito/citesAsDataSource>
rdfs:label "cites as data source"@en-US ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"4"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupbibliographiconline> ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .

2
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
View file

@ -890,6 +890,7 @@ public class AddPublicationToPersonGenerator extends VivoBaseGenerator implement
private List<List<String>> getPublicationTypeLiteralOptions() {
List<List<String>> literalOptions = new ArrayList<List<String>>();
literalOptions.add(list("http://vivoweb.org/ontology/core#Abstract", "Abstract"));
literalOptions.add(list("http://purl.org/ontology/bibo/AcademicArticle", "Academic Article"));
literalOptions.add(list("http://purl.org/ontology/bibo/Article", "Article"));
literalOptions.add(list("http://purl.org/ontology/bibo/AudioDocument", "Audio Document"));
@ -901,6 +902,7 @@ public class AddPublicationToPersonGenerator extends VivoBaseGenerator implement
literalOptions.add(list("http://vivoweb.org/ontology/core#ConferencePaper", "Conference Paper"));
literalOptions.add(list("http://vivoweb.org/ontology/core#ConferencePoster", "Conference Poster"));
literalOptions.add(list("http://vivoweb.org/ontology/core#Database", "Database"));
literalOptions.add(list("http://purl.obolibrary.org/obo/TODO_Dataset", "Dataset"));
literalOptions.add(list("http://purl.org/ontology/bibo/EditedBook", "Edited Book"));
literalOptions.add(list("http://vivoweb.org/ontology/core#EditorialArticle", "Editorial Article"));
literalOptions.add(list("http://purl.org/ontology/bibo/Film", "Film"));