From cd9120050fb2d73569ea252f535767fc1b4b53d0 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 21 Oct 2013 12:59:24 -0400 Subject: [PATCH] VIVO-387: clean up post-migration issues --- .../config/listViewConfig-advisorIn.xml | 32 ++++--------------- .../listViewConfig-issuedCredential.xml | 13 +++++++- .../propStatement-issuedCredential.ftl | 4 +-- ...PersonHasAdvisorRelationshipGenerator.java | 29 ++++++++--------- 4 files changed, 34 insertions(+), 44 deletions(-) diff --git a/productMods/config/listViewConfig-advisorIn.xml b/productMods/config/listViewConfig-advisorIn.xml index 68dcaab6..e1254bda 100644 --- a/productMods/config/listViewConfig-advisorIn.xml +++ b/productMods/config/listViewConfig-advisorIn.xml @@ -37,8 +37,7 @@ ?adviseeRole a core:AdviseeRole . OPTIONAL { ?advisee rdfs:label ?adviseeLabel } } - OPTIONAL { ?advisingRel core:relates ?degree . - ?degree a core:AcademicDegree . + OPTIONAL { ?advisingRel core:degreeCandidacy ?degree . OPTIONAL { ?degree rdfs:label ?degreeLabel } OPTIONAL { ?degree core:abbreviation ?degreeAbbr } } @@ -163,24 +162,7 @@ ?advisorRole core:relatedBy ?advisingRel . ?subject core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?degree . - ?degree a core:AcademicDegree . - } UNION { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?subject core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?degree . - ?degree a core:AcademicDegree . - ?degree rdfs:label ?degreeLabel - } UNION { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?subject core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?degree . + ?advisingRel core:degreeCandidacy ?degree . ?degree a core:AcademicDegree . ?degree rdfs:label ?degreeLabel . ?degree core:abbreviation ?degreeAbbr @@ -196,16 +178,16 @@ ?advisorRole core:relatedBy ?advisingRel . ?subject core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?award core:dateTimeInterval ?dateTimeInterval . + ?advisingRel core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart } WHERE { - ?subject ?property ?advisingRel . + ?subject ?property ?advisorRole . ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . ?subject core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?award core:dateTimeInterval ?dateTimeInterval . + ?advisingRel core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart } @@ -219,7 +201,7 @@ ?advisorRole core:relatedBy ?advisingRel . ?subject core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?award core:dateTimeInterval ?dateTimeInterval . + ?advisingRel core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeEndValue core:dateTime ?dateTimeEnd } WHERE { @@ -228,7 +210,7 @@ ?advisorRole core:relatedBy ?advisingRel . ?subject core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?award core:dateTimeInterval ?dateTimeInterval . + ?advisingRel core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeEndValue core:dateTime ?dateTimeEnd } diff --git a/productMods/config/listViewConfig-issuedCredential.xml b/productMods/config/listViewConfig-issuedCredential.xml index 44246d90..a59a9fd1 100644 --- a/productMods/config/listViewConfig-issuedCredential.xml +++ b/productMods/config/listViewConfig-issuedCredential.xml @@ -14,8 +14,11 @@ PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?issuedCredential + ?issuedCredentialLocal + ?issuedCredentialLabel ?credential ?credentialLabel + ?credentialLocal ?dateTimeStart ?dateTimeEnd ?dateTime @@ -23,8 +26,11 @@ WHERE { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . - OPTIONAL { ?issuedCredential core:relates ?credential . + LET (?issuedCredentialLocal := afn:localname(?issuedCredential)) + OPTIONAL { ?issuedCredential rdfs:label ?issuedCredentialLabel } + OPTIONAL { ?issuedCredential core:relates ?credential . ?credential a core:Credential . + LET (?credentialLocal := afn:localname(?credential)) ?credential core:relatedBy ?issuedCredential OPTIONAL { ?credential rdfs:label ?credentialLabel } } @@ -53,6 +59,7 @@ CONSTRUCT { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . + ?issuedCredential rdfs:label ?issuedCredentialLabel . ?issuedCredential core:relates ?credential . ?credential a core:Credential . ?credential core:relatedBy ?issuedCredential . @@ -61,6 +68,10 @@ { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . + } UNION { + ?subject ?property ?issuedCredential . + ?issuedCredential a core:IssuedCredential . + ?issuedCredential rdfs:label ?issuedCredentialLabel . } UNION { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl index 5f6ba2c4..1b12358a 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl @@ -15,9 +15,9 @@ <#local linkedIndividual> <#if statement.credential??> - ${statement.credentialLabel!statement.localName!} + ${statement.credentialLabel!statement.issuedCredentialLabel!statement.credentialLocal!} <#else> - ${statement.issuedCredential!} + ${statement.issuedCredentialLabel!"missing credential"} diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java index 5d52904b..285bd7b6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java @@ -249,14 +249,14 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp "?vcardName vcard:familyName ?lastName ."; final static String degreeAssertion = - "?advisingRelationship ?degree . \n" + - "?degree ?advisingRelationship . "; + "?advisingRelationship ?degree . \n" + + " "; //This is for an existing subject area //Where we only need the existing subject area label final static String n3ForExistingSubjAreaAssertion = - "?advisingRelationship ?existingSubjArea . \n" + - "?existingSubjArea ?advisingRelationship . "; + "?advisingRelationship ?existingSubjArea . \n" + + "?existingSubjArea ?advisingRelationship"; //For new subject area, we include all new information //new subject area should always be a new resource //and the following should only get evaluated @@ -300,15 +300,15 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp "}"; final static String existingAdvisorRoleQuery = - "SELECT ?advisorRole WHERE { \n" + - "?advisingRelationship ?advisorRole . \n" + - "?advisorRole a <" + advisorRoleClass + "> . \n" + + "SELECT ?existingAdvisorRole WHERE { \n" + + "?advisingRelationship ?existingAdvisorRole . \n" + + "?existingAdvisorRole a <" + advisorRoleClass + "> . \n" + "}"; final static String existingAdviseeRoleQuery = - "SELECT ?adviseeRole WHERE { \n" + - " ?advisingRelationship ?adviseeRole . \n" + - " ?adviseeRole a <" + adviseeRoleClass + "> . \n" + + "SELECT ?existingAdviseeRole WHERE { \n" + + " ?advisingRelationship ?existingAdviseeRole . \n" + + " ?existingAdviseeRole a <" + adviseeRoleClass + "> . \n" + "}"; final static String adviseeLabelQuery = @@ -321,19 +321,17 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp final static String subjAreaQuery = "SELECT ?existingSubjArea WHERE { \n" + - " ?advisingRelationship ?existingSubjArea . \n" + + " ?advisingRelationship ?existingSubjArea . \n" + " ?existingSubjArea a . \n" + " ?existingSubjArea ?type \n" + - " FILTER (?type != ) . \n" + "}"; final static String subjAreaLabelQuery = "SELECT ?existingSubjAreaLabel WHERE { \n" + - " ?advisingRelationship ?existingSubjArea . \n" + + " ?advisingRelationship ?existingSubjArea . \n" + " ?existingSubjArea a . \n" + " ?existingSubjArea <" + label + "> ?existingSubjAreaLabel . \n" + " ?existingSubjArea ?type \n" + - " FILTER (?type != ) . \n" + "}"; final static String advisingRelLabelQuery = @@ -343,11 +341,10 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp final static String degreeQuery = "SELECT ?existingDegree WHERE {\n"+ - " ?advisingRelationship ?existingDegree . \n" + + " ?advisingRelationship ?existingDegree . \n" + " ?existingDegree a <" + degreeClass + "> . \n" + "}"; - final static String existingStartDateQuery = "SELECT ?existingDateStart WHERE { \n" + " ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +