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-12-03 10:07:52 -05:00
commit bdc1de733c
3 changed files with 90 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rdf/display/everytime/PropertyConfig.n3
View file

@ -1244,13 +1244,13 @@ local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:bldgGeographicallyWithinContext a :ConfigContext ; local:siteGeographicallyWithinGeoLocationContext a :ConfigContext ;
:hasConfiguration local:bldgGeographicallyWithinConfig ; :hasConfiguration local:siteGeographicallyWithinGeoLocationConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ; :configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
:qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000029> ; ## Site :qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000029> ; ## Site
:qualifiedBy vivo:GeographicLocation . :qualifiedBy vivo:GeographicLocation .
local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; local:siteGeographicallyWithinGeoLocationConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "geographically within" ; :displayName "geographically within" ;
vitro:displayRankAnnot 20; vitro:displayRankAnnot 20;
@ -1258,15 +1258,15 @@ local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:bldgGeographicaLocationOfContext a :ConfigContext ; local:facilitySiteOfEventContext a :ConfigContext ;
:hasConfiguration local:bldgGeographicaLocationOfConfig ; :hasConfiguration local:facilitySiteOfEventConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0001015> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0001015> ;
:qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000029> ; :qualifiedByDomain vivo:Facility ; ## was <http://purl.obolibrary.org/obo/BFO_0000029> ## Site
:qualifiedBy <http://purl.obolibrary.org/obo/BFO_0000004> . :qualifiedBy <http://purl.org/NET/c4dm/event.owl#Event> . ## was <http://purl.obolibrary.org/obo/BFO_0000004> ## Independent Continuant
local:bldgGeographicaLocationOfConfig a :ObjectPropertyDisplayConfig ; local:facilitySiteOfEventConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "geographic location of" ; :displayName "site of event" ;
vitro:displayRankAnnot 21; vitro:displayRankAnnot 21;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
@ -1647,4 +1647,4 @@ local:yearAwardedConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 10; vitro:displayRankAnnot 10;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouptime> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .

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

