diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java index bc89b9563..e96a779f8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java @@ -329,7 +329,7 @@ public class JsonServlet extends VitroHttpServlet { .getAttribute("displayOntModel"); if (displayOntModel != null) { ProhibitedFromSearch pfs = new ProhibitedFromSearch( - DisplayVocabulary.PRIMARY_SEARCH_INDEX_URI, displayOntModel); + DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel); editConfig.setProhibitedFromSearch(pfs); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java index e31e2a660..a1017f6bb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java @@ -26,7 +26,7 @@ public class DisplayVocabulary { private static final String NS = DISPLAY_NS; /* Individuals */ - public static final String PRIMARY_SEARCH_INDEX_URI = NS + "SearchIndex"; + public static final String SEARCH_INDEX_URI = NS + "SearchIndex"; //bk392 for extracting properties beyond context nodes. public static final String CONTEXT_NODES_URI = NS + "QueryForContextNodes"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java index 05d29bc87..292648e0c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java @@ -320,7 +320,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao { public void removeClassesHiddenFromSearch(List groups) { OntModel displayOntModel = getOntModelSelector().getDisplayModel(); ProhibitedFromSearch pfs = new ProhibitedFromSearch( - DisplayVocabulary.PRIMARY_SEARCH_INDEX_URI, displayOntModel); + DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel); for (VClassGroup group : groups) { List classList = new ArrayList(); for (VClass vclass : group.getVitroClassList()) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/MenuEditingFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/MenuEditingFormGenerator.java index b47f8f097..a747b8f3f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/MenuEditingFormGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/MenuEditingFormGenerator.java @@ -476,7 +476,7 @@ public class MenuEditingFormGenerator implements EditConfigurationGenerator { .getAttribute("displayOntModel"); if (displayOntModel != null) { ProhibitedFromSearch pfs = new ProhibitedFromSearch( - DisplayVocabulary.PRIMARY_SEARCH_INDEX_URI, displayOntModel); + DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel); if( editConfiguration != null ) editConfiguration.setProhibitedFromSearch(pfs); } 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 6b1cf08b3..0ba29a592 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 @@ -85,7 +85,7 @@ public class SolrSetup implements javax.servlet.ServletContextListener{ modifiers.add(new NameBoost()); IndividualToSolrDocument indToSolrDoc = new IndividualToSolrDocument( - new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_SEARCH_INDEX_URI, displayOntModel), + new ProhibitedFromSearch(DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel), new IndividualProhibitedFromSearchImpl(context), modifiers); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java index 8b82337c1..75a0eadc7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java @@ -449,7 +449,7 @@ public class InputElementFormattingTag extends TagSupport { .getAttribute("displayOntModel"); if (displayOntModel != null) { ProhibitedFromSearch pfs = new ProhibitedFromSearch( - DisplayVocabulary.PRIMARY_SEARCH_INDEX_URI, displayOntModel); + DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel); if( editConfig != null ) editConfig.setProhibitedFromSearch(pfs); } diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/beans/ProhibitedFromSearchTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/beans/ProhibitedFromSearchTest.java index 62f7173b4..1cd9f5c9e 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/beans/ProhibitedFromSearchTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/beans/ProhibitedFromSearchTest.java @@ -119,7 +119,7 @@ public class ProhibitedFromSearchTest { m.add( r.listStatements() ); Assert.assertTrue(m.size() == 1); - ProhibitedFromSearch pfs = new ProhibitedFromSearch( DisplayVocabulary.PRIMARY_SEARCH_INDEX_URI, m); + ProhibitedFromSearch pfs = new ProhibitedFromSearch( DisplayVocabulary.SEARCH_INDEX_URI, m); Assert.assertNotNull(pfs.prohibitedClasses); Assert.assertEquals(1, pfs.prohibitedClasses.size() ); Assert.assertTrue(pfs.isClassProhibitedFromSearch("http://vivoweb.org/ontology/core#NonAcademic"));