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

NIHVIVO-2437 Minor refactoring

Browse source
This commit is contained in:
ryounes 2011-05-12 20:42:14 +00:00
parent 42cee19d55
commit d4aff14e6f
3 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -364,7 +364,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
body.put("title", qtxt + " - " + appBean.getApplicationName() body.put("title", qtxt + " - " + appBean.getApplicationName()
+ " Search Results"); + " Search Results");
body.put("hitsLength",hitsLength); body.put("hitCount",hitsLength);
body.put("startIndex", startIndex); body.put("startIndex", startIndex);
body.put("pagingLinks", getPagingLinks(startIndex, hitsPerPage, body.put("pagingLinks", getPagingLinks(startIndex, hitsPerPage,

47
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java
View file

@ -73,10 +73,17 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(SolrPagedSearchController.class); private static final Log log = LogFactory.getLog(SolrPagedSearchController.class);
private static final String XML_REQUEST_PARAM = "xml";
private static final int DEFAULT_HITS_PER_PAGE = 25; private static final int DEFAULT_HITS_PER_PAGE = 25;
private static final int DEFAULT_MAX_SEARCH_SIZE = 1000; private static final int DEFAULT_MAX_SEARCH_SIZE = 1000;
private static final String PARAM_XML_REQUEST = "xml";
private static final String PARAM_START_INDEX = "startIndex";
private static final String PARAM_HITS_PER_PAGE = "hitsPerPage";
private static final String PARAM_CLASSGROUP = "classgroup";
private static final String PARAM_RDFTYPE = "type";
private static final String PARAM_QUERY_TEXT = "querytext";
protected static final Map<Format,Map<Result,String>> templateTable; protected static final Map<Format,Map<Result,String>> templateTable;
protected enum Format { protected enum Format {
@ -148,7 +155,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
int startIndex = 0; int startIndex = 0;
try{ try{
startIndex = Integer.parseInt(vreq.getParameter("startIndex")); startIndex = Integer.parseInt(vreq.getParameter(PARAM_START_INDEX));
}catch (Throwable e) { }catch (Throwable e) {
startIndex = 0; startIndex = 0;
} }
@ -156,7 +163,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
int hitsPerPage = DEFAULT_HITS_PER_PAGE; int hitsPerPage = DEFAULT_HITS_PER_PAGE;
try{ try{
hitsPerPage = Integer.parseInt(vreq.getParameter("hitsPerPage")); hitsPerPage = Integer.parseInt(vreq.getParameter(PARAM_HITS_PER_PAGE));
} catch (Throwable e) { } catch (Throwable e) {
hitsPerPage = DEFAULT_HITS_PER_PAGE; hitsPerPage = DEFAULT_HITS_PER_PAGE;
} }
@ -244,18 +251,18 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
} }
ParamMap pagingLinkParams = new ParamMap(); ParamMap pagingLinkParams = new ParamMap();
pagingLinkParams.put("querytext", qtxt); pagingLinkParams.put(PARAM_QUERY_TEXT, qtxt);
pagingLinkParams.put("hitsPerPage", String.valueOf(hitsPerPage)); pagingLinkParams.put(PARAM_HITS_PER_PAGE, String.valueOf(hitsPerPage));
if( wasXmlRequested ){ if( wasXmlRequested ){
pagingLinkParams.put(XML_REQUEST_PARAM,"1"); pagingLinkParams.put(PARAM_XML_REQUEST,"1");
} }
/* Compile the data for the templates */ /* Compile the data for the templates */
Map<String, Object> body = new HashMap<String, Object>(); Map<String, Object> body = new HashMap<String, Object>();
String classGroupParam = vreq.getParameter("classgroup"); String classGroupParam = vreq.getParameter(PARAM_CLASSGROUP);
boolean classGroupFilterRequested = false; boolean classGroupFilterRequested = false;
if (!StringUtils.isEmpty(classGroupParam)) { if (!StringUtils.isEmpty(classGroupParam)) {
VClassGroup grp = grpDao.getGroupByURI(classGroupParam); VClassGroup grp = grpDao.getGroupByURI(classGroupParam);
@ -264,7 +271,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
body.put("classGroupName", grp.getPublicName()); body.put("classGroupName", grp.getPublicName());
} }
String typeParam = vreq.getParameter("type"); String typeParam = vreq.getParameter(PARAM_RDFTYPE);
boolean typeFilterRequested = false; boolean typeFilterRequested = false;
if (!StringUtils.isEmpty(typeParam)) { if (!StringUtils.isEmpty(typeParam)) {
VClass type = vclassDao.getVClassByURI(typeParam); VClass type = vclassDao.getVClassByURI(typeParam);
@ -295,10 +302,10 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
vClassLinks.add(new VClassSearchLink(qtxt, vc)); vClassLinks.add(new VClassSearchLink(qtxt, vc));
} }
body.put("classLinks", vClassLinks); body.put("classLinks", vClassLinks);
pagingLinkParams.put("classgroup", classGroupParam); pagingLinkParams.put(PARAM_CLASSGROUP, classGroupParam);
} else { } else {
pagingLinkParams.put("type", typeParam); pagingLinkParams.put(PARAM_RDFTYPE, typeParam);
} }
} }
@ -312,7 +319,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
body.put("title", qtxt + " - " + appBean.getApplicationName() body.put("title", qtxt + " - " + appBean.getApplicationName()
+ " Search Results"); + " Search Results");
body.put("hitsLength", hitCount); body.put("hitCount", hitCount);
body.put("startIndex", startIndex); body.put("startIndex", startIndex);
body.put("pagingLinks", getPagingLinks(startIndex, hitsPerPage, body.put("pagingLinks", getPagingLinks(startIndex, hitsPerPage,
@ -443,7 +450,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
query.setRows(maxHitCount); query.setRows(maxHitCount);
// Classgroup filtering // Classgroup filtering
Object param = vreq.getParameter("classgroup"); Object param = vreq.getParameter(PARAM_CLASSGROUP);
if( param != null && !"".equals(param)){ if( param != null && !"".equals(param)){
log.debug("Firing classgroup query "); log.debug("Firing classgroup query ");
log.debug("request.getParameter(classgroup) is "+ param.toString()); log.debug("request.getParameter(classgroup) is "+ param.toString());
@ -451,7 +458,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
} }
// rdf:type filtering // rdf:type filtering
param = vreq.getParameter("type"); param = vreq.getParameter(PARAM_RDFTYPE);
if( param != null && !"".equals(param)){ if( param != null && !"".equals(param)){
log.debug("Firing type query "); log.debug("Firing type query ");
log.debug("request.getParameter(type) is "+ param.toString()); log.debug("request.getParameter(type) is "+ param.toString());
@ -483,14 +490,14 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
private class VClassGroupSearchLink extends LinkTemplateModel { private class VClassGroupSearchLink extends LinkTemplateModel {
VClassGroupSearchLink(String querytext, VClassGroup classgroup) { VClassGroupSearchLink(String querytext, VClassGroup classgroup) {
super(classgroup.getPublicName(), "/search", "querytext", querytext, "classgroup", classgroup.getURI()); super(classgroup.getPublicName(), "/search", PARAM_QUERY_TEXT, querytext, PARAM_CLASSGROUP, classgroup.getURI());
} }
} }
private class VClassSearchLink extends LinkTemplateModel { private class VClassSearchLink extends LinkTemplateModel {
VClassSearchLink(String querytext, VClass type) { VClassSearchLink(String querytext, VClass type) {
super(type.getName(), "/search", "querytext", querytext, "type", type.getURI()); super(type.getName(), "/search", PARAM_QUERY_TEXT, querytext, PARAM_RDFTYPE, type.getURI());
} }
} }
@ -504,7 +511,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
} }
for (int i = 0; i < hitCount; i += hitsPerPage) { for (int i = 0; i < hitCount; i += hitsPerPage) {
params.put("startIndex", String.valueOf(i)); params.put(PARAM_START_INDEX, String.valueOf(i));
if ( i < maxHitCount - hitsPerPage) { if ( i < maxHitCount - hitsPerPage) {
int pageNumber = i/hitsPerPage + 1; int pageNumber = i/hitsPerPage + 1;
if (i >= startIndex && i < (startIndex + hitsPerPage)) { if (i >= startIndex && i < (startIndex + hitsPerPage)) {
@ -521,12 +528,12 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
} }
private String getPreviousPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) { private String getPreviousPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) {
params.put("startIndex", String.valueOf(startIndex-hitsPerPage)); params.put(PARAM_START_INDEX, String.valueOf(startIndex-hitsPerPage));
return UrlBuilder.getUrl(baseUrl, params); return UrlBuilder.getUrl(baseUrl, params);
} }
private String getNextPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) { private String getNextPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) {
params.put("startIndex", String.valueOf(startIndex+hitsPerPage)); params.put(PARAM_START_INDEX, String.valueOf(startIndex+hitsPerPage));
return UrlBuilder.getUrl(baseUrl, params); return UrlBuilder.getUrl(baseUrl, params);
} }
@ -650,7 +657,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
protected boolean isRequestedFormatXml(HttpServletRequest req){ protected boolean isRequestedFormatXml(HttpServletRequest req){
if( req != null ){ if( req != null ){
String param = req.getParameter(XML_REQUEST_PARAM); String param = req.getParameter(PARAM_XML_REQUEST);
if( param != null && "1".equals(param)){ if( param != null && "1".equals(param)){
return true; return true;
}else{ }else{

2
webapp/web/templates/freemarker/body/search/search-xmlResults.ftl
View file

@ -9,7 +9,7 @@
</#if> </#if>
</lst> </lst>
<result name="response" numFound="${hitsLength}" start="${startIndex}" > <result name="response" numFound="${hitCount}" start="${startIndex}" >
<#list individuals as individual> <#list individuals as individual>
<doc> <doc>
<str name="uri">${individual.uri?xml}</str> <str name="uri">${individual.uri?xml}</str>