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

Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop

Browse source
This commit is contained in:
Holly Mistlebauer 2013-11-10 18:35:02 -05:00
commit b2f6d6db00
11 changed files with 249 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/example.runtime.properties
View file

@ -181,7 +181,7 @@ RDFService.languageFilter = true
#
# This should not be used with languages.forceLocale, which will override it.
#
# languages.selectableLocales = en, es, fr
# languages.selectableLocales = en_US, es_ES
#
# Tell VIVO to generate HTTP headers on its responses to facilitate caching the

1
languages/example/themes/wilma/i18n/all_es.properties
View file

@ -120,6 +120,7 @@ missing_info_resource = falta de recursos de información
award_receipt_name = Nombre del premio recibido
award_name = Nombre del premio
conferred_by = conferida por
conferred_on = conferida a
selected_award = Premio Seleccionado
incomplete_date_time_interval = intervalo de la fecha / hora incompleta

136
productMods/config/listViewConfig-awardOrHonorGiven.xml Normal file
View file

@ -0,0 +1,136 @@
<?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 -->
<list-view-config>
<query-select>
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX owl: &lt;http://www.w3.org/2002/07/owl#&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;
SELECT DISTINCT ?awardReceipt
?receiptLabel
?award
?awardLabel
?givenTo
?givenToLabel
?dateTimeStart
?dateTimeEnd
?dateTime
WHERE {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel }
OPTIONAL { ?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel
}
OPTIONAL { ?awardReceipt core:relates ?givenTo .
?givenTo rdfs:label ?givenToLabel
}
OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
} ORDER BY DESC(?dateTime) DESC(?dateTimeEnd)
</query-select>
<query-construct>
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
CONSTRUCT {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel .
?awardReceipt core:relates ?givenTo .
?givenTo rdfs:label ?givenToLabel .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
{
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?givenTo .
?givenTo a foaf:Person .
?givenTo rdfs:label ?givenToLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</query-construct>
<template>propStatement-awardOrHonorGiven.ftl</template>
</list-view-config>

40
productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl Normal file
View file

@ -0,0 +1,40 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Custom object property statement view for faux property "awards and honors". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
-->
<#import "lib-sequence.ftl" as s>
<#import "lib-datetime.ftl" as dt>
<@showAward statement />
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showAward statement>
<#local linkedIndividual>
<#if statement.award??>
<a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!}</a>
<#else>
<a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!}</a>
</#if>
</#local>
<#local dateTimeVal>
<#if statement.dateTime??>
<@dt.yearSpan statement.dateTime! />
<#else>
<@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#if>
</#local>
<#local conferredOn>
<#if statement.givenTo?has_content && statement.givenToLabel?has_content>
${i18n().conferred_on} <a href="${profileUrl(statement.uri("givenTo"))}" title="${i18n().conferred_on}">${statement.givenToLabel}</a>
</#if>
</#local>
<@s.join [ linkedIndividual, conferredOn!, dateTimeVal! ] />
</#macro>

2
productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl
View file

@ -76,7 +76,7 @@
</p>
<p>
<label for="streetAddress">${i18n().street_address} 2 ${requiredHint}</label>
<label for="streetAddress">${i18n().street_address} 2</label>
<input size="40" type="text" id="streetAddressTwo" name="streetAddressTwo" value="" />
<input type="hidden" id="streetAddress" name="streetAddress" value="${streetAddressValue}" />
</p>

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

@ -41,6 +41,8 @@ local:organizationForPositionConfig a :ObjectPropertyDisplayConfig ;
:displayName "people" ;
:listViewConfigFile "listViewConfig-organizationForPosition.xml"^^xsd:string ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ;
vitro:collateBySubclassAnnot
"true"^^xsd:boolean;
vitro:displayRankAnnot 10;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
@ -921,6 +923,20 @@ local:awardReceiptsAwardForConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:awardOrHonorGivenContext a :ConfigContext ;
:hasConfiguration local:awardOrHonorGivenConfig ;
:configContextFor <http://vivoweb.org/ontology/core#assigns> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Organization> ;
:qualifiedBy <http://vivoweb.org/ontology/core#AwardReceipt> .
local:awardOrHonorGivenConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-awardOrHonorGiven.xml"^^xsd:string ;
:displayName "award or honor given" ;
vitro:displayRankAnnot 72;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:addressLocationContext a :ConfigContext ;
:hasConfiguration local:addressLocationConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0001025> ;

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

@ -35,6 +35,7 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
"http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
"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#ExtensionUnit","Extension Unit",
"http://vivoweb.org/ontology/core#Foundation","Foundation",
"http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",

79
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java
View file

