diff --git a/webapp/rdf/display/everytime/searchIndexerConfigurationVitro.n3 b/webapp/rdf/display/everytime/searchIndexerConfigurationVitro.n3 index 74b34e211..528157150 100644 --- a/webapp/rdf/display/everytime/searchIndexerConfigurationVitro.n3 +++ b/webapp/rdf/display/everytime/searchIndexerConfigurationVitro.n3 @@ -32,10 +32,6 @@ :excludes "http://vitro.mannlib.cornell.edu/ns/vitro/role#public" . -:searchExcluder_vitroExcluder - a , - . - :searchExcluder_syncingTypeExcluder a , . diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeNonFlagVitro.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeNonFlagVitro.java deleted file mode 100644 index 3ce4d3872..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeNonFlagVitro.java +++ /dev/null @@ -1,60 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.searchindex.exclusions; - -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vitro.webapp.beans.Individual; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; - -/** - * Exclude individuals with most specific types from the Vitro namespace from - * the search index. (Other than old vitro Flag types). - */ -public class ExcludeNonFlagVitro implements SearchIndexExcluder { - private static final Log log = LogFactory.getLog(ExcludeNonFlagVitro.class); - - @Override - public String checkForExclusion(Individual ind) { - if (ind == null) { - return DONT_EXCLUDE; - } - - List mostSpecificTypeUris = ind.getMostSpecificTypeURIs(); - if (mostSpecificTypeUris == null) { - return DONT_EXCLUDE; - } - - String message = skipIfVitro(ind, mostSpecificTypeUris); - if (!StringUtils.equals(DONT_EXCLUDE, message)) { - log.debug("msg=" + message + ", individual=" + ind.getURI() + " (" - + ind.getLabel() + "), types=" + mostSpecificTypeUris); - } - return message; - } - - String skipIfVitro(Individual ind, List mostSpecificTypeUris) { - for (String typeUri : mostSpecificTypeUris) { - if (typeUri == null) { - continue; - } - if (typeUri.startsWith(VitroVocabulary.vitroURI + "Flag")) { - continue; - } - if (typeUri.startsWith(VitroVocabulary.vitroURI)) { - return "Skipped " + ind.getURI() + " because in " - + VitroVocabulary.vitroURI + " namespace"; - } - } - return DONT_EXCLUDE; - } - - @Override - public String toString() { - return "ExcludeNonFlagVitro"; - } - -}