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:
hudajkhan 2014-05-23 11:18:14 -04:00
commit c70aa2ae5a
15 changed files with 298 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
languages/es_GO/themes/wilma/i18n/all_es_GO.properties
View file

@ -484,6 +484,7 @@ org_type_capitalized = Tipo de Organización
educational_training_type = Tipo de Formación Educativa educational_training_type = Tipo de Formación Educativa
dept_or_school_name = Departamento o Nombre de la escuela en el dept_or_school_name = Departamento o Nombre de la escuela en el
degree = Grado degree = Grado
missing_degree = falta de grado
major_field = Importante sobre el terreno de Grado major_field = Importante sobre el terreno de Grado
supplemental_information = Información Complementaria supplemental_information = Información Complementaria
supplemental_information_hint = (Por ejemplo, título de la tesis, la información de transferencia, etc) supplemental_information_hint = (Por ejemplo, título de la tesis, la información de transferencia, etc)

7
productMods/config/listViewConfig-default.xml
View file

@ -33,6 +33,9 @@
?object a foaf:Person . ?object a foaf:Person .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
# Display only a mostSpecificType that belongs to a classgroup.
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup
} }
OPTIONAL { ?object obo:ARG_2000028 ?vcard . OPTIONAL { ?object obo:ARG_2000028 ?vcard .
@ -82,6 +85,8 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?object . ?subject ?property ?object .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
?object obo:ARG_2000028 ?vcard . ?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj . ?vcard vcard:hasTitle ?titleObj .
@ -93,6 +98,8 @@
?subject ?property ?object . ?subject ?property ?object .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup
} UNION { } UNION {
?subject ?property ?object . ?subject ?property ?object .
?object obo:ARG_2000028 ?vcard . ?object obo:ARG_2000028 ?vcard .

53
productMods/config/listViewConfig-degreeEarned.xml Normal file
View file

@ -0,0 +1,53 @@
<?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 rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
SELECT DISTINCT ?awardedDegree
?degree
?degreeName
?degreeAbbr
WHERE {
?subject ?property ?awardedDegree .
?awardedDegree core:relates ?degree .
?degree rdfs:label ?degreeName
OPTIONAL { ?degree core:abbreviation ?degreeAbbr }
}
</query-select>
<query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?awardedDegree .
?awardedDegree core:relates ?degree .
?degree rdfs:label ?degreeName .
?degree core:abbreviation ?degreeAbbr
} WHERE {
{
?subject ?property ?awardedDegree .
?awardedDegree a core:AwardedDegree .
?awardedDegree core:relates ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeName
} UNION {
?subject ?property ?awardedDegree .
?awardedDegree a core:AwardedDegree .
?awardedDegree core:relates ?degree .
?degree a core:AcademicDegree .
?degree core:abbreviation ?degreeAbbr
}
}
</query-construct>
<template>propStatement-degreeEarned.ftl</template>
</list-view-config>

7
productMods/config/listViewConfig-fauxPropertyDefault.xml
View file

@ -34,6 +34,9 @@
?object a foaf:Person . ?object a foaf:Person .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
# Display only a mostSpecificType that belongs to a classgroup.
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup
} }
OPTIONAL { ?object obo:ARG_2000028 ?vcard . OPTIONAL { ?object obo:ARG_2000028 ?vcard .
@ -83,6 +86,8 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?object . ?subject ?property ?object .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
?object obo:ARG_2000028 ?vcard . ?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj . ?vcard vcard:hasTitle ?titleObj .
@ -94,6 +99,8 @@
?subject ?property ?object . ?subject ?property ?object .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup
} UNION { } UNION {
?subject ?property ?object . ?subject ?property ?object .
?object obo:ARG_2000028 ?vcard . ?object obo:ARG_2000028 ?vcard .

48
productMods/config/listViewConfig-organizationAwardsGrant.xml Normal file
View file

@ -0,0 +1,48 @@
<?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 core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
SELECT DISTINCT ?grantOrContract
?label
WHERE {
?subject ?property ?grantOrContract .
OPTIONAL { ?grantOrContract rdfs:label ?label .
}
} ORDER BY ?label
</query-select>
<query-construct>
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
CONSTRUCT {
?subject ?property ?grantOrContract .
?grantOrContract rdfs:label ?label .
} WHERE {
{
?subject ?property ?grantOrContract .
} UNION {
?subject ?property ?grantOrContract .
?grantOrContract a core:Grant .
?grantOrContract rdfs:label ?label .
} UNION {
?subject ?property ?grantOrContract .
?grantOrContract a core:Contract .
?grantOrContract rdfs:label ?label .
}
}
</query-construct>
<template>propStatement-organizationAwardsGrant.ftl</template>
</list-view-config>

38
productMods/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl Normal file
View file

@ -0,0 +1,38 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Custom object property statement view for faux property "education and training". 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>
<#-- Coming from propDelete, individual is not defined, but we are editing. -->
<@showEducationalTraining statement=statement editable=(!individual?? || individual.editable) />
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showEducationalTraining statement editable>
<#local degree>
<#if statement.degreeName??>
${statement.degreeAbbr!statement.degreeName}
<#if statement.majorField??> ${i18n().in} ${statement.majorField}</#if>
<#elseif statement.typeName??>
${statement.typeName!}
</#if>
</#local>
<#local linkedIndividual>
<#if statement.degree??>
<a href="${profileUrl(statement.uri("degree"))}" title="${i18n().degree}">${statement.degreeAbbr!statement.degreeName}</a>
<#else>
<#-- Show the link to the context node only if the user is editing the page. -->
${i18n().missing_degree}
</#if>
</#local>
${linkedIndividual}
</#macro>

22
productMods/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl Normal file
View file

@ -0,0 +1,22 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#--
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.
-->
<@showAwardsGrant statement />
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showAwardsGrant statement>
<#local linkedIndividual>
<#if statement.grantOrContract??>
<a href="${profileUrl(statement.uri("grantOrContract"))}" title="${i18n().grant_name}">${statement.label!""}</a>
</#if>
</#local>
${linkedIndividual!}
</#macro>

6
productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
View file

@ -57,8 +57,10 @@
<option value="${key}" <#if urlTypeValue == key>selected</#if> > <option value="${key}" <#if urlTypeValue == key>selected</#if> >
<#if urlTypeOpts[key] == "F1000 Link"> <#if urlTypeOpts[key] == "F1000 Link">
${i18n().faculty_of_1000} ${i18n().faculty_of_1000}
<#else> <#elseif urlTypeOpts[key] == "Other">
${i18n().standard_web_link} ${i18n().standard_web_link}
<#else>
${urlTypeOpts[key]}
</#if> </#if>
</option> </option>
</#list> </#list>
@ -67,7 +69,7 @@
<input size="70" type="text" id="url" name="url" value="${url}" role="input" /> <input size="70" type="text" id="url" name="url" value="${url}" role="input" />
<label for="label">${i18n().webpage_name}</label> <label for="label">${i18n().webpage_name}</label>
<input size="70" type="text" id="label" name="label" value="${label}" role="input" /> <input size="70" type="text" id="label" name="label" value="${label?html}" role="input" />${label}
<#if editMode="add"> <#if editMode="add">
<input type="hidden" name="rank" value="${newRank}" /> <input type="hidden" name="rank" value="${newRank}" />

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

@ -500,6 +500,51 @@ local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> .
local:educationalProcessPersonContext a :ConfigContext ;
:hasConfiguration local:educationalProcessPersonConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000057> ;
:qualifiedByDomain <http://vivoweb.org/ontology/core#EducationalProcess>;
:qualifiedBy <http://xmlns.com/foaf/0.1/Person> .
local:educationalProcessPersonConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ;
:displayName "education and training of" ;
vitro:displayRankAnnot 10;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:educationalProcessOrgContext a :ConfigContext ;
:hasConfiguration local:educationalProcessOrgConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000057> ;
:qualifiedByDomain <http://vivoweb.org/ontology/core#EducationalProcess>;
:qualifiedBy <http://xmlns.com/foaf/0.1/Organization> .
local:educationalProcessOrgConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ;
:displayName "educational organization" ;
vitro:displayRankAnnot 15;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:educationalProcessDegreeContext a :ConfigContext ;
:hasConfiguration local:educationalProcessDegreeConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0002234> ;
:qualifiedByDomain <http://vivoweb.org/ontology/core#EducationalProcess>;
:qualifiedBy <http://vivoweb.org/ontology/core#AwardedDegree> .
local:educationalProcessDegreeConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-degreeEarned.xml"^^xsd:string ;
:displayName "degree earned" ;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:organizationForTrainingContext a :ConfigContext ; local:organizationForTrainingContext a :ConfigContext ;
:hasConfiguration local:organizationForTrainingConfig ; :hasConfiguration local:organizationForTrainingConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000056> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000056> ;
@ -624,6 +669,20 @@ local:grantAdministeredByConfig a :ObjectPropertyDisplayConfig ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.GrantAdministeredByGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.GrantAdministeredByGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:contractAdministeredByContext a :ConfigContext ;
:hasConfiguration local:contractAdministeredByConfig ;
:configContextFor vivo:relates ;
:qualifiedByDomain vivo:Contract ;
:qualifiedBy vivo:AdministratorRole .
local:contractAdministeredByConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-grantAdministeredBy.xml"^^xsd:string ;
:displayName "administered by" ;
vitro:displayRankAnnot 16;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:orgAdministersGrantContext a :ConfigContext ; local:orgAdministersGrantContext a :ConfigContext ;
:hasConfiguration local:orgAdministersGrantConfig ; :hasConfiguration local:orgAdministersGrantConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@ -1496,6 +1555,21 @@ local:grantAwardedByConfig a :ObjectPropertyDisplayConfig ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:contractAwardedByContext a :ConfigContext ;
:hasConfiguration local:contractAwardedByConfig ;
:configContextFor vivo:assignedBy ;
:qualifiedByDomain vivo:Contract ;
:qualifiedBy <http://xmlns.com/foaf/0.1/Organization> .
local:contractAwardedByConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ;
:displayName "awarded by" ;
vitro:displayRankAnnot 14;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:grantSubjectAreaContext a :ConfigContext ; local:grantSubjectAreaContext a :ConfigContext ;
:hasConfiguration local:grantSubjectAreaConfig ; :hasConfiguration local:grantSubjectAreaConfig ;
:configContextFor vivo:hasSubjectArea ; :configContextFor vivo:hasSubjectArea ;
@ -1635,7 +1709,7 @@ local:orgAwardsGrantContext a :ConfigContext ;
:qualifiedBy <http://vivoweb.org/ontology/core#Grant> . :qualifiedBy <http://vivoweb.org/ontology/core#Grant> .
local:orgAwardsGrantConfig a :ObjectPropertyDisplayConfig ; local:orgAwardsGrantConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-organizationAwardsGrant.xml"^^xsd:string ;
:displayName "awards grant" ; :displayName "awards grant" ;
vitro:displayRankAnnot 60; vitro:displayRankAnnot 60;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
@ -1689,6 +1763,20 @@ local:grantRelatesConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
local:contractRelatesContext a :ConfigContext ;
:hasConfiguration local:contractRelatesConfig ;
:configContextFor <http://vivoweb.org/ontology/core#relates> ;
:qualifiedByDomain <http://vivoweb.org/ontology/core#Contract> ;
:qualifiedBy <http://vivoweb.org/ontology/core#ResearcherRole> .
local:contractRelatesConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-relatedRole.xml"^^xsd:string ;
:displayName "contributor" ;
vitro:displayRankAnnot 55;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
### faux properties for dateTimeValue ### ### faux properties for dateTimeValue ###
local:publicationDateContext a :ConfigContext ; local:publicationDateContext a :ConfigContext ;

4
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java
View file

@ -42,12 +42,12 @@ public class VivoISFAdvisingFields extends ContextNodeFields {
private static String makeQueryForPeople(){ private static String makeQueryForPeople(){
return prefix + return prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri core:relatedBy ?rel . \n" + " ?uri core:relatedBy ?rel . \n" +
" ?rel rdf:type core:AdvisingRelationship . \n" + " ?rel rdf:type core:AdvisingRelationship . \n" +
" ?rel core:relates ?other . \n" + " ?rel core:relates ?other . \n" +
" ?other rdfs:label ?result . \n" + " ?other rdfs:label ?rawresult . \n" +
" FILTER( ?other != ?uri ) \n" + " FILTER( ?other != ?uri ) \n" +
"}"; "}";
} }

4
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java
View file

@ -60,12 +60,12 @@ public class VivoISFBasicFields extends ContextNodeFields {
queries.add( queries.add(
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri core:relatedBy ?rel . \n" + " ?uri core:relatedBy ?rel . \n" +
" ?rel rdf:type ?type . \n" + " ?rel rdf:type ?type . \n" +
" ?rel core:relates ?other . \n" + " ?rel core:relates ?other . \n" +
" ?other rdfs:label ?result . \n" + " ?other rdfs:label ?rawresult . \n" +
" FILTER ( ?type IN ( " + types + " ) )\n" + " FILTER ( ?type IN ( " + types + " ) )\n" +
"}" ); "}" );
} }

8
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java
View file

@ -28,11 +28,11 @@ public class VivoISFEducationFields extends ContextNodeFields {
private static String queryForDegree = private static String queryForDegree =
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri core:relates ?deg . \n" + " ?uri core:relates ?deg . \n" +
" ?deg rdf:type core:AwardedDegree . \n" + " ?deg rdf:type core:AwardedDegree . \n" +
" ?deg rdfs:label ?result . \n" + " ?deg rdfs:label ?rawresult . \n" +
"}"; "}";
/** /**
@ -41,12 +41,12 @@ public class VivoISFEducationFields extends ContextNodeFields {
private static String queryForOrganization = private static String queryForOrganization =
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri core:relates ?deg . \n" + " ?uri core:relates ?deg . \n" +
" ?deg rdf:type core:AwardedDegree . \n" + " ?deg rdf:type core:AwardedDegree . \n" +
" ?deg core:assignedBy ?org . \n" + " ?deg core:assignedBy ?org . \n" +
" ?org rdfs:label ?result . \n" + " ?org rdfs:label ?rawresult . \n" +
"}"; "}";
static List<String> queries = new ArrayList<String>(); static List<String> queries = new ArrayList<String>();

32
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java
View file

@ -40,11 +40,11 @@ public class VivoISFGrantFields extends ContextNodeFields {
*/ */
private static String peopleForGrant = private static String peopleForGrant =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type core:Grant . \n" + " ?uri rdf:type core:Grant . \n" +
" ?uri core:relates ?person . \n" + " ?uri core:relates ?person . \n" +
" ?person rdf:type foaf:Person . \n" + " ?person rdf:type foaf:Person . \n" +
" ?person rdfs:label ?result . \n" + " ?person rdfs:label ?rawresult . \n" +
"}"; "}";
/** /**
@ -54,12 +54,12 @@ public class VivoISFGrantFields extends ContextNodeFields {
private static String grantsForPerson = private static String grantsForPerson =
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri rdf:type foaf:Person . \n" + " ?uri rdf:type foaf:Person . \n" +
" ?grant core:relates ?uri . \n" + " ?grant core:relates ?uri . \n" +
" ?grant rdf:type core:Grant . \n" + " ?grant rdf:type core:Grant . \n" +
" ?grant rdfs:label ?result . \n" + " ?grant rdfs:label ?rawresult . \n" +
"}"; "}";
/** /**
@ -68,11 +68,11 @@ public class VivoISFGrantFields extends ContextNodeFields {
*/ */
private static String grantsForOrganization = private static String grantsForOrganization =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type foaf:Organization . \n" + " ?uri rdf:type foaf:Organization . \n" +
" ?grant core:relates ?uri . \n" + " ?grant core:relates ?uri . \n" +
" ?grant rdf:type core:Grant . \n" + " ?grant rdf:type core:Grant . \n" +
" ?grant rdfs:label ?result . \n" + " ?grant rdfs:label ?rawresult . \n" +
"}"; "}";
/** /**
@ -81,11 +81,11 @@ public class VivoISFGrantFields extends ContextNodeFields {
*/ */
private static String organizationsForGrant = private static String organizationsForGrant =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type core:Grant . \n" + " ?uri rdf:type core:Grant . \n" +
" ?uri core:relates ?org . \n" + " ?uri core:relates ?org . \n" +
" ?org rdf:type foaf:Organization . \n" + " ?org rdf:type foaf:Organization . \n" +
" ?org rdfs:label ?result . \n" + " ?org rdfs:label ?rawresult . \n" +
"}"; "}";
/** /**
@ -94,12 +94,12 @@ public class VivoISFGrantFields extends ContextNodeFields {
*/ */
private static String grantsForProject = private static String grantsForProject =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type core:Project . \n" + " ?uri rdf:type core:Project . \n" +
" ?role obo:BFO_0000054 ?uri . \n" + " ?role obo:BFO_0000054 ?uri . \n" +
" ?grant core:relates ?role . \n" + " ?grant core:relates ?role . \n" +
" ?grant rdf:type core:Grant . \n" + " ?grant rdf:type core:Grant . \n" +
" ?grant rdfs:label ?result . \n" + " ?grant rdfs:label ?rawresult . \n" +
"}"; "}";
/** /**
@ -108,12 +108,12 @@ public class VivoISFGrantFields extends ContextNodeFields {
*/ */
private static String peopleForProject = private static String peopleForProject =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type core:Project . \n" + " ?uri rdf:type core:Project . \n" +
" ?role obo:BFO_0000054 ?uri . \n" + " ?role obo:BFO_0000054 ?uri . \n" +
" ?role obo:RO_0000053 ?person . \n" + " ?role obo:RO_0000053 ?person . \n" +
" ?person rdf:type foaf:Person . \n" + " ?person rdf:type foaf:Person . \n" +
" ?person rdfs:label ?result . \n" + " ?person rdfs:label ?rawresult . \n" +
"}"; "}";
/** /**
@ -123,13 +123,13 @@ public class VivoISFGrantFields extends ContextNodeFields {
private static String projectsForGrant = private static String projectsForGrant =
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri rdf:type core:Grant. \n" + " ?uri rdf:type core:Grant. \n" +
" ?uri core:relates ?role . \n" + " ?uri core:relates ?role . \n" +
" ?role obo:BFO_0000054 ?project . \n" + " ?role obo:BFO_0000054 ?project . \n" +
" ?project rdf:type core:Project . \n" + " ?project rdf:type core:Project . \n" +
" ?project rdfs:label ?result . \n" + " ?project rdfs:label ?rawresult . \n" +
"}"; "}";
/** /**
@ -138,12 +138,12 @@ public class VivoISFGrantFields extends ContextNodeFields {
*/ */
private static String projectsForPerson = private static String projectsForPerson =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type foaf:Person . \n" + " ?uri rdf:type foaf:Person . \n" +
" ?uri obo:RO_0000053 ?role . \n" + " ?uri obo:RO_0000053 ?role . \n" +
" ?role obo:BFO_0000054 ?project . \n" + " ?role obo:BFO_0000054 ?project . \n" +
" ?project rdf:type core:Project . \n" + " ?project rdf:type core:Project . \n" +
" ?project rdfs:label ?result . \n" + " ?project rdfs:label ?rawresult . \n" +
"}"; "}";
static List<String> queries = new ArrayList<String>(); static List<String> queries = new ArrayList<String>();

8
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java
View file

@ -35,11 +35,11 @@ public class VivoISFMemberFields extends ContextNodeFields {
*/ */
private static String peopleForOrganization = private static String peopleForOrganization =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type foaf:Organization . \n" + " ?uri rdf:type foaf:Organization . \n" +
" ?role core:roleContrigutesTo ?uri . \n" + " ?role core:roleContrigutesTo ?uri . \n" +
" ?person obo:RO_0000053 ?role . \n" + " ?person obo:RO_0000053 ?role . \n" +
" ?person rdfs:label ?result .\n" + " ?person rdfs:label ?rawresult .\n" +
"}"; "}";
/** /**
@ -47,9 +47,9 @@ public class VivoISFMemberFields extends ContextNodeFields {
*/ */
private static String organizationForPeople = private static String organizationForPeople =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type foaf:Person . \n" + " ?uri rdf:type foaf:Person . \n" +
" ?uri obo:RO_0000053 / core:roleContrigutesTo / rdfs:label ?result . \n" + " ?uri obo:RO_0000053 / core:roleContrigutesTo / rdfs:label ?rawresult . \n" +
"}"; "}";

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

@ -490,6 +490,7 @@ org_type_capitalized = Organization Type
educational_training_type = Type of Educational Training educational_training_type = Type of Educational Training
dept_or_school_name = Department or School Name within the dept_or_school_name = Department or School Name within the
degree = Degree degree = Degree
missing_degree = missing degree
major_field = Major Field of Degree major_field = Major Field of Degree
supplemental_information = Supplemental Information supplemental_information = Supplemental Information
supplemental_information_hint = (e.g., Thesis title, Transfer info, etc.) supplemental_information_hint = (e.g., Thesis title, Transfer info, etc.)