@ -66,12 +66,10 @@ vivo:dateTimeValue
"5"^^xsd:int ; "5"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGrouptime> ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:selectFromExistingAnnot vitro:selectFromExistingAnnot
"false"^^xsd:boolean . "false"^^xsd:boolean .
@ -472,23 +470,27 @@ bibo:Manuscript
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
owl:sameAs owl:sameAs
a owl:ObjectProperty ; a owl:ObjectProperty ;
rdfs:domain owl:Thing ; rdfs:domain owl:Thing ;
rdfs:label "mismo que"@es , "same as"@en-US ; rdfs:label "mismo que"@es , "same as"@en-US ;
rdfs:range owl:Thing ; rdfs:range owl:Thing ;
rdfs:subPropertyOf owl:topObjectProperty ; rdfs:subPropertyOf owl:topObjectProperty ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
"5" ; "5" ;
vitro:displayRankAnnot
"1"^^xsd:int ;
vitro:forceStubDeletionAnnot vitro:forceStubDeletionAnnot
"false"^^xsd:boolean ; "false"^^xsd:boolean ;
vitro:fullPropertyNameAnnot vitro:fullPropertyNameAnnot
"sameAs" ; "sameAs" ;
vitro:inPropertyGroupAnnot vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupmapping> ; <http://vivoweb.org/ontology#vitroPropertyGroupidentifiers> ;
vitro:offerCreateNewOptionAnnot vitro:offerCreateNewOptionAnnot
"false"^^xsd:boolean ; "true"^^xsd:boolean ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#editor> ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:publicDescriptionAnnot vitro:publicDescriptionAnnot
"This is the OWL property to link two indivdiuals with the same 'identity'. see http://www.w3.org/TR/owl-ref/#sameAs-def"@en-US ; "This is the OWL property to link two indivdiuals with the same 'identity'. see http://www.w3.org/TR/owl-ref/#sameAs-def"@en-US ;
vitro:selectFromExistingAnnot vitro:selectFromExistingAnnot
@ -1245,13 +1247,13 @@ obo:IAO_0000007
vivo:expirationDate vivo:expirationDate
rdfs:label "expiration date"@en-US ; rdfs:label "expiration date"@en-US ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
"5"^^xsd:int ; "1"^^xsd:int ;
vitro:displayRankAnnot vitro:displayRankAnnot
"6"^^xsd:int ; "19"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGrouptime> ; <http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:offerCreateNewOptionAnnot vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ; "true"^^xsd:boolean ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@ -2293,7 +2295,7 @@ vivo:description
vitro:displayLimitAnnot vitro:displayLimitAnnot
"3"^^xsd:int ; "3"^^xsd:int ;
vitro:displayRankAnnot vitro:displayRankAnnot
"5"^^xsd:int ; "1"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot vitro:inPropertyGroupAnnot
@ -2882,7 +2884,11 @@ obo:RO_0000052
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
obo:OBI_0000299 obo:OBI_0000299
rdfs:label "has specified output"@en-US . rdfs:label "has specified output"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
vivo:proceedingsOf vivo:proceedingsOf
rdfs:label "proceedings of"@en-US ; rdfs:label "proceedings of"@en-US ;
@ -3616,7 +3622,21 @@ bibo:Proceedings
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:OBI_0000293 obo:OBI_0000293
rdfs:label "has specified input"@en-US . rdfs:label "has specified input"@en-US ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"105"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
vivo:publisher vivo:publisher
rdfs:label "publisher"@en-US ; rdfs:label "publisher"@en-US ;
@ -6129,13 +6149,13 @@ geo:nameShortES
vivo:dateIssued vivo:dateIssued
rdfs:label "date issued"@en-US ; rdfs:label "date issued"@en-US ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
"5"^^xsd:int ; "1"^^xsd:int ;
vitro:displayRankAnnot vitro:displayRankAnnot
"4"^^xsd:int ; "19"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGrouptime> ; <http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:offerCreateNewOptionAnnot vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ; "true"^^xsd:boolean ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@ -6953,13 +6973,13 @@ vcard:hasSound
vivo:dateFiled vivo:dateFiled
rdfs:label "date filed"@en-US ; rdfs:label "date filed"@en-US ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
"5"^^xsd:int ; "1"^^xsd:int ;
vitro:displayRankAnnot vitro:displayRankAnnot
"4"^^xsd:int ; "19"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGrouptime> ; <http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:individualSortDirectionAnnot vitro:individualSortDirectionAnnot
"desc"^^xsd:string ; "desc"^^xsd:string ;
vitro:offerCreateNewOptionAnnot vitro:offerCreateNewOptionAnnot
@ -7240,7 +7260,21 @@ obo:ERO_0000918
rdfs:label "related research project"@en-US . rdfs:label "related research project"@en-US .
obo:OBI_0000417 obo:OBI_0000417
rdfs:label "achieves planned objective"@en-US . rdfs:label "achieves planned objective"@en-US ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"95"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
vivo:preferredDisplayOrder vivo:preferredDisplayOrder
rdfs:label "preferred display order"@en-US ; rdfs:label "preferred display order"@en-US ;
@ -7486,8 +7520,22 @@ obo:OBI_0000011
rdfs:label "Planned Process"@en-US . rdfs:label "Planned Process"@en-US .
obo:ERO_0000919 obo:ERO_0000919
rdfs:label "related biological specimen"@en-US . rdfs:label "related biological specimen"@en-US ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"95"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupresearch> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
bibo:status bibo:status
rdfs:label "status"@en-US ; rdfs:label "status"@en-US ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
@ -7567,7 +7615,7 @@ vivo:hasEquipment
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupservice> ; <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot vitro:selectFromExistingAnnot

11
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
View file

@ -50,9 +50,14 @@ public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator i
+ " ?newVcardInd vcard:hasName ?newVcardName . \n" + " ?newVcardInd vcard:hasName ?newVcardName . \n"
+ " ?newVcardName a vcard:Name . \n" + " ?newVcardName a vcard:Name . \n"
+ " ?newVcardName vcard:givenName ?firstName . \n" + " ?newVcardName vcard:givenName ?firstName . \n"
+ " ?newVcardName vcard:familyName ?lastName . \n" + " ?newVcardName vcard:familyName ?lastName . \n",
+ " ?newVcardName <http://vivoweb.org/ontology/core#middleName> ?middleName .", N3_PREFIX + " ?newInd <" + RDFS.label.getURI() + "> ?label .",
N3_PREFIX + " ?newInd <" + RDFS.label.getURI() + "> ?label ." N3_PREFIX + "@prefix vcard:<http://www.w3.org/2006/vcard/ns#> .\n"
+ " ?newInd <http://purl.obolibrary.org/obo/ARG_2000028> ?newVcardInd . \n"
+ " ?newVcardInd a vcard:Individual . \n"
+ " ?newVcardInd vcard:hasName ?newVcardName . \n"
+ " ?newVcardName a vcard:Name . \n"
+ " ?newVcardName <http://vivoweb.org/ontology/core#middleName> ?middleName ."
)); ));
config.addNewResource("newInd", vreq.getWebappDaoFactory().getDefaultNamespace()); config.addNewResource("newInd", vreq.getWebappDaoFactory().getDefaultNamespace());