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

Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6

Browse source
This commit is contained in:
Jon Corson-Rikert 2013-11-25 10:10:54 -05:00
commit d779300c9d
14 changed files with 161 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

6
productMods/config/listViewConfig-relatedRole.xml
View file

@ -36,9 +36,9 @@
OPTIONAL { ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole .
?indivInRole rdfs:label ?indivLabel
}
OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000055> ?indivInRole .
OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole .
}
OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000055> ?indivInRole .
OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole .
?indivInRole rdfs:label ?indivLabel
}
@ -92,7 +92,7 @@
} UNION {
?subject ?property ?role .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000055> ?indivInRole .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole .
?indivInRole rdfs:label ?indivLabel
}
}

30
productMods/config/listViewConfig-roleContributesTo.xml
View file

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt
This list view used for both roleContributesTo and BFO_0000054, which
is for events.
-->
<list-view-config>
<query-select>
@ -31,6 +34,13 @@
?activity vitro:mostSpecificType ?subclass
</collated>
}
OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity rdfs:label ?activityLabel
<collated>
?activity vitro:mostSpecificType ?subclass
</collated>
}
OPTIONAL { ?role rdfs:label ?roleLabel }
OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
@ -61,6 +71,24 @@
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a ?objectType .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity vitro:mostSpecificType ?subclass .
} WHERE {
?subject ?property ?role .
?role a ?objectType .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity vitro:mostSpecificType ?subclass
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;

2
productMods/js/latLongJson.js
View file

File diff suppressed because one or more lines are too long

14
productMods/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl Normal file
View file

@ -0,0 +1,14 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- List of research areas for the individual -->
<#assign geographicFoci = propertyGroups.pullProperty("${core}geographicFocus")!>
<#if geographicFoci?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#assign localName = geographicFoci.localName>
<h2 id="${localName}" class="mainPropGroup" style="clear:left">
${geographicFoci.name?capitalize}
<@p.addLink geographicFoci editable /> <@p.verboseDisplay geographicFoci />
</h2>
<ul id="individual-hasResearchArea" role="list" >
<@p.objectProperty geographicFoci editable />
</ul>
</#if>

17
productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
View file

@ -28,25 +28,16 @@
so use the type label instead if not collated by subclass.
-->
<#local roleLabel>
<#--
Display, e.g., "Principal Investigator" for "Principal Investigator Role", "Editor" for "Editor Role".
This information is redundant if the property is collated, since it appears in the subclass label.
-->
<#if statement.roleTypeLabel?has_content>
<#assign roleTypeLabel = statement.roleTypeLabel >
<#else>
<#assign roleTypeLabel = "" >
<#assign roleTypeLabel = statement.roleTypeLabel!"" >
</#if>
<#if statement.roleLabel?has_content>
<#if statement.roleLabel?lower_case?replace(" role", "") != roleTypeLabel?lower_case?replace(" role", "")>
${statement.roleLabel?replace(" Role", "")}
</#if>
<#elseif (! property.collatedBySubclass ) && roleTypeLabel?has_content>
<#if statement.roleLabel??>
${statement.roleLabel?replace(" Role", "")?replace(" role","")}
<#elseif !property.collatedBySubclass >
${roleTypeLabel?replace(" Role", "")}
</#if>
</#local>
${linkedIndividual}&nbsp;${roleLabel!}&nbsp;<@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>

6
rdf/tbox/filegraph/dataset.owl
View file

@ -10,9 +10,9 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:core="http://vivoweb.org/ontology/core#">
<!-- http://purl.obolibrary.org/obo/TODO_Dataset -->
<!-- http://vivoweb.org/ontology/core#Dataset -->
<owl:Class rdf:about="http://purl.obolibrary.org/obo/TODO_Dataset">
<owl:Class rdf:about="http://vivoweb.org/ontology/core#Dataset">
<rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A named collection of data, usually containing only one type of data</obo:IAO_0000115>
@ -31,7 +31,7 @@
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="http://purl.org/spar/cito/citesAsDataSource"/>
<owl:allValuesFrom rdf:resource="http://purl.obolibrary.org/obo/TODO_Dataset"/>
<owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#Dataset"/>
</owl:Restriction>
</rdfs:subClassOf>
</owl:Class>

1
rdf/tbox/filegraph/linkSuppression.n3
View file

@ -10,3 +10,4 @@ core:hasResearchArea config:deleteLinkSuppressed "true"^^xsd:boolean .
core:researchAreaOf config:deleteLinkSuppressed "true"^^xsd:boolean .
core:hasSubjectArea config:deleteLinkSuppressed "true"^^xsd:boolean .
core:subjectAreaFor config:deleteLinkSuppressed "true"^^xsd:boolean .
core:geographicFocusOf config:editLinkSuppressed "true"^^xsd:boolean .

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

@ -1628,7 +1628,7 @@ geo:population
vcard:Geographical
rdfs:label "Geographical"@en-US .
obo:TODO_Dataset
vivo:Dataset
rdfs:label "Dataset"@en-US ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> ;
vitro:displayLimitAnnot

136
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
View file

@ -1,68 +1,68 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
public class AddOrganizerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
private static String template = "addOrganizerRoleToPerson.ftl";
@Override
String getTemplate() {
return template;
}
@Override
String getRoleType() {
return "http://vivoweb.org/ontology/core#OrganizerRole";
}
//Organizer role involves hard-coded options for the "right side" of the role or activity
@Override
FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
return new ConstantFieldOptions(
"","Select type",
"http://purl.org/NET/c4dm/event.owl#Event", "Event",
"http://vivoweb.org/ontology/core#Competition", "Competition",
"http://purl.org/ontology/bibo/Conference", "Conference",
"http://vivoweb.org/ontology/core#Course", "Course",
"http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
"http://purl.org/ontology/bibo/Hearing", "Hearing",
"http://purl.org/ontology/bibo/Interview", "Interview",
"http://vivoweb.org/ontology/core#Meeting", "Meeting",
"http://purl.org/ontology/bibo/Performance", "Performance",
"http://vivoweb.org/ontology/core#Presentation", "Presentation",
"http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
"http://purl.org/ontology/bibo/Workshop", "Workshop",
"http://vivoweb.org/ontology/core#EventSeries", "Event Series",
"http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
"http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
"http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
}
@Override
boolean isShowRoleLabelField() {
return false;
}
/*
* Use the methods below to change the date/time precision in the
* custom form associated with this generator. When not used, the
* precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
* MINUTE, TIME and NONE.
*/
/*
public String getStartDatePrecision() {
String precision = VitroVocabulary.Precision.MONTH.uri();
return precision;
}
public String getEndDatePrecision() {
String precision = VitroVocabulary.Precision.DAY.uri();
return precision;
}
*/
}
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
public class AddOrganizerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
private static String template = "addOrganizerRoleToPerson.ftl";
@Override
String getTemplate() {
return template;
}
@Override
String getRoleType() {
return "http://vivoweb.org/ontology/core#OrganizerRole";
}
//Organizer role involves hard-coded options for the "right side" of the role or activity
@Override
FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
return new ConstantFieldOptions(
"","Select type",
"http://vivoweb.org/ontology/core#Competition", "Competition",
"http://purl.org/ontology/bibo/Conference", "Conference",
"http://vivoweb.org/ontology/core#Course", "Course",
"http://purl.org/NET/c4dm/event.owl#Event", "Event",
"http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
"http://purl.org/ontology/bibo/Hearing", "Hearing",
"http://purl.org/ontology/bibo/Interview", "Interview",
"http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
"http://vivoweb.org/ontology/core#Meeting", "Meeting",
"http://purl.org/ontology/bibo/Performance", "Performance",
"http://vivoweb.org/ontology/core#Presentation", "Presentation",
"http://purl.org/ontology/bibo/Workshop", "Workshop",
"http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
"http://vivoweb.org/ontology/core#EventSeries", "Event Series",
"http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
"http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
}
@Override
boolean isShowRoleLabelField() {
return false;
}
/*
* Use the methods below to change the date/time precision in the
* custom form associated with this generator. When not used, the
* precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
* MINUTE, TIME and NONE.
*/
/*
public String getStartDatePrecision() {
String precision = VitroVocabulary.Precision.MONTH.uri();
return precision;
}
public String getEndDatePrecision() {
String precision = VitroVocabulary.Precision.DAY.uri();
return precision;
}
*/
}

