From 719975fa3da092d0f9aca0f75283ea6eaa8ef537 Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 25 Jun 2012 21:44:03 +0000
Subject: [PATCH] NIHVIVO-3797 routing search indexing queries for context node
 fields through rdfservice

---
 .../webapp/search/solr/VivoAgentContextNodeFields.java   | 6 +++---
 .../vitro/webapp/search/solr/VivoDocumentModifiers.java  | 9 +++++----
 .../solr/VivoInformationResourceContextNodeFields.java   | 6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java
index 1bcfec86..b20d3f84 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java
@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.search.solr;
 import java.util.ArrayList;
 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 
@@ -14,8 +14,8 @@ public class VivoAgentContextNodeFields extends ContextNodeFields{
     
     static List<String> queriesForAgent = new ArrayList<String>();    
     
-    public VivoAgentContextNodeFields(Model model){        
-        super(model,queriesForAgent);
+    public VivoAgentContextNodeFields(RDFServiceFactory rdfServiceFactory){        
+        super(queriesForAgent,rdfServiceFactory);
     }
       
   protected static final String prefix = 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java
index 36c55ed5..2823223f 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java
@@ -7,11 +7,12 @@ import java.util.List;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 
-import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.query.DatasetFactory;
 
 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{
     
@@ -19,16 +20,16 @@ public class VivoDocumentModifiers implements javax.servlet.ServletContextListen
     public void contextInitialized(ServletContextEvent sce) {
         
         ServletContext context = sce.getServletContext();
+		RDFServiceFactory rdfServiceFactory = RDFServiceUtils.getRDFServiceFactory(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 */        
         
         List<DocumentModifier> modifiers = new ArrayList<DocumentModifier>();                                        
         modifiers.add(new CalculateParameters(dataset));        //
-        modifiers.add(new VivoAgentContextNodeFields(jenaOntModel));
-        modifiers.add(new VivoInformationResourceContextNodeFields(jenaOntModel));
+        modifiers.add(new VivoAgentContextNodeFields(rdfServiceFactory));
+        modifiers.add(new VivoInformationResourceContextNodeFields(rdfServiceFactory));
         
         context.setAttribute("DocumentModifiers", modifiers);
     }
diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java
index cc0f5f3a..a5398fdc 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java
@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.search.solr;
 import java.util.ArrayList;
 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 
@@ -17,8 +17,8 @@ public class VivoInformationResourceContextNodeFields extends ContextNodeFields{
     
     static List<String> queriesForInformationResource = new ArrayList<String>();
     
-    public VivoInformationResourceContextNodeFields(Model model){        
-        super(model,queriesForInformationResource);
+    public VivoInformationResourceContextNodeFields(RDFServiceFactory rdfServiceFactory){        
+        super(queriesForInformationResource, rdfServiceFactory);
     }
       
   protected static final String prefix =