From c2d24cb74dae14222e08d3f3294f2e7cdbee92c2 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Mon, 9 Jun 2014 17:11:34 -0400
Subject: [PATCH] VIVO-454

---
 .../js/visualization/personlevel/person-level.js       | 10 +++++-----
 .../utilities/UtilitiesRequestHandler.java             |  4 ++--
 .../visutils/AllPropertiesQueryRunner.java             |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/productMods/js/visualization/personlevel/person-level.js b/productMods/js/visualization/personlevel/person-level.js
index 3398ab36..69757f27 100644
--- a/productMods/js/visualization/personlevel/person-level.js
+++ b/productMods/js/visualization/personlevel/person-level.js
@@ -126,9 +126,9 @@ function setProfileMoniker(monikerContainerID, moniker, doEllipsis) {
 
 	var finalDisplayMoniker;
 	
-	if (moniker.length > 30 && doEllipsis) {
+	if (moniker.length > 40 && doEllipsis) {
 		
-		finalDisplayMoniker = moniker.substr(0,30) + "...";
+		finalDisplayMoniker = moniker.substr(0,40) + "...";
 		
 	} else {
 		
@@ -154,9 +154,9 @@ function setProfileName(nameContainerID, name, doNameEllipsis) {
 
 	var finalDisplayName;
 	
-	if (name.length > 30 && doNameEllipsis) {
+	if (name.length > 40 && doNameEllipsis) {
 		
-		finalDisplayName = name.substr(0,30) + "...";
+		finalDisplayName = name.substr(0,40) + "...";
 		
 	} else {
 		
@@ -188,7 +188,7 @@ function processProfileInformation(nameContainerID,
 
 			mainImageURL = set[0];
 
-		} else if (key.search(/moniker/i) > -1) {
+		} else if (key.search(/title/i) > -1) {
 
 			moniker = set[0];
 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
index d13624cc..242118c0 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
@@ -68,8 +68,8 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
 			
 			
 			String filterRule = "?predicate = j.2:mainImage " 
-//									+ "|| ?predicate = core:preferredTitle "  
-									+ "|| ?predicate = rdfs:label";
+									+ " || ?predicate = rdfs:label "   
+									+ " || ?predicate =  <http://www.w3.org/2006/vcard/ns#title>";
 			
 			QueryRunner<GenericQueryMap> profileQueryHandler = 
 					new AllPropertiesQueryRunner(individualURI, 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
index c12d67b5..22e90f60 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
@@ -99,8 +99,11 @@ public class AllPropertiesQueryRunner implements QueryRunner<GenericQueryMap> {
 							+ "SELECT "
 							+ "		(str(?predicate) as ?" + QueryFieldLabels.PREDICATE + ") " 
 							+ "		(str(?object) as ?" + QueryFieldLabels.OBJECT + ") "
-							+ "WHERE { "
-							+ "<" + queryURI + "> ?predicate ?object.  "
+							+ "WHERE { {"
+							+ "<" + queryURI + "> ?predicate ?object.  }"
+							+ "UNION {<" + queryURI + ">  <http://purl.obolibrary.org/obo/ARG_2000028> ?vCard . "
+							+ "?vCard <http://www.w3.org/2006/vcard/ns#hasTitle> ?vTitle . "
+							+ "?vTitle ?predicate ?object . }"
 							+ filterClause
 							+ "}";