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

NIHVIVO-3797 routing search indexing queries for context node fields through rdfservice

Browse source
This commit is contained in:
stellamit 2012-06-25 21:44:03 +00:00
parent c637946f7a
commit 719975fa3d
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.search.solr;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
/** /**
* Class that adds text from context nodes to Solr Documents for * Class that adds text from context nodes to Solr Documents for
@ -14,8 +14,8 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
static List<String> queriesForAgent = new ArrayList<String>(); static List<String> queriesForAgent = new ArrayList<String>();
public VivoAgentContextNodeFields(Model model){ public VivoAgentContextNodeFields(RDFServiceFactory rdfServiceFactory){
super(model,queriesForAgent); super(queriesForAgent,rdfServiceFactory);
} }
protected static final String prefix = protected static final String prefix =

9
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java
View file

@ -7,11 +7,12 @@ import java.util.List;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.query.DatasetFactory; import com.hp.hpl.jena.query.DatasetFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext; import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
public class VivoDocumentModifiers implements javax.servlet.ServletContextListener{ public class VivoDocumentModifiers implements javax.servlet.ServletContextListener{
@ -19,16 +20,16 @@ public class VivoDocumentModifiers implements javax.servlet.ServletContextListen
public void contextInitialized(ServletContextEvent sce) { public void contextInitialized(ServletContextEvent sce) {
ServletContext context = sce.getServletContext(); ServletContext context = sce.getServletContext();
RDFServiceFactory rdfServiceFactory = RDFServiceUtils.getRDFServiceFactory(context);
Dataset dataset = DatasetFactory.create(ModelContext.getJenaOntModel(context)); Dataset dataset = DatasetFactory.create(ModelContext.getJenaOntModel(context));
OntModel jenaOntModel = ModelContext.getJenaOntModel(context);
/* put DocumentModifiers into servlet context for use later in startup by SolrSetup */ /* put DocumentModifiers into servlet context for use later in startup by SolrSetup */
List<DocumentModifier> modifiers = new ArrayList<DocumentModifier>(); List<DocumentModifier> modifiers = new ArrayList<DocumentModifier>();
modifiers.add(new CalculateParameters(dataset)); // modifiers.add(new CalculateParameters(dataset)); //
modifiers.add(new VivoAgentContextNodeFields(jenaOntModel)); modifiers.add(new VivoAgentContextNodeFields(rdfServiceFactory));
modifiers.add(new VivoInformationResourceContextNodeFields(jenaOntModel)); modifiers.add(new VivoInformationResourceContextNodeFields(rdfServiceFactory));
context.setAttribute("DocumentModifiers", modifiers); context.setAttribute("DocumentModifiers", modifiers);
} }

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

@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.search.solr;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
/** /**
* Class that adds text from context nodes to Solr Documents for * Class that adds text from context nodes to Solr Documents for
@ -17,8 +17,8 @@ public class VivoInformationResourceContextNodeFields extends ContextNodeFields{
static List<String> queriesForInformationResource = new ArrayList<String>(); static List<String> queriesForInformationResource = new ArrayList<String>();
public VivoInformationResourceContextNodeFields(Model model){ public VivoInformationResourceContextNodeFields(RDFServiceFactory rdfServiceFactory){
super(model,queriesForInformationResource); super(queriesForInformationResource, rdfServiceFactory);
} }
protected static final String prefix = protected static final String prefix =