From 8ec28b71deacbbf44ebf51b00605a530440de8b9 Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Tue, 26 Nov 2013 17:18:39 -0500 Subject: [PATCH 1/2] Continued minor changes in property placement and ordering --- rdf/display/everytime/PropertyConfig.n3 | 128 ++++++++++++------- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 86 ++++++------- 2 files changed, 123 insertions(+), 91 deletions(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index de3a424e..d017dc24 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -513,7 +513,7 @@ local:organizationForTrainingConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationForTrainingGenerator"^^ ; - :propertyGroup . + :propertyGroup . local:adviseeRoleContext a :ConfigContext ; :hasConfiguration local:adviseeRoleConfig ; @@ -722,7 +722,7 @@ local:mailingAddressOrgContext a :ConfigContext ; local:mailingAddressOrgConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-mailingAddress.xml"^^xsd:string ; :displayName "mailing address" ; - vitro:displayRankAnnot 80; + vitro:displayRankAnnot 29; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.SubjectHasMailingAddressGenerator"^^ ; @@ -870,7 +870,7 @@ local:webpageOrgConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; - :propertyGroup . + :propertyGroup . local:webpageInfoContext a :ConfigContext ; :hasConfiguration local:webpageInfoConfig ; @@ -886,7 +886,7 @@ local:webpageInfoConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; - :propertyGroup . + :propertyGroup . local:webpageEventContext a :ConfigContext ; :hasConfiguration local:webpageEventConfig ; @@ -902,7 +902,7 @@ local:webpageEventConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; - :propertyGroup . + :propertyGroup . local:fullNameContext a :ConfigContext ; :hasConfiguration local:fullNameConfig ; @@ -1076,7 +1076,7 @@ local:eventWithinContext a :ConfigContext ; local:eventWithinConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "occurs within event" ; - vitro:displayRankAnnot 13; + vitro:displayRankAnnot 15; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1090,7 +1090,7 @@ local:includesEventContext a :ConfigContext ; local:includesEventConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "includes event" ; - vitro:displayRankAnnot 15; + vitro:displayRankAnnot 16; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1118,7 +1118,7 @@ local:seriesForEventContext a :ConfigContext ; local:seriesForEventConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "events in this series" ; - vitro:displayRankAnnot 17; + vitro:displayRankAnnot 18; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1133,11 +1133,25 @@ local:eventLocationContext a :ConfigContext ; local:eventLocationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "has geographic location" ; + :displayName "held in geographic location" ; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . + +local:eventInFacilityContext a :ConfigContext ; + :hasConfiguration local:eventInFacilityConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedBy vivo:Facility . + +local:eventInFacilityConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "held in facility" ; + vitro:displayRankAnnot 29; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . local:organizationLocationContext a :ConfigContext ; :hasConfiguration local:organizationLocationConfig ; @@ -1153,19 +1167,19 @@ local:organizationLocationConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . -local:equipmentInFacilityContext a :ConfigContext ; - :hasConfiguration local:equipmentInFacilityConfig ; +local:materialEntityInFacilityContext a :ConfigContext ; + :hasConfiguration local:materialEntityInFacilityConfig ; :configContextFor ; - :qualifiedByDomain vivo:Equipment ; + :qualifiedByDomain ; :qualifiedBy vivo:Facility . -local:equipmentInFacilityConfig a :ObjectPropertyDisplayConfig ; +local:materialEntityInFacilityConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "in facility" ; + :displayName "housed in facility" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + :propertyGroup . local:hasRoomContext a :ConfigContext ; :hasConfiguration local:hasRoomConfig ; @@ -1197,19 +1211,6 @@ local:roomWithinBuildingConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . -local:facilityWithinBuildingContext a :ConfigContext ; - :hasConfiguration local:facilityWithinBuildingConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Facility ; - :qualifiedBy . - -local:facilityWithinBuildingConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "facility of" ; - vitro:displayRankAnnot 15; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . local:geographicLocationContainsBuildingContext a :ConfigContext ; :hasConfiguration local:geographicalLocationContainsBuildingConfig ; @@ -1219,7 +1220,7 @@ local:geographicLocationContainsBuildingContext a :ConfigContext ; local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "location of building" ; + :displayName "geographical location for facility" ; vitro:displayRankAnnot 26; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; @@ -1228,7 +1229,7 @@ local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ; local:bldgGeographicallyWithinContext a :ConfigContext ; :hasConfiguration local:bldgGeographicallyWithinConfig ; :configContextFor ; - :qualifiedByDomain ; + :qualifiedByDomain ; ## Site :qualifiedBy vivo:GeographicLocation . local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; @@ -1238,34 +1239,65 @@ local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . + +local:projectUsesMaterialEntityContext a :ConfigContext ; + :hasConfiguration local:projectUsesMaterialEntityConfig ; + :configContextFor ; + :qualifiedByDomain vivo:Project ; + :qualifiedBy . ## Material Entity -local:bldgEquipmentLocationContext a :ConfigContext ; - :hasConfiguration local:bldgEquipmentLocationConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Facility ; - :qualifiedBy vivo:Equipment . - -local:bldgEquipmentLocationConfig a :ObjectPropertyDisplayConfig ; +local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "location of equipment" ; + :displayName "uses equipment or instrument" ; + vitro:displayRankAnnot 85; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . + +local:materialEntityUsedByProjectContext a :ConfigContext ; + :hasConfiguration local:MaterialEntityUsedByProjectConfig ; + :configContextFor ; + :qualifiedByDomain ; ## Material Entity + :qualifiedBy vivo:Project . + +local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "used by project" ; + vitro:displayRankAnnot 85; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . + +local:facilityLocationOfEquipmentContext a :ConfigContext ; + :hasConfiguration local:facilityLocationOfEquipmentConfig ; + :configContextFor ; + :qualifiedByDomain ; ## Site + :qualifiedBy . ## Material Entity + +local:facilityLocationOfEquipmentConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "location of equipment or instrument" ; vitro:displayRankAnnot 14; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + :propertyGroup . -local:bldgGeographicLocationOfContext a :ConfigContext ; - :hasConfiguration local:bldgGeographicLocationOfConfig ; +local:facilityLocationOfServiceContext a :ConfigContext ; + :hasConfiguration local:facilityLocationOfServiceConfig ; :configContextFor ; - :qualifiedByDomain vivo:Facility ; - :qualifiedBy vivo:GeographicLocation . + :qualifiedByDomain vivo:Facility ; + :qualifiedBy vivo:Service . -local:bldgGeographicLocationOfConfig a :ObjectPropertyDisplayConfig ; +local:facilityLocationOfServiceConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "geographic location of" ; + :displayName "facility for service" ; vitro:displayRankAnnot 18; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + :propertyGroup ; + vitro:publicDescriptionAnnot "This relates a facility as being used for a particular service."^^xsd:string ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean . local:courseOfferedByContext a :ConfigContext ; :hasConfiguration local:courseOfferedByConfig ; @@ -1295,7 +1327,7 @@ local:orgOffersCourseConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - :propertyGroup . + :propertyGroup . local:collegeOffersDegreeContext a :ConfigContext ; :hasConfiguration local:collegeOffersDegreeConfig ; @@ -1437,7 +1469,7 @@ local:awardOrHonorReceiptsConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 3; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; - :propertyGroup . + :propertyGroup . local:awardReceiptsContext a :ConfigContext ; :hasConfiguration local:awardReceiptsConfig ; diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index d64d281f..61c445f3 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -1208,7 +1208,17 @@ vcard:Organizational rdfs:label "Organizational"@en-US . obo:ERO_0000774 - rdfs:label "has eligibility requirment"@en-US . + rdfs:label "has eligibility requirement"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "20"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + . vivo:ServiceProvidingLaboratory rdfs:label "Service Providing Lab"@en-US ; @@ -1323,7 +1333,7 @@ bibo:presents vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -2260,11 +2270,11 @@ vivo:contactInformation vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot - "50"^^xsd:int ; + "25"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot @@ -2297,7 +2307,7 @@ vivo:description vitro:displayLimitAnnot "3"^^xsd:int ; vitro:displayRankAnnot - "15"^^xsd:int ; + "5"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -2477,7 +2487,7 @@ vivo:freetextKeyword vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:publicDescriptionAnnot "Intended for a word or short phrase only where no instance of a controlled vocabulary can be identified. Can also be used to help in highlighting subtle difference in work."^^xsd:string . @@ -2530,7 +2540,17 @@ obo:ARG_2000065 rdfs:label "American Board of Allergy and Immunology"@en-US . obo:ERO_0000775 - rdfs:label "has residency requirement"@en-US . + rdfs:label "has residency requirement"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "21"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + . bibo:reviewOf rdfs:label "review of"@en-US ; @@ -2686,7 +2706,7 @@ obo:ERO_0000045 vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - . + . vivo:Division rdfs:label "Division"@en-US ; @@ -3291,7 +3311,7 @@ vcard:honorificSuffix vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -4191,10 +4211,6 @@ vivo:hasFacility "90"^^xsd:int ; vitro:fullPropertyNameAnnot "has facility"^^xsd:string ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -4273,6 +4289,7 @@ vivo:equipmentFor vitro:selectFromExistingAnnot "true"^^xsd:boolean . + geo:codeGAUL rdfs:label "codeGAUL"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -5472,21 +5489,10 @@ bibo:transcriptOf "true"^^xsd:boolean . vivo:facilityFor - rdfs:label "facility for"@en-US ; - vitro:displayLimitAnnot - "5"^^xsd:int ; - vitro:fullPropertyNameAnnot - "facility for"^^xsd:string ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:publicDescriptionAnnot - "This relates a facility as being used for something, e.g. for a particular service."^^xsd:string ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + . bibo:issuer rdfs:label "issuer"@en-US ; @@ -6055,7 +6061,12 @@ vcard:Coresident rdfs:label "Coresident"@en-US . obo:BFO_0000054 - rdfs:label "realized in"@en-US . + rdfs:label "realized in"@en-US ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + . + vivo:College rdfs:label "College"@en-US ; @@ -6745,7 +6756,7 @@ vivo:dateTimeInterval vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot - "19"^^xsd:int ; + "9"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -7512,20 +7523,9 @@ geo:validUntil vitro:hiddenFromDisplayBelowRoleLevelAnnot . - - vivo:equipmentFor - rdfs:label "equipment for"@en-US ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean . vivo:hasEquipment + rdfs:label "has equipment"@en-US ; vitro:displayRankAnnot "80"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -7536,8 +7536,8 @@ vivo:hasEquipment ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - rdfs:label "has equipment"@en-US . + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . rdfs:label "is cited as data source by"@en-US ; From cabd58dd0a3bc8a4d29417fe7f26ca6e04ea7ac6 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 2 Dec 2013 10:57:42 -0500 Subject: [PATCH 2/2] updates for issues VIVO-507 and VIVO-589 --- rdf/display/everytime/PropertyConfig.n3 | 2 +- src/org/vivoweb/webapp/util/ModelUtils.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index d017dc24..6322ed57 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -1467,7 +1467,7 @@ local:awardOrHonorReceiptsConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "receipts" ; vitro:displayRankAnnot 3; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; :propertyGroup . diff --git a/src/org/vivoweb/webapp/util/ModelUtils.java b/src/org/vivoweb/webapp/util/ModelUtils.java index 629d9f52..b59dc4ca 100644 --- a/src/org/vivoweb/webapp/util/ModelUtils.java +++ b/src/org/vivoweb/webapp/util/ModelUtils.java @@ -103,6 +103,7 @@ public class ModelUtils { List properties = new ArrayList(); properties.add(processPropertyURI); properties.add(nonProcessPropertyURI); + properties.add(grantPropertyURI); return properties; } @@ -110,6 +111,7 @@ public class ModelUtils { List properties = new ArrayList(); properties.add(processPropertyInverseURI); properties.add(nonProcessPropertyInverseURI); + properties.add(grantPropertyInverseURI); return properties; } }