diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculatePhi.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculatePhi.java index 57c01dda1..245ed7fec 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculatePhi.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculatePhi.java @@ -7,7 +7,13 @@ import org.apache.solr.common.SolrInputDocument; import edu.cornell.mannlib.vitro.webapp.beans.Individual; public class CalculatePhi implements DocumentModifier{ + CalculateBeta betas; + // maybe Phi needs Beta? + public CalculatePhi(CalculateBeta betas){ + this.betas = betas; + } + @Override public void modifyDocument(Individual individual, SolrInputDocument doc) { // TODO Auto-generated method stub diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java index 756ec1e73..53976a5e4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java @@ -70,10 +70,12 @@ public class IndividualToSolrDocument implements Obj2DocIface { public IndividualToSolrDocument(ProhibitedFromSearch classesProhibitedFromSearch, IndividualProhibitedFromSearch individualProhibitedFromSearch, + SearchQueryHandler searchQueryHandler, List docModifiers){ this.classesProhibitedFromSearch = classesProhibitedFromSearch; this.individualProhibitedFromSearch = individualProhibitedFromSearch; this.documentModifiers = docModifiers; + this.searchQueryHandler = searchQueryHandler; fillContextNodes(); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java index 3d910fb45..3bb6524ec 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java @@ -68,15 +68,18 @@ public class SolrSetup implements javax.servlet.ServletContextListener{ /* setup the individual to solr doc translation */ //first we need a ent2luceneDoc translator OntModel displayOntModel = (OntModel) sce.getServletContext().getAttribute("displayOntModel"); -// Entity2LuceneDoc ent2LuceneDoc = new Entity2LuceneDoc( -// new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel), -// new IndividualProhibitedFromSearch(context), -// new ContextNodesInclusionFactory(DisplayVocabulary.CONTEXT_NODES_URI, displayOntModel, context)); -// IndividualToSolrDocument indToSolrDoc = new IndividualToSolrDocument( ent2LuceneDoc ); + + List modifiers = new ArrayList(); + CalculateBeta betas = new CalculateBeta(ModelContext.getJenaOntModel(context)); + modifiers.add( new CalculateBeta(ModelContext.getJenaOntModel(context))); + modifiers.add( new CalculatePhi(betas)); + modifiers.add( new ContextNodeFields() ); + IndividualToSolrDocument indToSolrDoc = new IndividualToSolrDocument( new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel), new IndividualProhibitedFromSearch(context), - new SearchQueryHandler(DisplayVocabulary.CONTEXT_NODES_URI, displayOntModel, context)); + new SearchQueryHandler(DisplayVocabulary.CONTEXT_NODES_URI, displayOntModel, context), + modifiers); List o2d = new ArrayList(); o2d.add(indToSolrDoc);