From d230bd73d7920c181aef0ab725f0a2b3861f2586 Mon Sep 17 00:00:00 2001 From: ryounes Date: Fri, 8 Jul 2011 15:17:54 +0000 Subject: [PATCH] NIHVIVO-2449 Send mostSpecificTypes to menu page template. Small wording tweak on add user accounts page. Correct inverse property in manageWebpagesForIndividual.jsp. Switch class dependencies from Lucene to Solr servlets. --- .../vitro/webapp/beans/DataPropertyComparator.java | 2 -- .../vitro/webapp/controller/SolrJsonServlet.java | 12 +++--------- .../utils/pageDataGetter/BrowseDataGetter.java | 1 - .../webapp/utils/pageDataGetter/DataGetterUtils.java | 2 +- .../vitro/webapp/web/widgets/BrowseWidget.java | 5 ++--- .../freemarker/body/accounts/userAccounts-add.ftl | 2 +- 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java index ac25af2f1..d6d562384 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java @@ -9,8 +9,6 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.vocabulary.XSD; -import edu.cornell.mannlib.vitro.webapp.search.controller.AutocompleteController; - /* This class is used to order authorships on the add author form. It should be removed in favor of using whatever * method is used to order authorships on the publication profile page instead. I've implemented this due to * time constraints. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonServlet.java index 1990aefaf..78e85e122 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonServlet.java @@ -280,16 +280,10 @@ public class SolrJsonServlet extends VitroHttpServlet { } - public static String getMostSpecificTypeName(Individual individual, WebappDaoFactory wdf) { + public static Collection getMostSpecificTypes(Individual individual, WebappDaoFactory wdf) { ObjectPropertyStatementDao opsDao = wdf.getObjectPropertyStatementDao(); - Map types = opsDao.getMostSpecificTypesForIndividual(individual.getURI()); - Collection typeLabels = types.values(); - Iterator i = typeLabels.iterator(); - // Temporarily just returning one vaue since that's what the js expects. Fix later. - if (i.hasNext()) { - return i.next(); - } - return ""; + Map mostSpecificTypes = opsDao.getMostSpecificTypesForIndividual(individual.getURI()); + return mostSpecificTypes.values(); } public static String getDataPropertyValue(Individual ind, DataProperty dp, WebappDaoFactory wdf){ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java index e89dcf5cf..07062e45d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java @@ -27,7 +27,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; import edu.cornell.mannlib.vitro.webapp.utils.JSONtoFmModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.BaseListedIndividual; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; public class BrowseDataGetter implements PageDataGetter { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java index 263393fe1..c97d5bf75 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java @@ -241,7 +241,7 @@ public class DataGetterUtils { jo.put("imageUrl", ind.getImageUrl()); jo.put("profileUrl", UrlBuilder.getIndividualProfileUrl(ind, vreq)); - jo.put("vclassName", SolrJsonServlet.getMostSpecificTypeName(ind,fullWdf)); + jo.put("mostSpecificTypes", SolrJsonServlet.getMostSpecificTypes(ind,fullWdf)); jo.put("preferredTitle", SolrJsonServlet.getDataPropertyValue(ind, preferredTitleDp, fullWdf)); jo.put("firstName", SolrJsonServlet.getDataPropertyValue(ind, fNameDp, fullWdf)); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java index 57ffac447..278b1a0f1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java @@ -19,14 +19,13 @@ import org.json.JSONObject; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; -import edu.cornell.mannlib.vitro.webapp.controller.JSONServlet; +import edu.cornell.mannlib.vitro.webapp.controller.SolrJsonServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; import edu.cornell.mannlib.vitro.webapp.utils.JSONtoFmModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.BaseListedIndividual; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; import freemarker.core.Environment; import freemarker.template.TemplateModelException; @@ -84,7 +83,7 @@ public class BrowseWidget extends Widget { VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri); map.put("class", new VClassTemplateModel(vclass)); - JSONObject vclassRes = JSONServlet.getLuceneIndividualsByVClass(vclass.getURI(), request, context); + JSONObject vclassRes = SolrJsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context); map.put("totalCount", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); map.put("alpha", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); map.put("individuals", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") )); diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl index 1c178f0ef..194437ccb 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl @@ -74,7 +74,7 @@ <#if emailIsEnabled??>

Note: An email will be sent to the address entered above - notifying that an account has been created. + notifying the user that an account has been created. It will include instructions for activating the account and creating a password.

<#else>