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

adding modifiers to SolrSetup.java

Browse source
This commit is contained in:
briancaruso 2011-05-31 19:08:35 +00:00
parent aca200fcc7
commit d5563f0436
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculatePhi.java
View file

@ -7,6 +7,12 @@ import org.apache.solr.common.SolrInputDocument;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
public class CalculatePhi implements DocumentModifier{ public class CalculatePhi implements DocumentModifier{
CalculateBeta betas;
// maybe Phi needs Beta?
public CalculatePhi(CalculateBeta betas){
this.betas = betas;
}
@Override @Override
public void modifyDocument(Individual individual, SolrInputDocument doc) { public void modifyDocument(Individual individual, SolrInputDocument doc) {

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

@ -70,10 +70,12 @@ public class IndividualToSolrDocument implements Obj2DocIface {
public IndividualToSolrDocument(ProhibitedFromSearch classesProhibitedFromSearch, public IndividualToSolrDocument(ProhibitedFromSearch classesProhibitedFromSearch,
IndividualProhibitedFromSearch individualProhibitedFromSearch, IndividualProhibitedFromSearch individualProhibitedFromSearch,
SearchQueryHandler searchQueryHandler,
List<DocumentModifier> docModifiers){ List<DocumentModifier> docModifiers){
this.classesProhibitedFromSearch = classesProhibitedFromSearch; this.classesProhibitedFromSearch = classesProhibitedFromSearch;
this.individualProhibitedFromSearch = individualProhibitedFromSearch; this.individualProhibitedFromSearch = individualProhibitedFromSearch;
this.documentModifiers = docModifiers; this.documentModifiers = docModifiers;
this.searchQueryHandler = searchQueryHandler;
fillContextNodes(); fillContextNodes();
} }

15
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
View file

@ -68,15 +68,18 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
/* setup the individual to solr doc translation */ /* setup the individual to solr doc translation */
//first we need a ent2luceneDoc translator //first we need a ent2luceneDoc translator
OntModel displayOntModel = (OntModel) sce.getServletContext().getAttribute("displayOntModel"); OntModel displayOntModel = (OntModel) sce.getServletContext().getAttribute("displayOntModel");
// Entity2LuceneDoc ent2LuceneDoc = new Entity2LuceneDoc(
// new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel), List<DocumentModifier> modifiers = new ArrayList<DocumentModifier>();
// new IndividualProhibitedFromSearch(context), CalculateBeta betas = new CalculateBeta(ModelContext.getJenaOntModel(context));
// new ContextNodesInclusionFactory(DisplayVocabulary.CONTEXT_NODES_URI, displayOntModel, context)); modifiers.add( new CalculateBeta(ModelContext.getJenaOntModel(context)));
// IndividualToSolrDocument indToSolrDoc = new IndividualToSolrDocument( ent2LuceneDoc ); modifiers.add( new CalculatePhi(betas));
modifiers.add( new ContextNodeFields() );
IndividualToSolrDocument indToSolrDoc = new IndividualToSolrDocument( IndividualToSolrDocument indToSolrDoc = new IndividualToSolrDocument(
new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel), new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel),
new IndividualProhibitedFromSearch(context), new IndividualProhibitedFromSearch(context),
new SearchQueryHandler(DisplayVocabulary.CONTEXT_NODES_URI, displayOntModel, context)); new SearchQueryHandler(DisplayVocabulary.CONTEXT_NODES_URI, displayOntModel, context),
modifiers);
List<Obj2DocIface> o2d = new ArrayList<Obj2DocIface>(); List<Obj2DocIface> o2d = new ArrayList<Obj2DocIface>();
o2d.add(indToSolrDoc); o2d.add(indToSolrDoc);