From 2d6aeaafb82d8d41c5ffd8d86ad4fc682c3fcfed Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Tue, 22 Apr 2014 17:59:26 -0400
Subject: [PATCH] VIVO-742 Many changes to remove "solr" from methods,
 variables, classes.

---
 .../edit/forms/pageManagement--customDataScript.ftl           | 2 +-
 .../generators/AddConceptThroughObjectPropertyGenerator.java  | 4 ++--
 .../preprocessors/utils/ProcessDataGetterN3Map.java           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl b/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
index d8f90ea7..02ac6692 100644
--- a/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
+++ b/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
@@ -15,7 +15,7 @@ scripts list.-->
       		"internalClass": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter",
       		"sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter",
       		"fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter",
-      		"solrIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter"
+      		"solrIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter"
       }
     };
 </script>
\ No newline at end of file
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
index d221f7ff..bd35f344 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
@@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaSolrQueryOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaSearchQueryOptions;
 
 /**
  * This generator is for the case where a new concept is being added for an object property other than research/subject areas where the 
@@ -119,7 +119,7 @@ public class AddConceptThroughObjectPropertyGenerator extends DefaultObjectPrope
     			types.add(v.getURI());
     		}
     		String[] typesArray = types.toArray(new String[types.size()]);
-    		field.setOptions( new IndividualsViaSolrQueryOptions(
+    		field.setOptions( new IndividualsViaSearchQueryOptions(
     				getSubjectUri(),
     				predicateUri,
     				getObjectUri(),
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
index cda9baf8..b97eb540 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
@@ -18,7 +18,7 @@ public class ProcessDataGetterN3Map {
     	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3");
     	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessInternalClassDataGetterN3");
     	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3");
-    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSolrIndividualsDataGetterN3");
+    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSearchIndividualsDataGetterN3");
 
     	 return map;
     }