diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index e0bacd39..953b5299 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -1244,13 +1244,13 @@ local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . -local:bldgGeographicallyWithinContext a :ConfigContext ; - :hasConfiguration local:bldgGeographicallyWithinConfig ; +local:siteGeographicallyWithinGeoLocationContext a :ConfigContext ; + :hasConfiguration local:siteGeographicallyWithinGeoLocationConfig ; :configContextFor ; :qualifiedByDomain ; ## Site :qualifiedBy vivo:GeographicLocation . -local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; +local:siteGeographicallyWithinGeoLocationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "geographically within" ; vitro:displayRankAnnot 20; @@ -1258,15 +1258,15 @@ local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . -local:bldgGeographicaLocationOfContext a :ConfigContext ; - :hasConfiguration local:bldgGeographicaLocationOfConfig ; +local:facilitySiteOfEventContext a :ConfigContext ; + :hasConfiguration local:facilitySiteOfEventConfig ; :configContextFor ; - :qualifiedByDomain ; - :qualifiedBy . + :qualifiedByDomain vivo:Facility ; ## was ## Site + :qualifiedBy . ## was ## Independent Continuant -local:bldgGeographicaLocationOfConfig a :ObjectPropertyDisplayConfig ; +local:facilitySiteOfEventConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "geographic location of" ; + :displayName "site of event" ; vitro:displayRankAnnot 21; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; @@ -1647,4 +1647,4 @@ local:yearAwardedConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 10; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + :propertyGroup . diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 3bf5bebb..276235b9 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -66,12 +66,10 @@ vivo:dateTimeValue "5"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:inPropertyGroupAnnot - ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; vitro:selectFromExistingAnnot "false"^^xsd:boolean . @@ -472,23 +470,27 @@ bibo:Manuscript . owl:sameAs - a owl:ObjectProperty ; + a owl:ObjectProperty ; rdfs:domain owl:Thing ; rdfs:label "mismo que"@es , "same as"@en-US ; rdfs:range owl:Thing ; rdfs:subPropertyOf owl:topObjectProperty ; vitro:displayLimitAnnot "5" ; + vitro:displayRankAnnot + "1"^^xsd:int ; vitro:forceStubDeletionAnnot "false"^^xsd:boolean ; vitro:fullPropertyNameAnnot "sameAs" ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot - "false"^^xsd:boolean ; + "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; + ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; 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 ; vitro:selectFromExistingAnnot @@ -1245,13 +1247,13 @@ obo:IAO_0000007 vivo:expirationDate rdfs:label "expiration date"@en-US ; vitro:displayLimitAnnot - "5"^^xsd:int ; + "1"^^xsd:int ; vitro:displayRankAnnot - "6"^^xsd:int ; + "19"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -2293,7 +2295,7 @@ vivo:description vitro:displayLimitAnnot "3"^^xsd:int ; vitro:displayRankAnnot - "5"^^xsd:int ; + "1"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -2882,7 +2884,11 @@ obo:RO_0000052 . obo:OBI_0000299 - rdfs:label "has specified output"@en-US . + rdfs:label "has specified output"@en-US ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + . vivo:proceedingsOf rdfs:label "proceedings of"@en-US ; @@ -3616,7 +3622,21 @@ bibo:Proceedings . 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 + ; + vitro:inPropertyGroupAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . vivo:publisher rdfs:label "publisher"@en-US ; @@ -6129,13 +6149,13 @@ geo:nameShortES vivo:dateIssued rdfs:label "date issued"@en-US ; vitro:displayLimitAnnot - "5"^^xsd:int ; + "1"^^xsd:int ; vitro:displayRankAnnot - "4"^^xsd:int ; + "19"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -6953,13 +6973,13 @@ vcard:hasSound vivo:dateFiled rdfs:label "date filed"@en-US ; vitro:displayLimitAnnot - "5"^^xsd:int ; + "1"^^xsd:int ; vitro:displayRankAnnot - "4"^^xsd:int ; + "19"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:individualSortDirectionAnnot "desc"^^xsd:string ; vitro:offerCreateNewOptionAnnot @@ -7240,7 +7260,21 @@ obo:ERO_0000918 rdfs:label "related research project"@en-US . 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 + ; + vitro:inPropertyGroupAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . vivo:preferredDisplayOrder rdfs:label "preferred display order"@en-US ; @@ -7486,8 +7520,22 @@ obo:OBI_0000011 rdfs:label "Planned Process"@en-US . 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 + ; + vitro:inPropertyGroupAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + bibo:status rdfs:label "status"@en-US ; vitro:displayLimitAnnot @@ -7567,7 +7615,7 @@ vivo:hasEquipment vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java index bef4eeda..f736c26d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java @@ -50,9 +50,14 @@ public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator i + " ?newVcardInd vcard:hasName ?newVcardName . \n" + " ?newVcardName a vcard:Name . \n" + " ?newVcardName vcard:givenName ?firstName . \n" - + " ?newVcardName vcard:familyName ?lastName . \n" - + " ?newVcardName ?middleName .", - N3_PREFIX + " ?newInd <" + RDFS.label.getURI() + "> ?label ." + + " ?newVcardName vcard:familyName ?lastName . \n", + N3_PREFIX + " ?newInd <" + RDFS.label.getURI() + "> ?label .", + N3_PREFIX + "@prefix vcard: .\n" + + " ?newInd ?newVcardInd . \n" + + " ?newVcardInd a vcard:Individual . \n" + + " ?newVcardInd vcard:hasName ?newVcardName . \n" + + " ?newVcardName a vcard:Name . \n" + + " ?newVcardName ?middleName ." )); config.addNewResource("newInd", vreq.getWebappDaoFactory().getDefaultNamespace());