@ -29,7 +29,8 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
+ " prefix foaf: <http://xmlns.com/foaf/0.1/> "
+ " prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> "
+ " prefix localNav: <http://vitro.mannlib.cornell.edu/ns/localnav#> "
+ " prefix bibo: <http://purl.org/ontology/bibo/> ";
+ " prefix bibo: <http://purl.org/ontology/bibo/> "
+ " prefix obo: <http://purl.obolibrary.org/obo/> \n" ;
//queries for foaf:Agent
@ -49,14 +50,9 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
" ?uri rdf:type foaf:Agent . " +
" ?uri ?b ?c . " +
" ?c rdf:type core:Position . " +
" ?c core:involvedOrganizationName ?ContextNodeProperty . }");
queriesForAgent.add(prefix + "SELECT " +
"(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" +
" ?uri rdf:type foaf:Agent . " +
" ?uri ?b ?c . " +
" ?c rdf:type core:Position . " +
" ?c core:positionInOrganization ?i . ?i rdfs:label ?ContextNodeProperty . }");
" ?c core:relates ?i . " +
" ?i rdf:type foaf:Organization . " +
" ?i rdfs:label ?ContextNodeProperty . }");
queriesForAgent.add(prefix + "SELECT " +
"(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" +
@ -70,7 +66,6 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
queriesForAgent.add(prefix +
"SELECT " +
"(str(?HRJobTitle) as ?hrJobTitle) " +
"(str(?InvolvedOrganizationName) as ?involvedOrganizationName) " +
"(str(?PositionInOrganization) as ?positionInOrganization) " +
"(str(?TitleOrRole) as ?titleOrRole) WHERE {"
@ -78,8 +73,7 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
+ " ?c rdf:type core:Position . "
+ " OPTIONAL { ?c core:hrJobTitle ?HRJobTitle . } . "
+ " OPTIONAL { ?c core:involvedOrganizationName ?InvolvedOrganizationName . } ."
+ " OPTIONAL { ?c core:positionInOrganization ?i . ?i rdfs:label ?PositionInOrganization . } . "
+ " OPTIONAL { ?c core:relates ?i . ?i rdf:type foaf:Organization . ?i rdfs:label ?PositionInOrganization . } . "
+ " OPTIONAL { ?c core:titleOrRole ?TitleOrRole . } . "
+ " }");
@ -88,36 +82,49 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
queriesForAgent.add(prefix + "SELECT " +
"(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" +
" ?uri rdf:type foaf:Agent ; ?b ?c . " +
" ?c rdf:type core:Relationship . " +
" ?c core:advisee ?d . ?d rdfs:label ?ContextNodeProperty . }");
" ?c rdf:type core:AdvisingRelationship . " +
" ?c rdfs:label ?ContextNodeProperty . }");
queriesForAgent.add(prefix + "SELECT " +
"(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" +
" ?uri rdf:type foaf:Agent ; ?b ?c . " +
" ?c rdf:type core:Relationship . " +
" ?c rdf:type core:AdvisingRelationship . " +
" ?c core:degreeCandidacy ?e . ?e rdfs:label ?ContextNodeProperty . }");
queriesForAgent.add(prefix + "SELECT " +
"(str(?label) as ?adviseeLabel) WHERE {" +
" ?uri rdf:type foaf:Agent ." +
" ?c rdf:type core:Relationship . " +
" ?c core:advisor ?uri . " +
" ?c core:advisee ?d . ?d rdfs:label ?label .}" );
" ?c rdf:type core:AdvisingRelationship . " +
" ?c core:relates ?uri . " +
" ?uri obo:RO_0000053 ?advisorRole . " +
" ?advisorRole rdf:type core:AdvisorRole . " +
" ?c core:relates ?d . " +
" ?d rdf:type foaf:Person . " +
" ?d obo:RO_0000053 ?adviseeRole . " +
" ?adviseeRole rdf:type core:AdviseeRole . " +
" ?d rdfs:label ?ContextNodeProperty . }");
queriesForAgent.add(prefix + "SELECT " +
"(str(?label) as ?advisorLabel) WHERE {" +
" ?uri rdf:type foaf:Agent ." +
" ?c rdf:type core:Relationship . " +
" ?c core:advisee ?uri . " +
" ?c core:advisor ?d . ?d rdfs:label ?label .}" );
" ?c rdf:type core:AdvisingRelationship . " +
" ?c core:relates ?uri . " +
" ?uri obo:RO_0000053 ?adviseeRole . " +
" ?adviseeRole rdf:type core:AdviseeRole . " +
" ?c core:relates ?d . " +
" ?d rdf:type foaf:Person . " +
" ?d obo:RO_0000053 ?advisorRole . " +
" ?advisorRole rdf:type core:AdvisorRole . " +
" ?d rdfs:label ?ContextNodeProperty . }");
/* Author */
queriesForAgent.add(prefix + "SELECT " +
"(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" +
" ?uri rdf:type foaf:Agent ; ?b ?c . " +
" ?c rdf:type core:Relationship . " +
" ?c core:linkedAuthor ?f . " +
" ?c rdf:type core:Authorship . " +
" ?c core:relates ?f . " +
" ?f rdf:type foaf:Person . " +
" ?f rdfs:label ?ContextNodeProperty . " +
" FILTER( ?f != ?uri ) " +
"}");
@ -125,8 +132,9 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
queriesForAgent.add(prefix + "SELECT " +
"(str(?ContextNodeProperty) as ?contextNodeProperty) WHERE {" +
" ?uri rdf:type foaf:Agent ; ?b ?c . " +
" ?c rdf:type core:Relationship . " +
" ?c core:linkedInformationResource ?h . ?h rdfs:label ?ContextNodeProperty . }");
" ?c rdf:type core:Authorship . " +
" ?c core:relates ?h . " +
" ?h rdf:type obo:IAO_0000030 . ?h rdfs:label ?ContextNodeProperty . }");
/* Award */
@ -138,8 +146,8 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
"WHERE {"
+ " ?uri rdf:type foaf:Agent ; ?b ?c . "
+ " ?c rdf:type core:AwardReceipt . "
+ " OPTIONAL { ?c rdfs:label ?AwardLabel . } . "
+ " OPTIONAL { ?c core:awardConferredBy ?d . ?d rdfs:label ?AwardConferredBy . } . "
+ " OPTIONAL { ?c core:relates ?e . ?e rdf:type core:Award . ?e rdfs:label ?AwardLabel . } . "
+ " OPTIONAL { ?c core:assignedBy ?d . ?d rdf:type foaf:Organization . ?d rdfs:label ?AwardConferredBy . } . "
+ " OPTIONAL { ?c core:description ?Description . } . "
+ " }");
@ -147,8 +155,9 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
queriesForAgent.add(prefix +
"SELECT (str(?OrganizationLabel) as ?organizationLabel) WHERE {"
+ "?uri rdf:type foaf:Agent ; ?b ?c . "
+ " ?c rdf:type core:Role ; core:roleIn ?Organization ."
+ " ?uri rdf:type foaf:Agent ; ?b ?c . "
+ " ?c rdf:type obo:BFO_0000023 ; core:roleContributesTo ?Organization ."
+ " ?Organization rdf:type core:Organization . "
+ " ?Organization rdfs:label ?OrganizationLabel . "
+ " }");
@ -163,12 +172,16 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
"(str(?TrainingAtOrganizationLabel) as ?trainingAtOrganizationLabel) WHERE {"
+ " ?uri rdf:type foaf:Agent ; ?b ?c . "
+ " ?c rdf:type core:EducationalTraining . "
+ " ?c rdf:type core:EducationalProcess . "
+ "OPTIONAL { ?c core:degreeEarned ?d . ?d rdfs:label ?AcademicDegreeLabel ; core:abbreviation ?AcademicDegreeAbbreviation . } . "
+ "OPTIONAL { ?c core:relates ?d . "
+ " ?d rdf:type core:AwardedDegree . "
+ " ?d core:relates ?e . "
+ " ?e rdf:type core:AcademicDegree . "
+ " ?e rdfs:label ?AcademicDegreeLabel . } . "
+ "OPTIONAL { ?c core:majorField ?MajorField .} ."
+ " OPTIONAL { ?c core:departmentOrSchool ?DepartmentOrSchool . }"
+ " OPTIONAL { ?c core:trainingAtOrganization ?e . ?e rdfs:label ?TrainingAtOrganizationLabel . } . "
+ " OPTIONAL { ?c obo:RO_0000057 ?f . ?f rdf:type foaf:organization . ?f rdfs:label ?TrainingAtOrganizationLabel . } . "
+"}");
}
}

3
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java
View file

@ -47,7 +47,8 @@ public class VivoISFAdvisingFields extends ContextNodeFields {
" ?uri core:relatedBy ?rel . \n" +
" ?rel rdf:type core:AdvisingRelationship . \n" +
" ?rel core:relates ?other . \n" +
" ?other rdfs:label ?result . \n" +
" ?other rdfs:label ?result . \n" +
" FILTER( ?other != ?uri ) \n" +
"}";
}

6
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java
View file

@ -1,12 +1,13 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr;
import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.InputStream;
import org.apache.solr.common.SolrInputDocument;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import com.hp.hpl.jena.rdf.model.Model;
@ -63,6 +64,7 @@ public class VivoAgentContextNodeFieldsTest extends AbstractTestClass{
assertTrue("expected to have jane because SPCA advises jane", hasJane);
}
@Ignore
@Test
public void testWonder(){
Individual ind = new IndividualImpl();

1
themes/wilma/i18n/all.properties
View file

@ -120,6 +120,7 @@ missing_info_resource = missing information resource
award_receipt_name = award receipt name
award_name = award name
conferred_by = conferred by
conferred_on = conferred on
selected_award = Selected Award
incomplete_date_time_interval = incomplete date/time interval