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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-10-25 17:09:27 -04:00
commit e41a985076
5 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
productMods/config/listViewConfig-awardOrHonor.xml
View file

@ -26,16 +26,16 @@
WHERE { WHERE {
?subject ?property ?awardReceipt . ?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt . ?awardReceipt a core:AwardReceipt .
OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel }
OPTIONAL { ?awardReceipt core:relates ?award . OPTIONAL { ?awardReceipt core:relates ?award .
?award a core:Award . ?award a core:Award .
?award core:relatedBy ?awardReceipt ?award core:relatedBy ?awardReceipt .
OPTIONAL { ?award rdfs:label ?awardLabel } ?award rdfs:label ?awardLabel
OPTIONAL { ?award core:assignedBy ?assignedBy }
OPTIONAL { ?assignedBy rdfs:label ?assignedByLabel } OPTIONAL { ?awardReceipt core:assignedBy ?assignedBy .
} ?assignedBy rdfs:label ?assignedByLabel
} }
OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
} }
@ -65,7 +65,7 @@
?award a core:Award . ?award a core:Award .
?award core:relatedBy ?awardReceipt . ?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel . ?award rdfs:label ?awardLabel .
?award core:assignedBy ?assignedBy . ?awardReceipt core:assignedBy ?assignedBy .
?assignedBy rdfs:label ?assignedByLabel . ?assignedBy rdfs:label ?assignedByLabel .
?awardReceipt core:dateTimeValue ?dateTimeValue . ?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime ?dateTimeValue core:dateTime ?dateTime
@ -89,9 +89,7 @@
?subject ?property ?awardReceipt . ?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt . ?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel . ?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award . ?awardReceipt core:assignedBy ?assignedBy .
?award a core:Award .
?award core:assignedBy ?assignedBy .
?assignedBy rdfs:label ?assignedByLabel ?assignedBy rdfs:label ?assignedByLabel
} UNION { } UNION {
?subject ?property ?awardReceipt . ?subject ?property ?awardReceipt .
@ -122,8 +120,8 @@
<query-construct> <query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?awardReceipt . ?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt . ?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd

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

@ -12,6 +12,8 @@
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt; PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&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; PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
SELECT <collated> ?subclass </collated> SELECT <collated> ?subclass </collated>
?object ?object
@ -37,7 +39,11 @@
?classGroup a vitro:ClassGroup ?classGroup a vitro:ClassGroup
} }
OPTIONAL { ?object core:preferredTitle ?title } OPTIONAL { ?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj .
?titleObj vcard:title ?title
}
<collated> <collated>
OPTIONAL { ?object a ?subclass } OPTIONAL { ?object a ?subclass }
@ -75,6 +81,8 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&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; PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?object . ?subject ?property ?object .
@ -82,7 +90,9 @@
?typeUri vitro:inClassGroup ?classGroup . ?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup . ?classGroup a vitro:ClassGroup .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
?object core:preferredTitle ?title . ?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj .
?titleObj vcard:title ?title
} WHERE { } WHERE {
{ {
?subject ?property ?object . ?subject ?property ?object .
@ -92,7 +102,9 @@
?classGroup a vitro:ClassGroup ?classGroup a vitro:ClassGroup
} UNION { } UNION {
?subject ?property ?object . ?subject ?property ?object .
?object core:preferredTitle ?title . ?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj .
?titleObj vcard:title ?title
} }
} }
</query-construct> </query-construct>

5
productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
View file

@ -4,6 +4,7 @@
<#-- Template for adding a grant role, such as principal investigator, to a foaf:Persons --> <#-- Template for adding a grant role, such as principal investigator, to a foaf:Persons -->
<#--Retrieve certain edit configuration information--> <#--Retrieve certain edit configuration information-->
<#assign editMode = editConfiguration.pageData.editMode /> <#assign editMode = editConfiguration.pageData.editMode />
<#assign rangeUri = editConfiguration.pageData.rangeUri />
<#assign literalValues = editConfiguration.existingLiteralValues /> <#assign literalValues = editConfiguration.existingLiteralValues />
<#assign uriValues = editConfiguration.existingUriValues /> <#assign uriValues = editConfiguration.existingUriValues />
<#assign htmlForElements = editConfiguration.pageData.htmlForElements /> <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
@ -34,9 +35,9 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<#assign formHeading = "${i18n().investigator_entry_for}"/> <#assign formHeading = "${i18n().investigator_entry_for}"/>
<#assign submitButtonLabel = "${i18n().investigator_capitalized}" /> <#assign submitButtonLabel = "${i18n().investigator_capitalized}" />
<#if editConfiguration.predicateUri?ends_with("hasPrincipalInvestigatorRole") > <#if rangeUri?contains("#PrincipalInvestigatorRole") >
<#assign formHeading = "${i18n().principal_investigator_entry_for}"/> <#assign formHeading = "${i18n().principal_investigator_entry_for}"/>
<#elseif editConfiguration.predicateUri?ends_with("hasCo-PrincipalInvestigatorRole") > <#elseif rangeUri?contains("#CoPrincipalInvestigatorRole") >
<#assign formHeading = "${i18n().co_principal_investigator_entry_for}"/> <#assign formHeading = "${i18n().co_principal_investigator_entry_for}"/>
</#if> </#if>

9
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
View file

@ -729,6 +729,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) { public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
HashMap<String, Object> formSpecificData = new HashMap<String, Object>(); HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
formSpecificData.put("editMode", getEditMode(vreq).name().toLowerCase()); formSpecificData.put("editMode", getEditMode(vreq).name().toLowerCase());
formSpecificData.put("rangeUri", getRangeUri(vreq));
//In this case, passing back a sparql query //In this case, passing back a sparql query
formSpecificData.put("sparqlForAcFilter", getSparqlForAcFilter(vreq)); formSpecificData.put("sparqlForAcFilter", getSparqlForAcFilter(vreq));
//Put in the fact that we require field //Put in the fact that we require field
@ -747,8 +748,10 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
return query; return query;
} }
private String getRangeUri(VitroRequest vreq) {
String rangeUri = vreq.getParameter("rangeUri");
return rangeUri;
}
} }

8
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
View file

@ -262,9 +262,8 @@ public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements
final static String existingOrgQuery = final static String existingOrgQuery =
"SELECT ?existingOrg WHERE { \n" + "SELECT ?existingOrg WHERE { \n" +
" ?awardReceipt <" + receiptOfPred + "> ?existingAward . \n" + " ?awardReceipt <" + awardConferredByPred + "> ?existingOrg . \n" +
" ?existingAward a <" + awardClass + "> . \n" + " ?existingOrg a <" + orgClass + "> . \n" +
" ?existingAward<" + awardConferredByPred + "> ?existingOrg . \n" +
" ?existingOrg <" + awardConferredPred + "> ?existingAward . }"; " ?existingOrg <" + awardConferredPred + "> ?existingAward . }";
final static String awardReceiptLabelQuery = final static String awardReceiptLabelQuery =
@ -281,7 +280,8 @@ public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements
final static String orgLabelQuery = final static String orgLabelQuery =
"SELECT ?existingOrgLabel WHERE { \n" + "SELECT ?existingOrgLabel WHERE { \n" +
" ?award <" + awardConferredByPred + "> ?existingOrg . \n" + " ?awardReceipt <" + awardConferredByPred + "> ?existingOrg . \n" +
" ?existingOrg a <" + orgClass + "> . \n" +
" ?existingOrg <" + label + "> ?existingOrgLabel . \n" + " ?existingOrg <" + label + "> ?existingOrgLabel . \n" +
"}"; "}";