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

NIHVIVO-2458 SolrPagedSearchController: remove code supporting alpha parameter, since not used; refinement links.

Browse source
This commit is contained in:
ryounes 2011-04-29 18:09:38 +00:00
parent 5467d62023
commit 57d9d061b5
2 changed files with 123 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java
View file

@ -78,7 +78,7 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
// namespace with a final slash, so this makes matching easier. // namespace with a final slash, so this makes matching easier.
// It also accords with the way the default namespace is defined. // It also accords with the way the default namespace is defined.
if (!namespace.endsWith("/")) { if (!namespace.endsWith("/")) {
namespace = namespace + "/"; namespace += "/";
} }
externallyLinkedNamespaces.add(namespace); externallyLinkedNamespaces.add(namespace);
} }

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

@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.search.controller;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
@ -159,9 +160,6 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
log.debug("IndividualDao is " + iDao.toString() + " Public classes in the classgroup are " + grpDao.getPublicGroupsWithVClasses().toString()); log.debug("IndividualDao is " + iDao.toString() + " Public classes in the classgroup are " + grpDao.getPublicGroupsWithVClasses().toString());
log.debug("VClassDao is "+ vclassDao.toString() ); log.debug("VClassDao is "+ vclassDao.toString() );
// RY Not sure where/how this is used ***
//String alphaFilter = vreq.getParameter("alpha");
int startIndex = 0; int startIndex = 0;
try{ try{
@ -182,10 +180,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
int maxHitSize = DEFAULT_MAX_SEARCH_SIZE ; int maxHitSize = DEFAULT_MAX_SEARCH_SIZE ;
if( startIndex >= DEFAULT_MAX_SEARCH_SIZE - hitsPerPage ) if( startIndex >= DEFAULT_MAX_SEARCH_SIZE - hitsPerPage )
maxHitSize = startIndex + DEFAULT_MAX_SEARCH_SIZE ; maxHitSize = startIndex + DEFAULT_MAX_SEARCH_SIZE ;
// if( alphaFilter != null ){
// maxHitSize = maxHitSize * 2;
// hitsPerPage = maxHitSize;
// }
log.debug("maxHitSize is " + maxHitSize); log.debug("maxHitSize is " + maxHitSize);
String qtxt = vreq.getParameter(VitroQuery.QUERY_PARAMETER_NAME); String qtxt = vreq.getParameter(VitroQuery.QUERY_PARAMETER_NAME);
@ -339,40 +334,36 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
if (type != null && type.getName() != null) if (type != null && type.getName() != null)
body.put("typeName", type.getName()); body.put("typeName", type.getName());
} }
//
// /* Add classgroup and type refinement links to body */ /* Add classgroup and type refinement links to body */
// if( wasHtmlRequested ){ if( wasHtmlRequested ){
// // Search request includes no classgroup and no type, so add classgroup search refinement links. // Search request includes no classgroup and no type, so add classgroup search refinement links.
// if ( !classGroupFilterRequested && !typeFiltereRequested ) { if ( !classGroupFilterRequested && !typeFiltereRequested ) {
// List<VClassGroup> classgroups = getClassGroups(grpDao, topDocs, searcherForRequest); List<VClassGroup> classgroups = getClassGroups(grpDao, docs);
// List<VClassGroupSearchLink> classGroupLinks = new ArrayList<VClassGroupSearchLink>(classgroups.size()); List<VClassGroupSearchLink> classGroupLinks = new ArrayList<VClassGroupSearchLink>(classgroups.size());
// for (VClassGroup vcg : classgroups) { for (VClassGroup vcg : classgroups) {
// if (vcg.getPublicName() != null) { if (vcg.getPublicName() != null) {
// classGroupLinks.add(new VClassGroupSearchLink(qtxt, vcg)); classGroupLinks.add(new VClassGroupSearchLink(qtxt, vcg));
// } }
// } }
// body.put("classGroupLinks", classGroupLinks); body.put("classGroupLinks", classGroupLinks);
//
// // Search request is for a classgroup, so add rdf:type search refinement links // Search request is for a classgroup, so add rdf:type search refinement links
// // but try to filter out classes that are subclasses // but try to filter out classes that are subclasses
// } else if ( classGroupFilterRequested && !typeFiltereRequested ) { } else if ( classGroupFilterRequested && !typeFiltereRequested ) {
// List<VClass> vClasses = getVClasses(vclassDao,topDocs,searcherForRequest); List<VClass> vClasses = getVClasses(vclassDao, docs);
// List<VClassSearchLink> vClassLinks = new ArrayList<VClassSearchLink>(vClasses.size()); List<VClassSearchLink> vClassLinks = new ArrayList<VClassSearchLink>(vClasses.size());
// for (VClass vc : vClasses) { for (VClass vc : vClasses) {
// 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("classgroup", classGroupParam);
//
// // This case is never displayed } else {
//// } else if (!StringUtils.isEmpty(alphaFilter)) { pagingLinkParams.put("type", typeParam);
//// body.put("alphas", getAlphas(topDocs, searcherForRequest)); }
//// alphaSortIndividuals(beans); }
// } else {
// pagingLinkParams.put("type", typeParam);
// }
// }
//
// Convert search result individuals to template model objects // Convert search result individuals to template model objects
// RY If this diverges significantly from what's used on the index page, // RY If this diverges significantly from what's used on the index page,
// create a different template model. // create a different template model.
@ -407,62 +398,34 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
} }
} }
private void alphaSortIndividuals(List<Individual> beans) {
Collections.sort(beans, new Comparator< Individual >(){
public int compare(Individual o1, Individual o2) {
if( o1 == null || o1.getName() == null )
return 1;
else
return o1.getName().compareTo(o2.getName());
}});
}
private List<String> getAlphas(TopDocs topDocs, IndexSearcher searcher) {
Set<String> alphas = new HashSet<String>();
for(int i=0;i<topDocs.scoreDocs.length; i++){
Document doc;
try {
doc = searcher.doc(topDocs.scoreDocs[i].doc);
String name =doc.get(Entity2LuceneDoc.term.NAME);
if( name != null && name.length() > 0)
alphas.add( name.substring(0, 1));
} catch (CorruptIndexException e) {
log.debug("Could not get alphas for document",e);
} catch (IOException e) {
log.debug("Could not get alphas for document",e);
}
}
return new ArrayList<String>(alphas);
}
/** /**
* Get the class groups represented for the individuals in the topDocs. * Get the class groups represented for the individuals in the topDocs.
*/ */
private List<VClassGroup> getClassGroups(VClassGroupDao grpDao, TopDocs topDocs, private List<VClassGroup> getClassGroups(VClassGroupDao grpDao, SolrDocumentList docs) {
IndexSearcher searcherForRequest) {
LinkedHashMap<String,VClassGroup> grpMap = grpDao.getClassGroupMap(); LinkedHashMap<String,VClassGroup> grpMap = grpDao.getClassGroupMap();
int n = grpMap.size(); int n = grpMap.size();
HashSet<String> classGroupsInHits = new HashSet<String>(n); HashSet<String> classGroupsInHits = new HashSet<String>(n);
int grpsFound = 0; int grpsFound = 0;
for(int i=0; i<topDocs.scoreDocs.length && n > grpsFound ;i++){ long hitCount = docs.getNumFound();
for(int i=0; i<hitCount && n > grpsFound ;i++){
try{ try{
Document doc = searcherForRequest.doc(topDocs.scoreDocs[i].doc); SolrDocument doc = docs.get(i);
Field[] grps = doc.getFields(Entity2LuceneDoc.term.CLASSGROUP_URI); Collection<Object> grps = doc.getFieldValues(Entity2LuceneDoc.term.CLASSGROUP_URI);
if(grps != null || grps.length > 0){ if (grps != null) {
for(int j=0;j<grps.length;j++){ for (Object o : grps) {
String groupUri = grps[j].stringValue(); String groupUri = o.toString();
if( groupUri != null && ! classGroupsInHits.contains(groupUri)){ if( groupUri != null && ! classGroupsInHits.contains(groupUri)){
classGroupsInHits.add(groupUri); classGroupsInHits.add(groupUri);
grpsFound++; grpsFound++;
if( grpsFound >= n ) if( grpsFound >= n )
break; break;
} }
} }
} }
}catch(Exception e){ } catch(Exception e) {
log.error("problem getting VClassGroups from search hits " log.error("problem getting VClassGroups from search hits "
+ e.getMessage()); + e.getMessage());
} }
@ -485,78 +448,9 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
return classgroups; return classgroups;
} }
private class VClassGroupSearchLink extends LinkTemplateModel {
VClassGroupSearchLink(String querytext, VClassGroup classgroup) {
super(classgroup.getPublicName(), "/search", "querytext", querytext, "classgroup", classgroup.getURI());
}
}
private class VClassSearchLink extends LinkTemplateModel {
VClassSearchLink(String querytext, VClass type) {
super(type.getName(), "/search", "querytext", querytext, "type", type.getURI());
}
}
private List<PagingLink> getPagingLinks(int startIndex, int hitsPerPage, long hitCount, int maxHitSize, String baseUrl, ParamMap params) {
List<PagingLink> pagingLinks = new ArrayList<PagingLink>(); private List<VClass> getVClasses(VClassDao vclassDao, SolrDocumentList docs){
HashSet<String> typesInHits = getVClassUrisForHits(docs);
// No paging links if only one page of results
if (hitCount <= hitsPerPage) {
return pagingLinks;
}
for (int i = 0; i < hitCount; i += hitsPerPage) {
params.put("startIndex", String.valueOf(i));
if ( i < maxHitSize - hitsPerPage) {
int pageNumber = i/hitsPerPage + 1;
if (i >= startIndex && i < (startIndex + hitsPerPage)) {
pagingLinks.add(new PagingLink(pageNumber));
} else {
pagingLinks.add(new PagingLink(pageNumber, baseUrl, params));
}
} else {
pagingLinks.add(new PagingLink("more...", baseUrl, params));
}
}
return pagingLinks;
}
private String getPreviousPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) {
params.put("startIndex", String.valueOf(startIndex-hitsPerPage));
//return new PagingLink("Previous", baseUrl, params);
return UrlBuilder.getUrl(baseUrl, params);
}
private String getNextPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) {
params.put("startIndex", String.valueOf(startIndex+hitsPerPage));
//return new PagingLink("Next", baseUrl, params);
return UrlBuilder.getUrl(baseUrl, params);
}
private class PagingLink extends LinkTemplateModel {
PagingLink(int pageNumber, String baseUrl, ParamMap params) {
super(String.valueOf(pageNumber), baseUrl, params);
}
// Constructor for current page item: not a link, so no url value.
PagingLink(int pageNumber) {
setText(String.valueOf(pageNumber));
}
// Constructor for "more..." item
PagingLink(String text, String baseUrl, ParamMap params) {
super(text, baseUrl, params);
}
}
private List<VClass> getVClasses(VClassDao vclassDao, TopDocs topDocs,
IndexSearcher searherForRequest){
HashSet<String> typesInHits = getVClassUrisForHits(topDocs,searherForRequest);
List<VClass> classes = new ArrayList<VClass>(typesInHits.size()); List<VClass> classes = new ArrayList<VClass>(typesInHits.size());
Iterator<String> it = typesInHits.iterator(); Iterator<String> it = typesInHits.iterator();
@ -582,20 +476,18 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
return classes; return classes;
} }
private HashSet<String> getVClassUrisForHits(TopDocs topDocs, private HashSet<String> getVClassUrisForHits(SolrDocumentList docs){
IndexSearcher searcherForRequest){ HashSet<String> typesInHits = new HashSet<String>();
HashSet<String> typesInHits = new HashSet<String>(); for (SolrDocument doc : docs) {
for(int i=0; i<topDocs.scoreDocs.length; i++){ try {
try{ Collection<Object> types = doc.getFieldValues(Entity2LuceneDoc.term.RDFTYPE);
Document doc=searcherForRequest.doc(topDocs.scoreDocs[i].doc); if (types != null) {
Field[] types = doc.getFields(Entity2LuceneDoc.term.RDFTYPE); for (Object o : types) {
if(types != null ){ String typeUri = o.toString();
for(int j=0;j<types.length;j++){
String typeUri = types[j].stringValue();
typesInHits.add(typeUri); typesInHits.add(typeUri);
} }
} }
}catch(Exception e){ } catch (Exception e) {
log.error("problems getting rdf:type for search hits",e); log.error("problems getting rdf:type for search hits",e);
} }
} }
@ -629,21 +521,6 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
QueryParser parser = getQueryParser(analyzer); QueryParser parser = getQueryParser(analyzer);
query = parser.parse(querystr); query = parser.parse(querystr);
String alpha = request.getParameter("alpha");
if( alpha != null && !"".equals(alpha) && alpha.length() == 1){
log.debug("Firing alpha query ");
log.debug("request.getParameter(alpha) is " + alpha);
BooleanQuery boolQuery = new BooleanQuery();
boolQuery.add( query, BooleanClause.Occur.MUST );
boolQuery.add(
new WildcardQuery(new Term(Entity2LuceneDoc.term.NAME, alpha+'*')),
BooleanClause.Occur.MUST);
query = boolQuery;
}
//check if this is classgroup filtered //check if this is classgroup filtered
Object param = request.getParameter("classgroup"); Object param = request.getParameter("classgroup");
@ -713,6 +590,75 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
return qp; return qp;
} }
private class VClassGroupSearchLink extends LinkTemplateModel {
VClassGroupSearchLink(String querytext, VClassGroup classgroup) {
super(classgroup.getPublicName(), "/search", "querytext", querytext, "classgroup", classgroup.getURI());
}
}
private class VClassSearchLink extends LinkTemplateModel {
VClassSearchLink(String querytext, VClass type) {
super(type.getName(), "/search", "querytext", querytext, "type", type.getURI());
}
}
private List<PagingLink> getPagingLinks(int startIndex, int hitsPerPage, long hitCount, int maxHitSize, String baseUrl, ParamMap params) {
List<PagingLink> pagingLinks = new ArrayList<PagingLink>();
// No paging links if only one page of results
if (hitCount <= hitsPerPage) {
return pagingLinks;
}
for (int i = 0; i < hitCount; i += hitsPerPage) {
params.put("startIndex", String.valueOf(i));
if ( i < maxHitSize - hitsPerPage) {
int pageNumber = i/hitsPerPage + 1;
if (i >= startIndex && i < (startIndex + hitsPerPage)) {
pagingLinks.add(new PagingLink(pageNumber));
} else {
pagingLinks.add(new PagingLink(pageNumber, baseUrl, params));
}
} else {
pagingLinks.add(new PagingLink("more...", baseUrl, params));
}
}
return pagingLinks;
}
private String getPreviousPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) {
params.put("startIndex", String.valueOf(startIndex-hitsPerPage));
//return new PagingLink("Previous", baseUrl, params);
return UrlBuilder.getUrl(baseUrl, params);
}
private String getNextPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) {
params.put("startIndex", String.valueOf(startIndex+hitsPerPage));
//return new PagingLink("Next", baseUrl, params);
return UrlBuilder.getUrl(baseUrl, params);
}
private class PagingLink extends LinkTemplateModel {
PagingLink(int pageNumber, String baseUrl, ParamMap params) {
super(String.valueOf(pageNumber), baseUrl, params);
}
// Constructor for current page item: not a link, so no url value.
PagingLink(int pageNumber) {
setText(String.valueOf(pageNumber));
}
// Constructor for "more..." item
PagingLink(String text, String baseUrl, ParamMap params) {
super(text, baseUrl, params);
}
}
private ExceptionResponseValues doSearchError(Throwable e, Format f) { private ExceptionResponseValues doSearchError(Throwable e, Format f) {
Map<String, Object> body = new HashMap<String, Object>(); Map<String, Object> body = new HashMap<String, Object>();
body.put("message", "Search failed: " + e.getMessage()); body.put("message", "Search failed: " + e.getMessage());