From a9b3bfd9c2414f20bc1067ba1a342d2d1b3ff738 Mon Sep 17 00:00:00 2001 From: Tim Worrall Date: Fri, 6 Jun 2014 11:04:23 -0400 Subject: [PATCH] VIVO-785: make middle name optional in list view and fix advisor genertor to clarify role --- .../config/listViewConfig-informationResourceInAuthorship.xml | 2 +- .../generators/PersonHasAdvisorRelationshipGenerator.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/productMods/config/listViewConfig-informationResourceInAuthorship.xml index 9ba1da67..762b3b7c 100644 --- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml +++ b/productMods/config/listViewConfig-informationResourceInAuthorship.xml @@ -33,8 +33,8 @@ ?author a vcard:Kind . ?author vcard:hasName ?vName . ?vName vcard:givenName ?firstName . - ?vName core:middleName ?middleName . ?vName vcard:familyName ?lastName . + OPTIONAL { ?vName core:middleName ?middleName . } bind ( COALESCE(?firstName, "") As ?firstName1) . bind ( COALESCE(?middleName, "") As ?middleName1) . bind ( COALESCE(?lastName, "") As ?lastName1) . 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 987e42fa..6fffbb2a 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 @@ -315,6 +315,7 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp " ?existingAdvisee ?advisingRelationship . \n" + " ?existingAdvisee a <" + adviseeClass + "> . \n" + " ?existingAdvisee ?existingAdviseeRole . \n" + + " ?existingAdviseeRole ?advisingRelationship . \n" + " ?existingAdviseeRole a <" + adviseeRoleClass + "> . \n" + "}"; @@ -327,6 +328,7 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp " ?existingAdvisee a <" + adviseeClass + "> . \n" + " ?existingAdvisee <" + label + "> ?existingAdviseeLabel . \n" + " ?existingAdvisee ?existingAdviseeRole . \n" + + " ?existingAdviseeRole ?advisingRelationship . \n" + " ?existingAdviseeRole a <" + adviseeRoleClass + "> . \n" + "}";