diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index c4877446..af9f9bdf 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -1119,6 +1119,16 @@ /admin/sparqlquery + + SparqlUpdateApi + edu.cornell.mannlib.vitro.webapp.controller.api.SparqlUpdateApiController + + + + SparqlUpdateApi + /api/sparqlUpdate + + StandardVisualizationController edu.cornell.mannlib.vitro.webapp.controller.visualization.StandardVisualizationController diff --git a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js b/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js index acf69156..88cba06f 100644 --- a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js +++ b/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js @@ -83,7 +83,7 @@ var adviseeRelUtils = { // we don't want the user to see the label getting built, so hide the acSelector // field and display a bogus field that just has the last name in it. this.fauxLabel.val(lastName); - this.advisee.hide(); + this.advisor.hide(); this.fauxLabel.show(); this.advisor.val(name); this.lastName.val(lastName); diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl index 81f38396..c4f0b1d0 100644 --- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl +++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl @@ -11,7 +11,6 @@ <#assign deleteWebpageUrl=editConfiguration.pageData.deleteWebpageUrl!"deleteWebpageUrl is undefined"> <#assign showAddFormUrl=editConfiguration.pageData.showAddFormUrl!"showAddFormUrl is undefined"> <#assign predicateUri=editConfiguration.predicateUri!"undefined"> -<#assign domainUri = editConfiguration.predicateProperty.domainVClassURI!""> <#if (editConfiguration.pageData.subjectName??) >

${editConfiguration.pageData.subjectName}

@@ -57,7 +56,7 @@ <#-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel. These can just be ordinary links, rather than a v:input element, as in addAuthorsToInformationResource.jsp. --> - ${i18n().add_new_web_page} + ${i18n().add_new_web_page} ${i18n().return_to_profile} diff --git a/productMods/templates/freemarker/lib/lib-home-page.ftl b/productMods/templates/freemarker/lib/lib-home-page.ftl index 5a5f16db..9d46e731 100644 --- a/productMods/templates/freemarker/lib/lib-home-page.ftl +++ b/productMods/templates/freemarker/lib/lib-home-page.ftl @@ -71,7 +71,7 @@ <#if !firstPopulatedClassGroup??> <#assign firstPopulatedClassGroup = group /> - <#if group.displayName != "equipment" && group.displayName != "courses" > + <#if !group.uri?contains("equipment") && !group.uri?contains("course") >

  • @@ -91,7 +91,6 @@ <#assign groupCount = groupCount + 1> - diff --git a/rdf/abox/filegraph/continents.n3 b/rdf/abox/filegraph/continents.n3 index 77c6a955..b77a8c80 100644 --- a/rdf/abox/filegraph/continents.n3 +++ b/rdf/abox/filegraph/continents.n3 @@ -8,4 +8,4 @@ geo:Australia_and_New_Zealand rdf:type core:Continent . geo:Europe rdf:type core:Continent . geo:South_America rdf:type core:Continent . geo:northern_America rdf:type core:Continent . -geo:Oceania rdf:type core:Continent . +geo:Antarctica rdf:type core:Continent . diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index cfdeb630..8c5b81d0 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 ; @@ -634,6 +634,8 @@ local:orgAdministersGrantConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 62; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationAdministersGrantGenerator"^^ ; :propertyGroup . @@ -722,7 +724,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 +872,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 +888,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 +904,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 ; @@ -950,6 +952,8 @@ local:outputOfConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 80 ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . local:hasOutputContext a :ConfigContext ; @@ -964,6 +968,8 @@ local:hasOutputConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 80 ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . @@ -1009,6 +1015,8 @@ local:documentPartOfConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 52; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; :propertyGroup . local:geographicLocationContainsLocationContext a :ConfigContext ; @@ -1023,6 +1031,8 @@ local:geographicLocationContainsLocationConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 81; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; :propertyGroup . local:geographicLocationWithinLocationContext a :ConfigContext ; @@ -1035,6 +1045,8 @@ local:geographicLocationWithinLocationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "part of" ; vitro:displayRankAnnot 82; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1049,6 +1061,8 @@ local:hasSubOrganizationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "has sub-organization" ; vitro:displayRankAnnot 15; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1063,6 +1077,8 @@ local:subOrganizationWithinConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "organization within" ; vitro:displayRankAnnot 20; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1076,7 +1092,9 @@ 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:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1090,7 +1108,9 @@ local:includesEventContext a :ConfigContext ; local:includesEventConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "includes event" ; - vitro:displayRankAnnot 15; + vitro:displayRankAnnot 16; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1105,20 +1125,22 @@ local:inEventSeriesConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "in event series" ; vitro:displayRankAnnot 17; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . -local:seriesForEventContext a :ConfigContext ; - :hasConfiguration local:seriesForEventConfig ; +local:eventsForSeriesContext a :ConfigContext ; + :hasConfiguration local:eventsForSeriesConfig ; :configContextFor ; :qualifiedByDomain ; :qualifiedBy . -local:seriesForEventConfig a :ObjectPropertyDisplayConfig ; +local:eventsForSeriesConfig 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 ; @@ -1127,45 +1149,83 @@ local:seriesForEventConfig a :ObjectPropertyDisplayConfig ; local:eventLocationContext a :ConfigContext ; :hasConfiguration local:eventLocationConfig ; - :configContextFor ; + :configContextFor ; ## located in :qualifiedByDomain ; :qualifiedBy vivo:GeographicLocation . 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 ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + :propertyGroup . + +local:eventInFacilityContext a :ConfigContext ; + :hasConfiguration local:eventInFacilityConfig ; + :configContextFor ; ## located in + :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 ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . -local:organizationLocationContext a :ConfigContext ; - :hasConfiguration local:organizationLocationConfig ; - :configContextFor ; - :qualifiedByDomain ; - :qualifiedBy vivo:GeographicLocation . +local:agentInGeoLocationContext a :ConfigContext ; + :hasConfiguration local:agentInGeoLocationConfig ; + :configContextFor ; ## located in + :qualifiedByDomain ; + :qualifiedBy vivo:GeographicLocation . -local:organizationLocationConfig a :ObjectPropertyDisplayConfig ; +local:agentInGeoLocationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "geographic location" ; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . -local:equipmentInFacilityContext a :ConfigContext ; - :hasConfiguration local:equipmentInFacilityConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Equipment ; +local:agentInFacilityContext a :ConfigContext ; + :hasConfiguration local:agentInFacilityConfig ; + :configContextFor ; ## located in + :qualifiedByDomain ; + :qualifiedBy vivo:Facility . + +local:agentInFacilityConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "located in facility" ; + vitro:displayRankAnnot 32; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + :propertyGroup . + +local:materialEntityInFacilityContext a :ConfigContext ; + :hasConfiguration local:materialEntityInFacilityConfig ; + :configContextFor ; ## located in + :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 . + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + :propertyGroup . local:hasRoomContext a :ConfigContext ; :hasConfiguration local:hasRoomConfig ; @@ -1176,7 +1236,7 @@ local:hasRoomContext a :ConfigContext ; local:hasRoomConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "rooms" ; - vitro:displayRankAnnot 22; + vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1195,63 +1255,139 @@ local:roomWithinBuildingConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 23; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . + local:geographicLocationContainsBuildingContext a :ConfigContext ; - :hasConfiguration local:geographicalLocationContainsBuildingConfig ; + :hasConfiguration local:geographicLocationContainsBuildingConfig ; :configContextFor ; :qualifiedByDomain vivo:GeographicLocation ; :qualifiedBy vivo:Building . local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "location of building" ; - vitro:displayRankAnnot 26; + :displayName "location of facility" ; + vitro:displayRankAnnot 85; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . -local:bldgGeographicallyWithinContext a :ConfigContext ; - :hasConfiguration local:bldgGeographicallyWithinConfig ; +local:siteGeographicallyWithinGeoLocationContext a :ConfigContext ; + :hasConfiguration local:siteGeographicallyWithinGeoLocationConfig ; :configContextFor ; - :qualifiedByDomain vivo:Building ; + :qualifiedByDomain ; ## Site :qualifiedBy vivo:GeographicLocation . -local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; +local:siteGeographicallyWithinGeoLocationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "geographically within" ; + vitro:displayRankAnnot 40; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + :propertyGroup . + +local:facilitySiteOfEventContext a :ConfigContext ; + :hasConfiguration local:facilitySiteOfEventConfig ; + :configContextFor ; ## location of + :qualifiedByDomain vivo:Facility ; ## was ## Site + :qualifiedBy . ## was ## Independent Continuant + +local:facilitySiteOfEventConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "facility for event" ; + vitro:displayRankAnnot 22; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + :propertyGroup . + +local:facilitySiteOfAgentContext a :ConfigContext ; + :hasConfiguration local:facilitySiteOfAgentConfig ; + :configContextFor ; ## location of + :qualifiedByDomain vivo:Facility ; ## was ## Site + :qualifiedBy . ## was ## Independent Continuant + +local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "facility for person, group, or organization" ; vitro:displayRankAnnot 20; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + :propertyGroup . + +local:projectUsesMaterialEntityContext a :ConfigContext ; + :hasConfiguration local:projectUsesMaterialEntityConfig ; + :configContextFor ; + :qualifiedByDomain vivo:Project ; + :qualifiedBy . ## Material Entity + +local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "uses equipment or instrument" ; + vitro:displayRankAnnot 85; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + :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 ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . -local:bldgEquipmentLocationContext a :ConfigContext ; - :hasConfiguration local:bldgEquipmentLocationConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Facility ; - :qualifiedBy vivo:Equipment . +local:facilityLocationOfEquipmentContext a :ConfigContext ; + :hasConfiguration local:facilityLocationOfEquipmentConfig ; + :configContextFor ; ## location of + :qualifiedByDomain ; ## Site + :qualifiedBy . ## Material Entity -local:bldgEquipmentLocationConfig a :ObjectPropertyDisplayConfig ; +local:facilityLocationOfEquipmentConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "location of equipment" ; + :displayName "location of equipment or instrument" ; vitro:displayRankAnnot 14; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + :propertyGroup . -local:bldgGeographicLocationOfContext a :ConfigContext ; - :hasConfiguration local:bldgGeographicLocationOfConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Facility ; - :qualifiedBy vivo:GeographicLocation . +local:facilityLocationOfServiceContext a :ConfigContext ; + :hasConfiguration local:facilityLocationOfServiceConfig ; + :configContextFor ; ## location of + :qualifiedByDomain vivo:Facility ; + :qualifiedBy . -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 ; @@ -1265,6 +1401,8 @@ local:courseOfferedByConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . local:orgOffersCourseContext a :ConfigContext ; @@ -1281,7 +1419,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 ; @@ -1381,6 +1519,8 @@ local:grantHasSubgrantConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . local:grantIsSubgrantOfContext a :ConfigContext ; @@ -1395,6 +1535,8 @@ local:grantIsSubgrantOfConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 32; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . local:grantGeographicFocusContext a :ConfigContext ; @@ -1409,6 +1551,8 @@ local:grantGeographicFocusConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 20; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . local:awardOrHonorReceiptsContext a :ConfigContext ; @@ -1421,9 +1565,9 @@ 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 . + :propertyGroup . local:awardReceiptsContext a :ConfigContext ; :hasConfiguration local:awardReceiptsConfig ; @@ -1498,7 +1642,7 @@ local:orgAwardsGrantConfig a :ObjectPropertyDisplayConfig ; local:addressLocationContext a :ConfigContext ; :hasConfiguration local:addressLocationConfig ; - :configContextFor ; + :configContextFor ; ## located in :qualifiedByDomain ; :qualifiedBy vivo:GeographicLocation . @@ -1508,6 +1652,7 @@ local:addressLocationConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; :propertyGroup . ### roles using the BFO_0000055 property ### @@ -1569,4 +1714,4 @@ local:yearAwardedConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 10; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + :propertyGroup . diff --git a/rdf/tbox/filegraph/classes-additional.owl b/rdf/tbox/filegraph/classes-additional.owl index d79fbefa..c22a4c8b 100644 --- a/rdf/tbox/filegraph/classes-additional.owl +++ b/rdf/tbox/filegraph/classes-additional.owl @@ -902,7 +902,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rdf/tbox/filegraph/dataDomains.rdf b/rdf/tbox/filegraph/dataDomains.rdf index 3ad46a2b..9526dba1 100644 --- a/rdf/tbox/filegraph/dataDomains.rdf +++ b/rdf/tbox/filegraph/dataDomains.rdf @@ -33,7 +33,14 @@ - + + + + + + + + @@ -48,7 +55,14 @@ - + + + + + + + + @@ -69,7 +83,14 @@ - + + + + + + + + @@ -90,7 +111,14 @@ - + + + + + + + + diff --git a/rdf/tbox/filegraph/geo-political.owl b/rdf/tbox/filegraph/geo-political.owl index 115b7009..43d4c5ac 100644 --- a/rdf/tbox/filegraph/geo-political.owl +++ b/rdf/tbox/filegraph/geo-political.owl @@ -738,7 +738,7 @@ - + United Nations statistics department http://unstats.un.org/unsd/methods/m49/m49regin.htm @@ -1081,8 +1081,7 @@ - - + A large contiguous landmass that is at least partially surrounded by water, together with any islands on its continental shelf. Short Definition take from http://en.wiktionary.org/wiki/continent. The seven commonly recognized continents are Africa; Antarctica; Asia; Australia; Europe; North America; South America @@ -1155,21 +1154,7 @@ Smaller administrative division into which a country may be divided. - - - - - - - - Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. - None as yet. - Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. - sub-Saharan Africa, North America - - - diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index b7863d57..6820cc96 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -1580,6 +1580,7 @@ there is a measurement process p that has specified output m, a measurement datu Public Definition source (http://www.answers.com/topic/publisher). + diff --git a/rdf/tbox/filegraph/object-properties3.owl b/rdf/tbox/filegraph/object-properties3.owl index 793b44c5..73dce86b 100644 --- a/rdf/tbox/filegraph/object-properties3.owl +++ b/rdf/tbox/filegraph/object-properties3.owl @@ -387,6 +387,7 @@ + @@ -613,7 +614,7 @@ - + diff --git a/rdf/tbox/filegraph/objectRanges.rdf b/rdf/tbox/filegraph/objectRanges.rdf index dc75e58f..165d888e 100644 --- a/rdf/tbox/filegraph/objectRanges.rdf +++ b/rdf/tbox/filegraph/objectRanges.rdf @@ -36,7 +36,14 @@ - + + + + + + + + diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index d64d281f..139583c1 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 . @@ -267,16 +265,8 @@ bibo:sici "The Serial Item and Contribution Identifier (SICI) is a code (ANSI/NISO standard Z39.56) used to uniquely identify specific volumes, articles or other identifiable parts of a periodical."^^xsd:string . vivo:Licensure - rdfs:label "Licensure"@en-US ; - vitro:displayLimitAnnot - "5"^^xsd:int ; - vitro:displayRankAnnot - "5"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + rdfs:label "Licensure"@en-US . + vivo:inPress rdfs:label "in press"@en-US . @@ -409,7 +399,8 @@ obo:OBI_0000643 rdfs:label "has grain"@en-US . obo:OBI_0000272 - rdfs:label "Protocol"@en-US . + rdfs:label "Protocol"@en-US ; + vitro:inClassGroup . vcard:Identification rdfs:label "Identification"@en-US . @@ -479,29 +470,33 @@ 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 "true"^^xsd:boolean ; vitro:stubObjectPropertyAnnot - "true"^^xsd:boolean . + "false"^^xsd:boolean . vcard:hasTimeZone rdfs:label "has time zone"@en-US . @@ -786,7 +781,8 @@ vcard:locality rdfs:label "locality"@en-US . obo:ERO_0000005 - rdfs:label "Service"@en-US . + rdfs:label "Service"@en-US ; + vitro:inClassGroup . vitro:moniker rdfs:label "moniker (deprecated)"@en-US ; @@ -1023,7 +1019,8 @@ geo:nameOfficialRU . obo:ERO_0001255 - rdfs:label "Support Service"@en-US . + rdfs:label "Support Service"@en-US ; + vitro:inClassGroup . vivo:features rdfs:label "features"@en-US ; @@ -1037,6 +1034,8 @@ vivo:features ; vitro:inPropertyGroupAnnot ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot @@ -1068,16 +1067,7 @@ vivo:featuredIn "true"^^xsd:boolean . vivo:Certification - rdfs:label "Certification"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "2"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + rdfs:label "Certification"@en-US . vivo:ClinicalRole rdfs:label "Clinical Role"@en-US ; @@ -1182,7 +1172,8 @@ geo:nameCurrencyRU . obo:ERO_0001254 - rdfs:label "Transport Service"@en-US . + rdfs:label "Transport Service"@en-US ; + vitro:inClassGroup . vcard:Child rdfs:label "Child"@en-US . @@ -1208,7 +1199,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 ; @@ -1243,13 +1244,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 @@ -1309,7 +1310,8 @@ owl:DeprecatedProperty rdfs:label "deprecated property"@en-US . obo:ERO_0001257 - rdfs:label "Data Storage Service"@en-US . + rdfs:label "Data Storage Service"@en-US ; + vitro:inClassGroup . vcard:Kind rdfs:label "VCard Kind"@en-US . @@ -1323,7 +1325,7 @@ bibo:presents vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -1442,7 +1444,8 @@ vivo:Position . obo:ERO_0001256 - rdfs:label "Material Storage Service"@en-US . + rdfs:label "Material Storage Service"@en-US ; + vitro:inClassGroup . geo:GDPYear rdfs:label "GDPYear"@en-US ; @@ -1496,18 +1499,8 @@ vivo:localAwardId "An institution's local identifier assigned to a grant awarded."^^xsd:string . vivo:IssuedCredential - rdfs:label "Issued Credential"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "2"^^xsd:int ; - vitro:extendedLinkedData - "true"^^xsd:boolean ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + rdfs:label "Issued Credential"@en-US . + obo:ARG_0000197 rdfs:label "health care provider ID"@en-US ; @@ -1591,7 +1584,8 @@ vivo:publisherOf "true"^^xsd:boolean . obo:ERO_0001259 - rdfs:label "Material Maintenance Service"@en-US . + rdfs:label "Material Maintenance Service"@en-US ; + vitro:inClassGroup . vcard:Home rdfs:label "Home"@en-US . @@ -1654,7 +1648,7 @@ vivo:Contract "-1"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:inClassGroup ; + vitro:inClassGroup ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot . @@ -1671,7 +1665,8 @@ bibo:Hearing . obo:ERO_0001258 - rdfs:label "Maintenance Service"@en-US . + rdfs:label "Maintenance Service"@en-US ; + vitro:inClassGroup . obo:UO_0000280 rdfs:label "Rate Unit"@en-US . @@ -2260,11 +2255,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 +2292,7 @@ vivo:description vitro:displayLimitAnnot "3"^^xsd:int ; vitro:displayRankAnnot - "15"^^xsd:int ; + "1"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -2375,7 +2370,8 @@ vivo:grantSubcontractedThrough "true"^^xsd:boolean . obo:ERO_0001260 - rdfs:label "Data Maintenance Service"@en-US . + rdfs:label "Data Maintenance Service"@en-US ; + vitro:inClassGroup . vcard:hasNickname rdfs:label "has nickname"@en-US . @@ -2477,7 +2473,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 . @@ -2524,13 +2520,24 @@ obo:ERO_0000044 rdfs:label "has inventory number"@en-US . obo:ERO_0001261 - rdfs:label "Analysis Service"@en-US . + rdfs:label "Analysis Service"@en-US ; + vitro:inClassGroup . 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 ; @@ -2554,7 +2561,8 @@ bibo:reviewOf "true"^^xsd:boolean . obo:ERO_0001263 - rdfs:label "Material Modification Service"@en-US . + rdfs:label "Material Modification Service"@en-US ; + vitro:inClassGroup . vivo:informationResourceSupportedBy rdfs:label "supported by"@en-US , "supported by"@en-US ; @@ -2685,8 +2693,12 @@ obo:ERO_0000045 ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; - vitro:inPropertyGroupAnnot - . + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . vivo:Division rdfs:label "Division"@en-US ; @@ -2713,13 +2725,15 @@ vivo:Newsletter . obo:ERO_0001262 - rdfs:label "Data Analysis Service"@en-US . + rdfs:label "Data Analysis Service"@en-US ; + vitro:inClassGroup . vcard:hasKey rdfs:label "has key"@en-US . obo:ERO_0000396 - rdfs:label "Material Production Service"@en-US . + rdfs:label "Material Production Service"@en-US ; + vitro:inClassGroup . vcard:TimeZone rdfs:label "Time Zone"@en-US . @@ -2867,7 +2881,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 ; @@ -2909,13 +2927,29 @@ bibo:Thesis . obo:ERO_0000046 - rdfs:label "has geographic restriction"@en-US . + rdfs:label "has geographic restriction"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "32"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . + obo:ARG_2000088 rdfs:label "American Board of Thoracic Surgery"@en-US . obo:ERO_0000395 - rdfs:label "Material Analysis Service"@en-US . + rdfs:label "Material Analysis Service"@en-US ; + vitro:inClassGroup . geo:isSuccessorOf rdfs:label "is successor of"@en-US ; @@ -3017,19 +3051,21 @@ vivo:validIn "2"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . obo:IAO_0000221 rdfs:label "is quality measurement of"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + . bibo:Conference rdfs:label "Conference"@en-US ; @@ -3131,6 +3167,7 @@ obo:ERO_0001520 "90"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -3291,7 +3328,7 @@ vcard:honorificSuffix vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -3582,7 +3619,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 ; @@ -3671,7 +3722,7 @@ vivo:seatingCapacity vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot @@ -4191,10 +4242,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 +4320,7 @@ vivo:equipmentFor vitro:selectFromExistingAnnot "true"^^xsd:boolean . + geo:codeGAUL rdfs:label "codeGAUL"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -4545,12 +4593,20 @@ vivo:hideFromDisplay obo:ERO_0000481 rdfs:label "realizes protocol"@en-US ; + vitro:displayLimitAnnot + "3"^^xsd:int ; + vitro:displayRankAnnot + "85"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . obo:ERO_0000016 rdfs:label "Clinical Trial"@en-US ; @@ -4608,8 +4664,22 @@ vcard:hasURL rdfs:label "has URL"@en-US . obo:ERO_0000482 - rdfs:label "uses software"@en-US . - + rdfs:label "uses software"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "92"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . + vivo:ResearchProposal rdfs:label "Research Proposal"@en-US ; vitro:displayLimitAnnot @@ -4704,14 +4774,20 @@ vcard:RelatedType obo:ERO_0000460 rdfs:label "has documentation"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "90"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:inPropertyGroupAnnot - ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . vivo:EditorRole rdfs:label "Editor Role"@en-US ; @@ -5167,17 +5243,6 @@ obo:ERO_0000783 vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -vivo:TransnationalRegion - rdfs:label "Transnational Region"@en-US ; - vitro:displayLimitAnnot - "-1"^^xsd:int ; - vitro:displayRankAnnot - "-1"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . - vivo:termLabel rdfs:label "term label"@en-US ; vitro:displayRankAnnot @@ -5425,7 +5490,21 @@ vivo:researchOverview . obo:ERO_0000390 - rdfs:label "service provided by"@en-US . + rdfs:label "service provided by"@en-US ; + vitro:displayLimitAnnot + "3"^^xsd:int ; + vitro:displayRankAnnot + "5"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . skos:Concept rdfs:label "Concept"@en-US ; @@ -5472,21 +5551,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 ; @@ -5636,15 +5704,7 @@ vcard:TextPhone obo:ERO_0000391 rdfs:label "Access Service"@en-US ; - vitro:displayLimitAnnot - "-1"^^xsd:int ; - vitro:displayRankAnnot - "20"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + vitro:inClassGroup . vcard:Crush rdfs:label "Crush"@en-US . @@ -5807,15 +5867,8 @@ vcard:Agent obo:ERO_0000392 rdfs:label "Storage Service"@en-US ; - vitro:displayLimitAnnot - "-1"^^xsd:int ; - vitro:displayRankAnnot - "20"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + vitro:inClassGroup . + vivo:translatorOf rdfs:label "translator of"@en-US ; @@ -5849,15 +5902,7 @@ bibo:Document obo:ERO_0000394 rdfs:label "Material Processing Service"@en-US ; - vitro:displayLimitAnnot - "-1"^^xsd:int ; - vitro:displayRankAnnot - "20"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + vitro:inClassGroup . obo:ARG_2000011 rdfs:label "Expertise Measurement Process"@en-US . @@ -5955,7 +6000,8 @@ vivo:GeopoliticalEntity . obo:ERO_0000393 - rdfs:label "Training Service"@en-US . + rdfs:label "Training Service"@en-US ; + vitro:inClassGroup . vivo:sponsors rdfs:label "sponsors award or honor"@en-US ; @@ -6055,7 +6101,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 ; @@ -6082,13 +6133,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 @@ -6745,7 +6796,7 @@ vivo:dateTimeInterval vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot - "19"^^xsd:int ; + "9"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -6906,13 +6957,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 @@ -7193,7 +7244,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 ; @@ -7439,8 +7504,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 @@ -7512,32 +7591,21 @@ 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 ; vitro:inPropertyGroupAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; 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 ; diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java index 90effba9..8911b395 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java @@ -61,11 +61,20 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG config.addFormSpecificData("baseEditWebpageUrl", path); + //Also add domainUri and rangeUri if they exist, adding here instead of template + String domainUri = (String) vreq.getParameter("domainUri"); + String rangeUri = (String) vreq.getParameter("rangeUri"); paramMap = new ParamMap(); paramMap.put("subjectUri", config.getSubjectUri()); paramMap.put("predicateUri", config.getPredicateUri()); paramMap.put("editForm" , this.getEditForm() ); paramMap.put("cancelTo", "manage"); + if(domainUri != null && !domainUri.isEmpty()) { + paramMap.put("domainUri", domainUri); + } + if(rangeUri != null && !rangeUri.isEmpty()) { + paramMap.put("rangeUri", rangeUri); + } path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap); config.addFormSpecificData("showAddFormUrl", path); 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()); 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; } } diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 02326f89..c3f89181 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1069,6 +1069,9 @@ div#adjImgHeight { text-align:center; margin-top:100px; } +#noContentMsg { + clear: both; +} /* FOOTER------> */ footer { clear: both; diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.html new file mode 100644 index 00000000..b48253e9 --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.html @@ -0,0 +1,115 @@ + + + + + + +

    Test the Linked Open Data requests

    + +

    Try various accept headers

    + + + + + +

    Try non-existent URI with RDFXML accept header

    + + + + + +

    Response data

    + +
    Response code is 000
    +
    MIME type is No type
    +
    Text is:
    +
    No text
    \ No newline at end of file diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3 b/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3 new file mode 100644 index 00000000..8f45ec5c --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3 @@ -0,0 +1,56 @@ +@prefix rdfs: . +@prefix xmls: . +@prefix local: . +@prefix vivo: . +@prefix vcard: . +@prefix obo: . + + +local:lodFacultyMember + a vivo:FacultyMember ; + rdfs:label "Example, Bad "^^xmls:string ; + obo:ARG_2000028 local:lodVcard ; + obo:RO_0000053 local:lodMembership ; + vivo:overview "Not someone on whom you should base your actions." ; + vivo:scopusId "10982375409" ; + vivo:eRACommonsId "My_eRA_ID" . + +local:lodVcard + a vcard:Kind , vcard:Individual ; + obo:ARG_2000029 local:lodFacultyMember ; + vcard:hasName local:lodName ; + vcard:hasURL local:lodWebsite . + +local:lodName + a vcard:Name ; + vcard:familyName "Example"^^xmls:string ; + vcard:givenName "Bad"^^xmls:string ; + vcard:honorificPrefix "Mr."^^xmls:string . + +local:lodWebsite + a vcard:URL ; + rdfs:label "Slashdot" ; + vivo:rank "1"^^xmls:int ; + vcard:url "http://www.slashdot.org"^^xmls:anyURI . + +local:lodMembership + a vivo:MemberRole ; + rdfs:label "Bozo"^^xmls:string ; + obo:RO_0000052 local:lodFacultyMember ; + vivo:dateTimeInterval local:lodInterval ; + vivo:roleContributesTo local:lodDepartment . + +local:lodInterval + a vivo:DateTimeInterval ; + vivo:start local:lodStartDate . + +local:lodStartDate + a vivo:DateTimeValue ; + vivo:dateTime "1992-01-01T00:00:00"^^xmls:dateTime ; + vivo:dateTimePrecision vivo:yearPrecision . + +local:lodDepartment + a vivo:AcademicDepartment ; + rdfs:label "Department of Redundancy Department"^^xmls:string ; + vivo:contributingRole local:lodMembership . + diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3 b/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3 new file mode 100644 index 00000000..dc389c21 --- /dev/null +++ b/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3 @@ -0,0 +1,8 @@ +@prefix rdfs: . +@prefix auth: . +@prefix simplePermission: . +@prefix displayByRole: . +@prefix editByRole: . + +auth:ADMIN + auth:hasPermission simplePermission:UseSparqlUpdateApi ; diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html new file mode 100644 index 00000000..dfef47ac --- /dev/null +++ b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html @@ -0,0 +1,163 @@ + + +

    Test the SPARQL API

    + +
    + Get RDF + + +
    + +
    + +
    + +
    + Get RDF + + +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    + + + +
    + +
    + + +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    +200 Success
+400 Failed to parse SPARQL update
+400 SPARQL update must specify a GRAPH URI.
+403 username/password combination is not valid
+403 Account is not authorized
+405 Method not allowed
+500 Unknown error
+
    +