diff --git a/webapp/build.xml b/webapp/build.xml index fd45eb475..89ff0a0d6 100644 --- a/webapp/build.xml +++ b/webapp/build.xml @@ -370,6 +370,8 @@ deploy - Deploy the application directly into the Tomcat webapps directory. + + - - - - - - - - - - This script should not be run by itself. - It should be invoked from the build script of a Vivo product. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + This script should not be run by itself. + It should be invoked from the build script of a Vivo product. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - + + + - + - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java index 1e94246ca..250f452be 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java @@ -34,15 +34,15 @@ public class IndividualToSolrDocument { public static VitroSearchTermNames term = new VitroSearchTermNames(); - private static String entClassName = Individual.class.getName(); + protected static String entClassName = Individual.class.getName(); - private ClassProhibitedFromSearch classesProhibitedFromSearch; + protected ClassProhibitedFromSearch classesProhibitedFromSearch; - private IndividualProhibitedFromSearch individualProhibitedFromSearch; + protected IndividualProhibitedFromSearch individualProhibitedFromSearch; - private final String label = "http://www.w3.org/2000/01/rdf-schema#label"; + protected final String label = "http://www.w3.org/2000/01/rdf-schema#label"; - public List documentModifiers = new ArrayList(); + protected List documentModifiers = new ArrayList(); public IndividualToSolrDocument( ClassProhibitedFromSearch classesProhibitedFromSearch, @@ -130,7 +130,7 @@ public class IndividualToSolrDocument { } - private void runAdditionalDocModifers( Individual ind, SolrInputDocument doc, StringBuffer addUri ) + protected void runAdditionalDocModifers( Individual ind, SolrInputDocument doc, StringBuffer addUri ) throws SkipIndividualException{ //run the document modifiers if( documentModifiers != null && !documentModifiers.isEmpty()){ @@ -140,7 +140,7 @@ public class IndividualToSolrDocument { } } - private void checkForSkipBasedOnNS(Individual ind) throws SkipIndividualException { + protected void checkForSkipBasedOnNS(Individual ind) throws SkipIndividualException { String id = ind.getURI(); if(id == null){ throw new SkipIndividualException("cannot add individuals without URIs to search index"); @@ -152,7 +152,7 @@ public class IndividualToSolrDocument { } } - private void addAllText(Individual ind, SolrInputDocument doc, StringBuffer classPublicNames, StringBuffer objectNames) { + protected void addAllText(Individual ind, SolrInputDocument doc, StringBuffer classPublicNames, StringBuffer objectNames) { String t=null; //ALLTEXT, all of the 'full text' StringBuffer allTextValue = new StringBuffer(); @@ -191,7 +191,7 @@ public class IndividualToSolrDocument { doc.addField(term.ALLTEXT_PHONETIC, alltext); } - private void addLabel(Individual ind, SolrInputDocument doc) { + protected void addLabel(Individual ind, SolrInputDocument doc) { String value = ""; String label = ind.getRdfsLabel(); if (label != null) { @@ -211,7 +211,7 @@ public class IndividualToSolrDocument { /** * Adds if the individual has a thumbnail image or not. */ - private void addThumbnailExistance(Individual ind, SolrInputDocument doc) { + protected void addThumbnailExistance(Individual ind, SolrInputDocument doc) { try{ if(ind.hasThumb()) doc.addField(term.THUMBNAIL, "1"); @@ -226,7 +226,7 @@ public class IndividualToSolrDocument { * Get the rdfs:labes for objects of statements and put in objectNames. * Get the URIs for objects of statements and put in addUri. */ - private void addObjectPropertyText(Individual ind, SolrInputDocument doc, + protected void addObjectPropertyText(Individual ind, SolrInputDocument doc, StringBuffer objectNames, StringBuffer addUri) { List objectPropertyStatements = ind.getObjectPropertyStatements(); if (objectPropertyStatements != null) {