litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Working on moving paged results to IndividualListController NIHVIVO-1503

Browse source
This commit is contained in:
bdc34 2010-12-13 21:24:43 +00:00
parent 68ef7ff400
commit 53de9ad8e9
5 changed files with 158 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityListController.java
View file

@ -3,11 +3,16 @@
package edu.cornell.mannlib.vitro.webapp.controller; package edu.cornell.mannlib.vitro.webapp.controller;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest; 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanQuery;
@ -115,23 +121,63 @@ public class EntityListController extends VitroHttpServlet {
*/ */
private void doVClass(VitroRequest request, HttpServletResponse res, VClass vclass) private void doVClass(VitroRequest request, HttpServletResponse res, VClass vclass)
throws ServletException, IOException, FlagException { throws ServletException, IOException, FlagException {
IndexSearcher index = LuceneIndexFactory.getIndexSearcher(getServletContext());
boolean isSinglePortal = request.getWebappDaoFactory().getPortalDao().isSinglePortal();
Portal portal = request.getPortal(); Map<String,Object> 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()/* + "&nbsp;("+vclass.getEntityCount()+")"*/);
} else {
request.setAttribute("title",classGroup.getPublicName());
request.setAttribute("subTitle",vclass.getName()/* + "&nbsp;("+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<String,Object> getResultsForVClass(String vclassURI, int page, String alpha, Portal portal, boolean isSinglePortal, IndividualDao indDao, ServletContext context)
throws CorruptIndexException, IOException, ServletException{
Map<String,Object> rvMap = new HashMap<String,Object>();
int portalId = 1; int portalId = 1;
if( portal != null ) if( portal != null )
portalId = portal.getPortalId(); portalId = portal.getPortalId();
String alpha = request.getParameter("alpha");
int page = getPage(request);
IndividualDao indDao = request.getWebappDaoFactory().getIndividualDao();
//make lucene query for this rdf:type //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 //execute lucene query for individuals of the specified type
IndexSearcher index = LuceneIndexFactory.getIndexSearcher(context);
TopDocs docs = index.search(query, null, TopDocs docs = index.search(query, null,
ENTITY_LIST_CONTROLLER_MAX_RESULTS, ENTITY_LIST_CONTROLLER_MAX_RESULTS,
new Sort(Entity2LuceneDoc.term.NAMEUNANALYZED)); new Sort(Entity2LuceneDoc.term.NAMEUNANALYZED));
@ -154,8 +200,10 @@ public class EntityListController extends VitroHttpServlet {
if (doc != null) { if (doc != null) {
String uri = doc.getField(Entity2LuceneDoc.term.URI).stringValue(); String uri = doc.getField(Entity2LuceneDoc.term.URI).stringValue();
Individual ind = indDao.getIndividualByURI( uri ); Individual ind = indDao.getIndividualByURI( uri );
if( ind != null ){
individuals.add( ind ); individuals.add( ind );
individualsAdded++; individualsAdded++;
}
} else { } else {
log.warn("no document found for lucene doc id " + hit.doc); log.warn("no document found for lucene doc id " + hit.doc);
} }
@ -165,60 +213,28 @@ public class EntityListController extends VitroHttpServlet {
ii++; ii++;
} }
rvMap.put("count", size);
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);
if( size > INDIVIDUALS_PER_PAGE ){ if( size > INDIVIDUALS_PER_PAGE ){
request.setAttribute("showPages", Boolean.TRUE); rvMap.put("showPages", Boolean.TRUE);
List<PageRecord> pageRecords = TabEntitiesController.makePagesList(size, INDIVIDUALS_PER_PAGE, page); List<PageRecord> 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);
request.setAttribute("totalCount", size); rvMap.put("alpha",alpha);
request.setAttribute("entities",individuals);
rvMap.put("totalCount", size);
rvMap.put("entities",individuals);
if (individuals == null) if (individuals == null)
log.debug("entities list is null for vclass " + vclass.getURI()); log.debug("entities list is null for vclass " + vclassURI );
return rvMap;
VClassGroup classGroup=vclass.getGroup();
if (classGroup==null) {
request.setAttribute("title",vclass.getName()/* + "&nbsp;("+vclass.getEntityCount()+")"*/);
} else {
request.setAttribute("title",classGroup.getPublicName());
request.setAttribute("subTitle",vclass.getName()/* + "&nbsp;("+vclass.getEntityCount()+")"*/);
} }
//FINALLY: send off to the BASIC_JSP to get turned into html private static BooleanQuery getQuery(String vclassUri, String alpha , boolean isSinglePortal, int portalId){
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);
}
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){
BooleanQuery query = new BooleanQuery(); BooleanQuery query = new BooleanQuery();
try{ try{
//query term for rdf:type //query term for rdf:type
@ -260,6 +276,23 @@ public class EntityListController extends VitroHttpServlet {
} }
} }
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) private void doHelp(HttpServletResponse res)
throws IOException, ServletException { throws IOException, ServletException {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java
View file

@ -4,7 +4,6 @@
package edu.cornell.mannlib.vitro.webapp.controller; package edu.cornell.mannlib.vitro.webapp.controller;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; 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.search.lucene.LuceneIndexer;
import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils; import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils;
import edu.cornell.mannlib.vitro.webapp.web.TabWebUtil; import edu.cornell.mannlib.vitro.webapp.web.TabWebUtil;
import freemarker.template.TemplateModel;
/** /**
* Produces the entity lists for tabs. * Produces the entity lists for tabs.

40
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
View file

@ -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.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; 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.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.ExceptionResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; 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.controller.freemarker.responsevalues.TemplateResponseValues;
import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel; 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 * Generates a list of individuals for display in a template
@ -63,16 +66,33 @@ public class IndividualListController extends FreemarkerHttpServlet {
+ VClass.class.getName() + "."); + VClass.class.getName() + ".");
} }
if (vclass != null) { body.put("vclassId", vclass.getURI());
// Create list of individual view objects
List<Individual> individualList = vreq.getWebappDaoFactory().getIndividualDao().getIndividualsByVClass(vclass);
if (individualList == null) { if (vclass != null) {
// RY Is this really an error? String alpha = EntityListController.getAlphaParamter(vreq);
log.error("individuals list is null"); int page = EntityListController.getPageParameter(vreq);
message = "No individuals to display."; Map<String,Object> map = EntityListController.getResultsForVClass(
} else { vclass.getURI(),
body.put("individuals", IndividualTemplateModel.getIndividualTemplateModelList(individualList, vreq)); page,
alpha,
vreq.getPortal(),
vreq.getWebappDaoFactory().getPortalDao().isSinglePortal(),
vreq.getWebappDaoFactory().getIndividualDao(),
getServletContext());
body.putAll(map);
List<Individual> inds = (List<Individual>)map.get("entities");
List<IndividualTemplateModel> indsTm = new ArrayList<IndividualTemplateModel>();
for(Individual ind : inds ){
indsTm.add(new IndividualTemplateModel(ind,vreq));
}
body.put("individuals", indsTm);
List<TemplateModel> wpages = new ArrayList<TemplateModel>();
List<PageRecord> pages = (List<PageRecord>)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(). // Set title and subtitle. Title will be retrieved later in getTitle().

3
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java
View file

@ -36,4 +36,7 @@ public class VClassTemplateModel extends BaseTemplateModel {
return vclass.getEntityCount(); return vclass.getEntityCount();
} }
public VClassGroupTemplateModel getGroup(){
return new VClassGroupTemplateModel(vclass.getGroup());
}
} }

27
webapp/web/templates/freemarker/body/individualList.ftl
View file

@ -14,6 +14,17 @@
<#if message??> <#if message??>
<p>${message}</p> <p>${message}</p>
<#else> <#else>
<#if pages?? >
<div>
pages
<#list pages as page>
<a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}">${page.text}</a>
<#if page.selected> selected </#if>
</#list>
</div>
</#if>
<ul> <ul>
<#list individuals as individual> <#list individuals as individual>
<li> <li>
@ -26,14 +37,30 @@
<ul class="individualData"> <ul class="individualData">
<@l.firstLastList> <@l.firstLastList>
<#if individual.moniker??><li>${individual.moniker}</li></#if> <#if individual.moniker??><li>${individual.moniker}</li></#if>
<#list individual.links as link> <#list individual.links as link>
<#if link?? && link.url?? && link.anchor?? >
<li><a class="externalLink" href="${link.url}">${link.anchor}</a></li> <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>
</#if>
</#list> </#list>
</@l.firstLastList> </@l.firstLastList>
</ul> </ul>
</li> </li>
</#list> </#list>
</ul> </ul>
<#if pages?? >
<div>
pages
<#list pages as page>
<a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}">${page.text}</a>
<#if page.selected> selected </#if>
</#list>
</div>
</#if> </#if>
</#if>
</div> </div>
</div> </div>