VCards in entry forms, list views, search indexing and visualization

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

@@ -109,6 +109,14 @@ public String getN3PrefixString() {
 		 "@prefix foaf: <" + foaf + "> .  \n"   ;
 	}
 
+    public String getVcardFailPattern() {
+        return "@prefix fail_pattern: ?createVCard .\n";
+    }
+
+    public String getPersonInstanceFailPattern() {
+        return "@prefix fail_pattern: ?createPersonInstance .\n";
+    }
+
 	private String getN3NewAuthorship() {
 		return getN3PrefixString() +
 		"?authorshipUri a core:Authorship ;\n" +
@@ -129,6 +137,12 @@ public List<String> generateN3Optional() {
                 getN3NewPersonMiddleName(),
                 getN3NewPersonLastName(),
                 getN3NewPerson(),
+
+                getN3NewPersonVCardFirstName() ,
+                getN3NewPersonVCardMiddleName(),
+                getN3NewPersonVCardLastName(),
+                getN3NewPersonVCard(),
+
                 getN3AuthorshipRank(),
                 getN3ForExistingPerson(),
                 getN3NewOrg(),
@@ -138,7 +152,7 @@ public List<String> generateN3Optional() {
 
 
 	private String getN3NewPersonFirstName() {
-		return getN3PrefixString() +
+		return getN3PrefixString() + getPersonInstanceFailPattern() +
             "@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" +
@@ -149,7 +163,7 @@ private String getN3NewPersonFirstName() {
 	}
 
 	private String getN3NewPersonMiddleName() {
-		return getN3PrefixString() +
+		return getN3PrefixString() + getPersonInstanceFailPattern() +
             "@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" +
@@ -160,7 +174,7 @@ private String getN3NewPersonMiddleName() {
 	}
 
 	private String getN3NewPersonLastName() {
-		return getN3PrefixString() +
+		return getN3PrefixString() + getPersonInstanceFailPattern() +
             "@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" +
@@ -171,13 +185,51 @@ private String getN3NewPersonLastName() {
 	}
 
 	private String getN3NewPerson() {
-		return  getN3PrefixString() +
+		return  getN3PrefixString() + getPersonInstanceFailPattern() +
         "?newPerson a foaf:Person ;\n" +
         "<" + RDFS.label.getURI() + "> ?label .\n" +
         "?authorshipUri core:relates ?newPerson .\n" +
         "?newPerson core:relatedBy ?authorshipUri . ";
 	}
 
+	// Changes here for creating vcards for external authors
+	private String getN3NewPersonVCardFirstName() {
+		return getN3PrefixString() + getVcardFailPattern() +
+            "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
+            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
+            "?vcardPerson vcard:hasName  ?vcardName . \n" +
+            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
+            "?vcardName vcard:givenName ?firstName .";
+	}
+
+	private String getN3NewPersonVCardMiddleName() {
+		return getN3PrefixString() + getVcardFailPattern() +
+            "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
+            "?vcardPerson a vcard:Individual . \n" +
+            "?vcardPerson vcard:hasName  ?vcardName . \n" +
+            "?vcardName a vcard:Name . \n" +
+            "?vcardName <http://vivoweb.org/ontology/core#middleName> ?middleName .";
+	}
+
+	private String getN3NewPersonVCardLastName() {
+		return getN3PrefixString() + getVcardFailPattern() +
+            "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
+            "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n" +
+            "?vcardPerson vcard:hasName  ?vcardName . \n" +
+            "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n" +
+            "?vcardName vcard:familyName ?lastName .";
+	}
+
+	// Changes here for creating vcards for external authors
+	private String getN3NewPersonVCard() {
+		return  getN3PrefixString() + getVcardFailPattern() +
+	"@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n" +
+	"?vcardPerson a vcard:Individual ;\n" +
+	"<" + RDFS.label.getURI() + "> ?label .\n" +
+        "?authorshipUri core:relates ?vcardPerson .\n" +
+        "?vcardPerson core:relatedBy ?authorshipUri . ";
+	}
+
 	private String getN3ForExistingPerson() {
 		return getN3PrefixString() +
 		"?authorshipUri core:relates ?personUri .\n" +
@@ -197,20 +249,6 @@ private String getN3ForExistingOrg() {
 		"?authorshipUri core:relates ?orgUri .\n" +
 		"?orgUri core:relatedBy ?authorshipUri .";
 	}
-	/**  Get new resources	 */
-	//A new authorship uri will always be created when an author is added
-	//A new person may be added if a person not in the system will be added as author
-	 private Map<String, String> generateNewResources(VitroRequest vreq) {
-
-
-			HashMap<String, String> newResources = new HashMap<String, String>();
-			newResources.put("authorshipUri", DEFAULT_NS_TOKEN);
-			newResources.put("newPerson", DEFAULT_NS_TOKEN);
-			newResources.put("vcardPerson", DEFAULT_NS_TOKEN);
-			newResources.put("vcardName", DEFAULT_NS_TOKEN);
-			newResources.put("newOrg", DEFAULT_NS_TOKEN);
-			return newResources;
-		}
 
 	/** Set URIS and Literals In Scope and on form and supporting methods	 */
     private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
@@ -229,6 +267,9 @@ public void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, Vi
     	//If an existing person is being used as an author, need to get the person uri
     	urisOnForm.add("personUri");
     	urisOnForm.add("orgUri");
+
+    	urisOnForm.add("createPersonInstance");
+        urisOnForm.add("createVCard");
     	editConfiguration.setUrisOnform(urisOnForm);
 
     	//for person who is not in system, need to add first name, last name and middle name
@@ -247,7 +288,6 @@ private void setSparqlQueries(EditConfigurationVTwo editConfiguration, VitroRequ
         //Sparql queries are all empty for existing values
     	//This form is different from the others that it gets multiple authors on the same page
     	//and that information will be queried and stored in the additional form specific data
-        HashMap<String, String> map = new HashMap<String, String>();
     	editConfiguration.setSparqlForExistingUris(new HashMap<String, String>());
     	editConfiguration.setSparqlForExistingLiterals(new HashMap<String, String>());
     	editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
@@ -268,6 +308,7 @@ public void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq
     	setPersonUriField(editConfiguration);
     	setOrgUriField(editConfiguration);
     	setOrgNameField(editConfiguration);
+    	setPatternFailFields(editConfiguration);
     }
 
 	private void setLabelField(EditConfigurationVTwo editConfiguration) {
@@ -287,6 +328,10 @@ private void setFirstNameField(EditConfigurationVTwo editConfiguration) {
 				);
 	}
 
+   private void setPatternFailFields(EditConfigurationVTwo editConfiguration) {
+        editConfiguration.addField(new FieldVTwo().setName("createVCard"));
+        editConfiguration.addField(new FieldVTwo().setName("createPersonInstance"));
+    }
 
 	private void setMiddleNameField(EditConfigurationVTwo editConfiguration) {
 		editConfiguration.addField(new FieldVTwo().
@@ -436,7 +481,7 @@ public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRe
 	    + "	 bind ( COALESCE(?firstName, \"\") As ?firstName1) . \n"
 	    + "	 bind ( COALESCE(?middleName, \"\") As ?middleName1) . \n"
 	    + "	 bind ( COALESCE(?lastName, \"\") As ?lastName1) . \n"
-	    + "	 bind (concat(str(?lastName1 + \", \"),str(?middleName1 + \" \"),str(?firstName1)) as ?authorName) . \n"
+	    + "	 bind (concat(str(str(?lastName1) + \", \"),str(str(?middleName1) + \" \"),str(?firstName1)) as ?authorName) . \n"
         + "} } ORDER BY ?rank";