diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityListController.java index fae6c190f..24722f5d2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityListController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityListController.java @@ -3,11 +3,16 @@ package edu.cornell.mannlib.vitro.webapp.controller; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; @@ -16,6 +21,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.lucene.document.Document; +import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -115,23 +121,63 @@ public class EntityListController extends VitroHttpServlet { */ private void doVClass(VitroRequest request, HttpServletResponse res, VClass vclass) throws ServletException, IOException, FlagException { - IndexSearcher index = LuceneIndexFactory.getIndexSearcher(getServletContext()); - boolean isSinglePortal = request.getWebappDaoFactory().getPortalDao().isSinglePortal(); - Portal portal = request.getPortal(); + Map results = getResultsForVClass( + vclass.getURI(), + getPageParameter(request), + getAlphaParamter(request), + request.getPortal(), + request.getWebappDaoFactory().getPortalDao().isSinglePortal(), + request.getWebappDaoFactory().getIndividualDao(), + getServletContext()); + + /* copy values from results in to request attributes */ + request.setAttribute("entities", results.get("entities")); + request.setAttribute("count",results.get("count")); + request.setAttribute("totalCount",results.get("totalCount")); + request.setAttribute("alpha",results.get("alpha")); + request.setAttribute("showPages",results.get("showPages")); + request.setAttribute("pages",results.get("pages")); + + /* Setup any additional attributes that are needed */ + request.setAttribute("servlet",Controllers.ENTITY_LIST); + request.setAttribute("vclassId", vclass.getURI()); + request.setAttribute("controllerParam","vclassId=" + URLEncoder.encode(vclass.getURI(),"UTF-8")); + request.setAttribute("showAlpha","1"); + request.setAttribute("letters",Controllers.getLetters()); + + VClassGroup classGroup=vclass.getGroup(); + if (classGroup==null) { + request.setAttribute("title",vclass.getName()/* + " ("+vclass.getEntityCount()+")"*/); + } else { + request.setAttribute("title",classGroup.getPublicName()); + request.setAttribute("subTitle",vclass.getName()/* + " ("+vclass.getEntityCount()+")"*/); + } + + //FINALLY: send off to the BASIC_JSP to get turned into html + request.setAttribute("bodyJsp",Controllers.ENTITY_LIST_JSP); + RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); + + // use this for more direct debugging: RequestDispatcher rd = request.getRequestDispatcher(Controllers.ENTITY_LIST_JSP); + res.setContentType("text/html; charset=UTF-8"); + request.setAttribute("pageTime", System.currentTimeMillis()-startTime); + rd.include(request,res); + } + + + public static Map getResultsForVClass(String vclassURI, int page, String alpha, Portal portal, boolean isSinglePortal, IndividualDao indDao, ServletContext context) + throws CorruptIndexException, IOException, ServletException{ + Map rvMap = new HashMap(); + int portalId = 1; if( portal != null ) - portalId = portal.getPortalId(); - - - String alpha = request.getParameter("alpha"); - int page = getPage(request); - IndividualDao indDao = request.getWebappDaoFactory().getIndividualDao(); - + portalId = portal.getPortalId(); + //make lucene query for this rdf:type - Query query = getQuery(vclass.getURI(),alpha, isSinglePortal, portalId); + Query query = getQuery(vclassURI,alpha, isSinglePortal, portalId); //execute lucene query for individuals of the specified type + IndexSearcher index = LuceneIndexFactory.getIndexSearcher(context); TopDocs docs = index.search(query, null, ENTITY_LIST_CONTROLLER_MAX_RESULTS, new Sort(Entity2LuceneDoc.term.NAMEUNANALYZED)); @@ -153,9 +199,11 @@ public class EntityListController extends VitroHttpServlet { Document doc = index.doc(hit.doc); if (doc != null) { String uri = doc.getField(Entity2LuceneDoc.term.URI).stringValue(); - Individual ind = indDao.getIndividualByURI( uri ); - individuals.add( ind ); - individualsAdded++; + Individual ind = indDao.getIndividualByURI( uri ); + if( ind != null ){ + individuals.add( ind ); + individualsAdded++; + } } else { log.warn("no document found for lucene doc id " + hit.doc); } @@ -165,60 +213,28 @@ public class EntityListController extends VitroHttpServlet { ii++; } - - request.setAttribute("servlet",Controllers.ENTITY_LIST); - request.setAttribute("vclassId", vclass.getURI()); - request.setAttribute("controllerParam","vclassId=" + URLEncoder.encode(vclass.getURI(),"UTF-8")); - request.setAttribute("count", size); + rvMap.put("count", size); if( size > INDIVIDUALS_PER_PAGE ){ - request.setAttribute("showPages", Boolean.TRUE); + rvMap.put("showPages", Boolean.TRUE); List pageRecords = TabEntitiesController.makePagesList(size, INDIVIDUALS_PER_PAGE, page); - request.setAttribute("pages", pageRecords); + rvMap.put("pages", pageRecords); + }else{ + rvMap.put("showPages", Boolean.FALSE); + rvMap.put("pages", Collections.emptyList()); } - request.setAttribute("showAlpha","1"); - request.setAttribute("letters",Controllers.getLetters()); - request.setAttribute("alpha",alpha); + + rvMap.put("alpha",alpha); - request.setAttribute("totalCount", size); - request.setAttribute("entities",individuals); + rvMap.put("totalCount", size); + rvMap.put("entities",individuals); if (individuals == null) - log.debug("entities list is null for vclass " + vclass.getURI()); + log.debug("entities list is null for vclass " + vclassURI ); - - VClassGroup classGroup=vclass.getGroup(); - if (classGroup==null) { - request.setAttribute("title",vclass.getName()/* + " ("+vclass.getEntityCount()+")"*/); - } else { - request.setAttribute("title",classGroup.getPublicName()); - request.setAttribute("subTitle",vclass.getName()/* + " ("+vclass.getEntityCount()+")"*/); - } - - //FINALLY: send off to the BASIC_JSP to get turned into html - request.setAttribute("bodyJsp",Controllers.ENTITY_LIST_JSP); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - - // use this for more direct debugging: RequestDispatcher rd = request.getRequestDispatcher(Controllers.ENTITY_LIST_JSP); - res.setContentType("text/html; charset=UTF-8"); - request.setAttribute("pageTime", System.currentTimeMillis()-startTime); - rd.include(request,res); + return rvMap; } - - private int getPage(VitroRequest request) { - String pageStr = request.getParameter("page"); - if( pageStr != null ){ - try{ - return Integer.parseInt(pageStr); - }catch(NumberFormatException nfe){ - log.debug("could not parse page parameter"); - return 1; - } - }else{ - return 1; - } - } - - private BooleanQuery getQuery(String vclassUri, String alpha , boolean isSinglePortal, int portalId){ + + private static BooleanQuery getQuery(String vclassUri, String alpha , boolean isSinglePortal, int portalId){ BooleanQuery query = new BooleanQuery(); try{ //query term for rdf:type @@ -259,7 +275,24 @@ public class EntityListController extends VitroHttpServlet { return new BooleanQuery(); } } - + + public static int getPageParameter(VitroRequest request) { + String pageStr = request.getParameter("page"); + if( pageStr != null ){ + try{ + return Integer.parseInt(pageStr); + }catch(NumberFormatException nfe){ + log.debug("could not parse page parameter"); + return 1; + } + }else{ + return 1; + } + } + + public static String getAlphaParamter(VitroRequest request){ + return request.getParameter("alpha"); + } private void doHelp(HttpServletResponse res) throws IOException, ServletException { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java index 3739c1ac8..e5a488324 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.controller; import java.io.IOException; -import java.net.URLEncoder; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -40,6 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneIndexFactory; import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneIndexer; import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils; import edu.cornell.mannlib.vitro.webapp.web.TabWebUtil; +import freemarker.template.TemplateModel; /** * Produces the entity lists for tabs. @@ -564,7 +564,7 @@ public void doGet( HttpServletRequest req, HttpServletResponse response ) return records; } - public static class PageRecord { + public static class PageRecord { public PageRecord(String param, String index, String text, boolean selected) { this.param = param; this.index = index; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java index e839cca77..0be050331 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java @@ -13,13 +13,16 @@ import org.apache.commons.logging.LogFactory; 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.EntityListController; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.TabEntitiesController.PageRecord; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel; -import freemarker.template.Configuration; +import freemarker.ext.beans.BeansWrapper; +import freemarker.template.TemplateModel; /** * Generates a list of individuals for display in a template @@ -63,16 +66,33 @@ public class IndividualListController extends FreemarkerHttpServlet { + VClass.class.getName() + "."); } + body.put("vclassId", vclass.getURI()); + if (vclass != null) { - // Create list of individual view objects - List individualList = vreq.getWebappDaoFactory().getIndividualDao().getIndividualsByVClass(vclass); + String alpha = EntityListController.getAlphaParamter(vreq); + int page = EntityListController.getPageParameter(vreq); + Map map = EntityListController.getResultsForVClass( + vclass.getURI(), + page, + alpha, + vreq.getPortal(), + vreq.getWebappDaoFactory().getPortalDao().isSinglePortal(), + vreq.getWebappDaoFactory().getIndividualDao(), + getServletContext()); + body.putAll(map); - if (individualList == null) { - // RY Is this really an error? - log.error("individuals list is null"); - message = "No individuals to display."; - } else { - body.put("individuals", IndividualTemplateModel.getIndividualTemplateModelList(individualList, vreq)); + List inds = (List)map.get("entities"); + List indsTm = new ArrayList(); + for(Individual ind : inds ){ + indsTm.add(new IndividualTemplateModel(ind,vreq)); + } + body.put("individuals", indsTm); + + List wpages = new ArrayList(); + List pages = (List)body.get("pages"); + BeansWrapper wrapper = new BeansWrapper(); + for( PageRecord pr: pages ){ + wpages.add( wrapper.wrap(pr) ); } // Set title and subtitle. Title will be retrieved later in getTitle(). diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java index 898ef1cb5..059d70d6a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java @@ -36,4 +36,7 @@ public class VClassTemplateModel extends BaseTemplateModel { return vclass.getEntityCount(); } + public VClassGroupTemplateModel getGroup(){ + return new VClassGroupTemplateModel(vclass.getGroup()); + } } diff --git a/webapp/web/templates/freemarker/body/individualList.ftl b/webapp/web/templates/freemarker/body/individualList.ftl index 3539db3c7..e539d3f70 100644 --- a/webapp/web/templates/freemarker/body/individualList.ftl +++ b/webapp/web/templates/freemarker/body/individualList.ftl @@ -4,7 +4,7 @@ <#import "lib-list.ftl" as l> -
+

${title}

<#if subtitle??> @@ -14,6 +14,17 @@ <#if message??>

${message}

<#else> + + <#if pages?? > +
+ pages + <#list pages as page> + ${page.text} + <#if page.selected> selected + +
+ +
    <#list individuals as individual>
  • @@ -26,14 +37,30 @@
      <@l.firstLastList> <#if individual.moniker??>
    • ${individual.moniker}
      • + <#list individual.links as link> -
    • ${link.anchor}
      • + <#if link?? && link.url?? && link.anchor?? > +
    • ${link.anchor}
      • +
+ + <#if pages?? > +
+ pages + <#list pages as page> + ${page.text} + <#if page.selected> selected + +
+ -
+ + +
+