VIVO-370: fixed incorrect middleName property uri

productMods/config/listViewConfig-authorInAuthorship.xml

@@ -43,6 +43,7 @@
                           ?publisherObj rdfs:label ?publisher
                }
                OPTIONAL { ?infoResource core:relatedBy ?editorship .
+                          ?editorship a core:Editorship .
                           ?editorship core:relates ?editorObj .
                           ?editorObj rdfs:label ?editor
                }
@@ -89,6 +90,7 @@
         PREFIX bibo: <http://purl.org/ontology/bibo/> 
         CONSTRUCT { 
             ?subject ?property ?authorship .  
+            ?authorship a core:Authorship . 
             ?authorship ?authorshipProperty ?authorshipValue .
             ?authorship core:relates ?infoResource .
             ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> .
@@ -196,6 +198,7 @@
                ?authorship core:relates ?infoResource .
                ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> .
                ?infoResource core:relatedBy ?editorship .
+               ?editorship a core:Editorship . 
                ?editorship core:relates ?editorObj .
                ?editorObj rdfs:label ?editor
             } UNION {

productMods/config/listViewConfig-fullName.xml

@@ -6,18 +6,22 @@
 <list-view-config>
     <query-select>    
         PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         
         SELECT DISTINCT ?vcard ?fullName
                         ?firstName
                         ?middleName
                         ?lastName
+                        ?suffix
+                        ?prefix
         WHERE {
             ?subject ?property ?vcard .
             ?vcard vcard:hasName ?fullName 
             OPTIONAL { ?fullName vcard:givenName ?firstName  }
-            OPTIONAL { ?fullName vcard:middleName ?middleName  }
+            OPTIONAL { ?fullName core:middleName ?middleName  }
             OPTIONAL { ?fullName vcard:familyName ?lastName  }
-            
+            OPTIONAL { ?fullName vcard:honorificSuffix ?suffix  }
+            OPTIONAL { ?fullName vcard:honorificPrefix ?prefix  }
         } 
     </query-select>
        

productMods/templates/freemarker/body/partials/individual/propStatement-fullName.ftl

@@ -11,7 +11,10 @@
 <#macro showFullName statement>
  
     <#if statement.fullName?has_content>
-            ${statement.firstName!}&nbsp;${statement.middleName!}&nbsp;${statement.lastName!}
+        <#if statement.prefix??>${statement.prefix!}</#if>
+        ${statement.firstName!}
+        ${statement.middleName!}
+        ${statement.lastName!}<#if statement.suffix??>, ${statement.suffix!}</#if>
     </#if>    
           
 </#macro>

productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl

@@ -19,6 +19,8 @@
 <#assign firstNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "firstName") />
 <#assign middleNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "middleName") />
 <#assign lastNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "lastName") />
+<#assign suffixValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "suffix") />
+<#assign prefixValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "prefix") />
 
 
 <#--If edit submission exists, then retrieve validation errors if they exist-->
@@ -63,13 +65,15 @@
     <form id="addFullNameToPerson" class="customForm noIE67" action="${submitUrl}"  role="add/edit name">
 
         <p>
-            <label for="firstName">${i18n().first_name} ${requiredHint}</label>
+            <label for="firstName">${i18n().first_name} ${requiredHint}<span style="padding-left:300px">name_prefix</span></label>
             <input  size="25"  type="text" id="firstName" name="firstName" value="${firstNameValue}" />
+            <input style="margin-left:138px" size="12"  type="text" id="prefix" name="prefix" value="${prefixValue}" />
         </p>
 
         <p>
-            <label for="middleName">${i18n().middle_name}</label>
+            <label for="middleName">${i18n().middle_name}<span style="padding-left:293px">name_suffix</span></label>
             <input  size="25"  type="text" id="middleName" name="middleName" value="${middleNameValue}" />
+            <input style="margin-left:138px"  size="12"  type="text" id="suffix" name="suffix" value="${suffixValue}" />
         </p>
 
         <p>

productMods/templates/freemarker/lib/lib-home-page.ftl

@@ -125,7 +125,7 @@
             <#if (group.individualCount > 0) && group.displayName == "research" >
                 <#assign foundClassGroup = true />
                 <#list group.classes as class>
-                    <#if (class.individualCount > 0) && (class.name == "Academic Article" || class.name == "Book" || class.name == "Chapter" ||class.name == "Conference Paper" || class.name == "Proceedings" || class.name == "Report") >
+                    <#if (class.individualCount > 0) && (class.uri?contains("Academic Article") || class.uri?contains("Book") || class.uri?contains("Chapter") ||class.uri?contains("Conference Paper") || class.uri?contains("Proceedings") || class.uri?contains("Report")) >
                         <li role="listitem">
                             <span>${class.individualCount!}</span>&nbsp;
                             <a href='${urls.base}/individuallist?vclassId=${class.uri?replace("#","%23")!}'>

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java

@@ -153,10 +153,10 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator
             "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
             "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
             "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+            "?vcardPerson a vcard:Individual . \n" + 
             "?vcardPerson vcard:hasName  ?vcardName . \n" +
-            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+            "?vcardName a vcard:Name . \n" +   
-            "?vcardName vcard:middleName ?middleName .";
+            "?vcardName <http://vivoweb.org/ontology/core#middleName> ?middleName .";
 	}
 	
 	private String getN3NewPersonLastName() {

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java

@@ -149,10 +149,10 @@ public class AddEditorsToInformationResourceGenerator extends VivoBaseGenerator
             "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
             "?newPerson <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n" +
             "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?newPerson . \n" +
-            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" + 
+            "?vcardPerson a vcard:Individual . \n" + 
             "?vcardPerson vcard:hasName  ?vcardName . \n" +
-            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +   
+            "?vcardName a vcard:Name . \n" +   
-            "?vcardName vcard:middleName ?middleName .";
+            "?vcardName <http://vivoweb.org/ontology/core#middleName> ?middleName .";
 	}
 	
 	private String getN3NewPersonLastName() {

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java

@@ -47,16 +47,18 @@ public class AddFullNameToPersonGenerator extends VivoBaseGenerator implements
         conf.setVarNameForObject("individualVcard");
         
         conf.setN3Required( Arrays.asList( n3ForNewName ) );
-        conf.setN3Optional( Arrays.asList( firstNameAssertion, middleNameAssertion, lastNameAssertion ) );
+        conf.setN3Optional( Arrays.asList( firstNameAssertion, middleNameAssertion, lastNameAssertion, suffixAssertion, prefixAssertion ) );
         
         conf.addNewResource("fullName", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("individualVcard", DEFAULT_NS_FOR_NEW_RESOURCE);
                 
-        conf.setLiteralsOnForm(Arrays.asList("firstName", "middleName", "lastName" ));
+        conf.setLiteralsOnForm(Arrays.asList("firstName", "middleName", "lastName", "suffix", "prefix" ));
         
         conf.addSparqlForExistingLiteral("firstName", firstNameQuery);
         conf.addSparqlForExistingLiteral("middleName", middleNameQuery);
         conf.addSparqlForExistingLiteral("lastName", lastNameQuery);
+        conf.addSparqlForExistingLiteral("suffix", suffixQuery);
+        conf.addSparqlForExistingLiteral("prefix", prefixQuery);
         conf.addSparqlForAdditionalUrisInScope("individualVcard", individualVcardQuery);
         
         if ( conf.isUpdate() ) {
@@ -79,6 +81,14 @@ public class AddFullNameToPersonGenerator extends VivoBaseGenerator implements
                 .setRangeDatatypeUri( XSD.xstring.toString() ).
                 setValidators( list("nonempty") ));
 
+        conf.addField( new FieldVTwo().                        
+                setName("suffix")
+                .setRangeDatatypeUri( XSD.xstring.toString()) );
+
+            conf.addField( new FieldVTwo().                        
+                setName("prefix")
+                .setRangeDatatypeUri( XSD.xstring.toString()) );
+
         conf.addValidator(new AntiXssValidation());
         
         prepare(vreq, conf);
@@ -98,11 +108,17 @@ public class AddFullNameToPersonGenerator extends VivoBaseGenerator implements
         "?fullName <http://www.w3.org/2006/vcard/ns#givenName> ?firstName .";
     
     final static String middleNameAssertion  =      
-        "?fullName <http://www.w3.org/2006/vcard/ns#middleName> ?middleName .";
+        "?fullName <http://vivoweb.org/ontology/core#middleName> ?middleName .";
 
     final static String lastNameAssertion  =      
         "?fullName <http://www.w3.org/2006/vcard/ns#familyName> ?lastName .";
 
+    final static String suffixAssertion  =      
+        "?fullName <http://www.w3.org/2006/vcard/ns#honorificSuffix> ?suffix .";
+
+    final static String prefixAssertion  =      
+        "?fullName <http://www.w3.org/2006/vcard/ns#honorificPrefix> ?prefix .";
+
     /* Queries for editing an existing entry */
 
     final static String individualVcardQuery =
@@ -116,12 +132,20 @@ public class AddFullNameToPersonGenerator extends VivoBaseGenerator implements
 
     final static String middleNameQuery  =      
         "SELECT ?existingMiddleName WHERE {\n"+
-        "?fullName <http://www.w3.org/2006/vcard/ns#middleName> ?existingMiddleName . }";
+        "?fullName <http://vivoweb.org/ontology/core#middleName> ?existingMiddleName . }";
 
     final static String lastNameQuery  =      
         "SELECT ?existingLastName WHERE {\n"+
         "?fullName <http://www.w3.org/2006/vcard/ns#familyName> ?existingLastName . }";
 
+    final static String suffixQuery  =      
+        "SELECT ?existingSuffix WHERE {\n"+
+        "?fullName <http://www.w3.org/2006/vcard/ns#honorificSuffix> ?existingSuffix . }";
+
+    final static String prefixQuery  =      
+        "SELECT ?existingPrefix WHERE {\n"+
+        "?fullName <http://www.w3.org/2006/vcard/ns#honorificPrefix> ?existingPrefix . }";
+
 	private String getFullNameUri(VitroRequest vreq) {
         String fullNameUri = vreq.getParameter("fullNameUri"); 
         

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java

@@ -46,12 +46,12 @@ public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator i
     	        N3_PREFIX + "@prefix vcard:<http://www.w3.org/2006/vcard/ns#> .\n"
     	                  + " ?newInd <http://purl.obolibrary.org/obo/ARG_2000028> ?newVcardInd . \n"
     	                  + " ?newVcardInd <http://purl.obolibrary.org/obo/ARG_2000029> ?newInd . \n"
-    	                  + " ?newVcardInd a <http://www.w3.org/2006/vcard/ns#Individual> . \n"
+    	                  + " ?newVcardInd a vcard:Individual . \n"
     	                  + " ?newVcardInd vcard:hasName  ?newVcardName . \n"
-    	                  + " ?newVcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n"
+    	                  + " ?newVcardName a vcard:Name . \n"
     	                  + " ?newVcardName vcard:givenName ?firstName . \n"
-    	                  + " ?newVcardName vcard:familyName ?lastName .",
+    	                  + " ?newVcardName vcard:familyName ?lastName . \n"
-    	        "?newVcardName <http://www.w3.org/2006/vcard/ns#middleName> ?middleName .",
+    	                  + " ?newVcardName <http://vivoweb.org/ontology/core#middleName> ?middleName .",
                 N3_PREFIX + " ?newInd <" + RDFS.label.getURI() + "> ?label ."
     	));
     	                    
@@ -90,7 +90,7 @@ public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator i
         
         //This combines the first and last name into the rdfs:label
         // currently being done via javascript in the template. May use this again
-        // when/if updated to IFS ontology.  tlw72
+        // when/if updated to ISF ontology.  tlw72
 //        config.addModelChangePreprocessor(new FoafNameToRdfsLabelPreprocessor());        
 
         String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);