diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java index b96272883..1fda3985a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java @@ -8,11 +8,9 @@ import java.util.Map; import org.json.JSONException; import org.json.JSONObject; -import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.controller.json.JsonServlet; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; @@ -27,11 +25,6 @@ public class IndividualJsonWrapper { // need an unfiltered dao to get firstnames and lastnames WebappDaoFactory fullWdf = vreq.getUnfilteredWebappDaoFactory(); - // TODO -- get this VIVO property out of Vitro code! - DataProperty preferredTitleDp = (new DataProperty()); - preferredTitleDp - .setURI("http://vivoweb.org/ontology/core#preferredTitle"); - JSONObject jo = new JSONObject(); jo.put("URI", ind.getURI()); jo.put("label", ind.getRdfsLabel()); @@ -40,8 +33,6 @@ public class IndividualJsonWrapper { jo.put("imageUrl", ind.getImageUrl()); jo.put("profileUrl", UrlBuilder.getIndividualProfileUrl(ind, vreq)); jo.put("mostSpecificTypes", getMostSpecificTypes(ind, fullWdf)); - jo.put("preferredTitle", JsonServlet.getDataPropertyValue(ind, - preferredTitleDp, fullWdf)); return jo; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java index c3a0b6be4..794837d24 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java @@ -439,9 +439,13 @@ public class FakeApplicationOntologyService { * "display model". The query finds a preferred title for the individual. */ private static class FakeVivoPeopleDataGetter extends SparqlQueryDataGetter { - private static final String QUERY_STRING = "SELECT ?uri ?pt WHERE {\n" - + " ?uri ?pt\n" - + "} LIMIT 1"; + private static String QUERY_STRING = "" + + "PREFIX obo: \n" + + "PREFIX vcard: \n" + + "SELECT ?uri ?pt \n" + "WHERE { \n" + + " ?uri obo:ARG_2000028 ?vIndividual . \n" + + " ?vIndividual vcard:hasTitle ?vTitle . \n" + + " ?vTitle vcard:title ?pt . \n" + "} LIMIT 1"; private static final String FAKE_VIVO_PEOPLE_DATA_GETTER_URI = "http://FakeVivoPeopleDataGetter";