17
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
View file

@ -33,33 +33,48 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
"http://vivoweb.org/ontology/core#College","College",
"http://vivoweb.org/ontology/core#Committee","Committee",
"http://vivoweb.org/ontology/core#Company","Company",
"http://vivoweb.org/ontology/core#Competition", "Competition",
"http://purl.org/ontology/bibo/Conference", "Conference",
"http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
"http://vivoweb.org/ontology/core#Consortium","Consortium",
"http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
"http://vivoweb.org/ontology/core#Course", "Course",
"http://vivoweb.org/ontology/core#Department","Department",
"http://vivoweb.org/ontology/core#Division","Division",
"http://purl.org/NET/c4dm/event.owl#Event","Event",
"http://vivoweb.org/ontology/core#EventSeries", "Event Series",
"http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
"http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
"http://vivoweb.org/ontology/core#Foundation","Foundation",
"http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
"http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
"http://xmlns.com/foaf/0.1/Group","Group",
"http://purl.org/ontology/bibo/Hearing", "Hearing",
"http://vivoweb.org/ontology/core#Hospital","Hospital",
"http://vivoweb.org/ontology/core#Institute","Institute",
"http://purl.org/ontology/bibo/Interview", "Interview",
"http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
"http://vivoweb.org/ontology/core#Laboratory","Laboratory",
"http://vivoweb.org/ontology/core#Library","Library",
"http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
"http://vivoweb.org/ontology/core#Meeting", "Meeting",
"http://vivoweb.org/ontology/core#Museum","Museum",
"http://xmlns.com/foaf/0.1/Organization","Organization",
"http://purl.org/ontology/bibo/Performance", "Performance",
"http://vivoweb.org/ontology/core#Presentation", "Presentation",
"http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
"http://vivoweb.org/ontology/core#Program","Program",
"http://vivoweb.org/ontology/core#Publisher","Publisher",
"http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
"http://vivoweb.org/ontology/core#School","School",
"http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
"http://vivoweb.org/ontology/core#Team","Team",
"http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
"http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
"http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
"http://vivoweb.org/ontology/core#University","University");
"http://vivoweb.org/ontology/core#University","University",
"http://purl.org/ontology/bibo/Workshop", "Workshop",
"http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
}
@Override

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

