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

NIHVIVO-352 Applied Miles' patch for search snippets.

Browse source
This commit is contained in:
cappadona 2011-07-18 16:26:53 +00:00
parent d434376bdc
commit 8095541706
10 changed files with 53 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
solr/exampleSolr/conf/schema.xml
View file

@ -564,7 +564,7 @@
<field name="indexedTime" type="long" indexed="true" stored="true"/>
<field name="NAME_PHONETIC" type ="phonetic" indexed="true" stored="false" multiValued="true"/>
<field name="ALLTEXT" type="text" indexed="true" stored="false" multiValued="true"/>
<field name="ALLTEXT" type="text" indexed="true" stored="true" multiValued="true"/>
<field name="ALLTEXTUNSTEMMED" type="textgen" indexed="true" stored="false" multiValued="true"/>
<field name="ALLTEXT_PHONETIC" type="phonetic" indexed="true" stored="false" multiValued="true"/>

5
solr/exampleSolr/conf/solrconfig.xml
View file

@ -714,6 +714,11 @@
<int name="rows">10</int>
<str name="q.alt">*:*</str>
<str name="fl">*,score</str>
<str name="hl">true</str>
<str name="hl.fl">ALLTEXT</str>
<str name="hl.fragsize">160</str>
<str name="hl.simple.pre"><![CDATA[<strong>]]></str>
<str name="hl.simple.post"><![CDATA[</strong>]]></str>
</lst>
<!-- In addition to defaults, "appends" params can be specified
to identify values which should be appended to the list of

BIN
webapp/lib/jsoup-1.6.1.jar Normal file
View file

Binary file not shown.

3
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java
View file

@ -98,4 +98,7 @@ public interface Individual extends ResourceBean, Comparable<Individual> {
Float getSearchBoost();
void setSearchBoost( Float boost );
String getSearchSnippet();
void setSearchSnippet( String snippet );
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
View file

@ -54,6 +54,7 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
protected String mainImageUri = NOT_INITIALIZED;
protected ImageInfo imageInfo = null;
protected Float searchBoost;
protected String searchSnippet;
/** indicates if sortForDisplay has been called */
protected boolean sorted = false;
@ -277,6 +278,9 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
public Float getSearchBoost() { return searchBoost; }
public void setSearchBoost(Float boost) { searchBoost = boost; }
public String getSearchSnippet() { return searchSnippet; }
public void setSearchSnippet(String snippet) { searchSnippet = snippet; }
/**
* Sorts the ents2ents records into the proper order for display.
*

5
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
View file

@ -449,6 +449,11 @@ public class IndividualFiltering implements Individual {
@Override
public Float getSearchBoost() {return _innerIndividual.getSearchBoost(); }
@Override
public void setSearchSnippet(String snippet) { _innerIndividual.setSearchSnippet( snippet ); }
@Override
public String getSearchSnippet() {return _innerIndividual.getSearchSnippet(); }
@Override
public List<String> getDataValues(String propertyUri) {
List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);

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

@ -235,8 +235,10 @@ public class PagedSearchController extends FreemarkerHttpServlet {
Individual ent = new IndividualImpl();
ent.setURI(uri);
ent = iDao.getIndividualByURI(uri);
if(ent!=null)
if(ent!=null) {
ent.setSearchSnippet(getSnippet(doc, response));
individuals.add(ent);
}
} catch(Exception e) {
log.error("Problem getting usable individuals from search hits. " +
e.getMessage());
@ -440,6 +442,19 @@ public class PagedSearchController extends FreemarkerHttpServlet {
return typesInHits;
}
private String getSnippet(SolrDocument doc, QueryResponse response) {
String docId = doc.get(VitroSearchTermNames.DOCID).toString();
StringBuffer text = new StringBuffer("");
if (response.getHighlighting() != null && response.getHighlighting().get(docId) != null) {
List<String> snippets = response.getHighlighting().get(docId).get(VitroSearchTermNames.ALLTEXT);
if (snippets != null && snippets.size() > 0) {
text.append("... " + snippets.get(0) + " ...");
}
}
return text.toString();
}
private SolrQuery getQuery(String queryText, int maxHitCount, VitroRequest vreq) {
SolrQuery query = new SolrQuery(queryText);

16
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java
View file

@ -2,6 +2,8 @@
package edu.cornell.mannlib.vitro.webapp.search.solr;
import org.jsoup.Jsoup;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@ -149,11 +151,6 @@ public class IndividualToSolrDocument {
String t=null;
//ALLTEXT, all of the 'full text'
StringBuffer allTextValue = new StringBuffer();
allTextValue.append("");
allTextValue.append(" ");
allTextValue.append(((t=ind.getName()) == null)?"":t);
allTextValue.append(" ");
allTextValue.append(classPublicNames);
//collecting data property statements
List<DataPropertyStatement> dataPropertyStatements = ind.getDataPropertyStatements();
@ -171,7 +168,16 @@ public class IndividualToSolrDocument {
allTextValue.append(objectNames.toString());
try {
String stripped = Jsoup.parse(allTextValue.toString()).text();
allTextValue.setLength(0);
allTextValue.append(stripped);
} catch(Exception e) {
log.debug("Could not strip HTML during search indexing. " + e);
}
String alltext = allTextValue.toString();
doc.addField(term.ALLTEXT, alltext);
doc.addField(term.ALLTEXTUNSTEMMED, alltext);
doc.addField(term.ALLTEXT_PHONETIC, alltext);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/BaseIndividualSearchResult.java
View file

@ -63,4 +63,8 @@ public abstract class BaseIndividualSearchResult extends BaseTemplateModel {
return getView(ClassView.SEARCH);
}
public String getSnippet() {
return individual.getSearchSnippet();
}
}

2
webapp/web/templates/freemarker/body/partials/class/view/search/view-search-default.ftl
View file

@ -7,3 +7,5 @@
<a href="${individual.profileUrl}">${individual.name}</a>
<@p.mostSpecificTypes individual />
<p>${individual.snippet}</p>