@ -902,7 +902,7 @@ public class AddPublicationToPersonGenerator extends VivoBaseGenerator implement
literalOptions.add(list("http://vivoweb.org/ontology/core#ConferencePaper", "Conference Paper"));
literalOptions.add(list("http://vivoweb.org/ontology/core#ConferencePoster", "Conference Poster"));
literalOptions.add(list("http://vivoweb.org/ontology/core#Database", "Database"));
literalOptions.add(list("http://purl.obolibrary.org/obo/TODO_Dataset", "Dataset"));
literalOptions.add(list("http://vivoweb.org/ontology/core#Dataset", "Dataset"));
literalOptions.add(list("http://purl.org/ontology/bibo/EditedBook", "Edited Book"));
literalOptions.add(list("http://vivoweb.org/ontology/core#EditorialArticle", "Editorial Article"));
literalOptions.add(list("http://purl.org/ontology/bibo/Film", "Film"));

17
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
View file

@ -31,33 +31,48 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
"http://vivoweb.org/ontology/core#College","College",
"http://vivoweb.org/ontology/core#Committee","Committee",
"http://vivoweb.org/ontology/core#Company","Company",
"http://vivoweb.org/ontology/core#Competition", "Competition",
"http://purl.org/ontology/bibo/Conference", "Conference",
"http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
"http://vivoweb.org/ontology/core#Consortium","Consortium",
"http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
"http://vivoweb.org/ontology/core#Course", "Course",
"http://vivoweb.org/ontology/core#Department","Department",
"http://vivoweb.org/ontology/core#Division","Division",
"http://purl.org/NET/c4dm/event.owl#Event","Event",
"http://vivoweb.org/ontology/core#EventSeries", "Event Series",
"http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
"http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
"http://vivoweb.org/ontology/core#Foundation","Foundation",
"http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
"http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
"http://xmlns.com/foaf/0.1/Group","Group",
"http://purl.org/ontology/bibo/Hearing", "Hearing",
"http://vivoweb.org/ontology/core#Hospital","Hospital",
"http://vivoweb.org/ontology/core#Institute","Institute",
"http://purl.org/ontology/bibo/Interview", "Interview",
"http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
"http://vivoweb.org/ontology/core#Laboratory","Laboratory",
"http://vivoweb.org/ontology/core#Library","Library",
"http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
"http://vivoweb.org/ontology/core#Meeting", "Meeting",
"http://vivoweb.org/ontology/core#Museum","Museum",
"http://xmlns.com/foaf/0.1/Organization","Organization",
"http://purl.org/ontology/bibo/Performance", "Performance",
"http://vivoweb.org/ontology/core#Presentation", "Presentation",
"http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
"http://vivoweb.org/ontology/core#Program","Program",
"http://vivoweb.org/ontology/core#Publisher","Publisher",
"http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
"http://vivoweb.org/ontology/core#School","School",
"http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
"http://vivoweb.org/ontology/core#Team","Team",
"http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
"http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
"http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
"http://vivoweb.org/ontology/core#University","University");
"http://vivoweb.org/ontology/core#University","University",
"http://purl.org/ontology/bibo/Workshop", "Workshop",
"http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
}
@Override

3
themes/wilma/templates/individual--foaf-person.ftl
View file

@ -96,6 +96,9 @@
<!-- Research Areas -->
<#include "individual-researchAreas.ftl">
<!-- Geographic Focus -->
<#include "individual-geographicFocus.ftl">
<#include "individual-openSocial.ftl">
</section>