diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURL.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURL.java index c334a15ab..073d582c0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURL.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURL.java @@ -39,10 +39,10 @@ public class ThumbnailImageURL implements DocumentModifier { private static final String query = prefix + - " SELECT (str(?thumbnailLocationURL) as ?ThumbnailLocationURL) WHERE { " + + " SELECT (str(?downloadLocation) as ?DownloadLocation) WHERE { " + " ?uri ?a . " + - " ?a ?b . " + - " ?b ?thumbnailLocationURL . } "; + " ?a ?downloadLocation . } " ; + //" ?b ?thumbnailLocationURL . } "; private Model model; private Log log = LogFactory.getLog(ThumbnailImageURL.class); @@ -84,7 +84,7 @@ public class ThumbnailImageURL implements DocumentModifier { String name = iter.next(); RDFNode node = soln.get( name ); if( node != null ){ - result.append(" " + node.toString()); + result.append("" + node.toString()); }else{ log.info(name + " is null"); } diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURLTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURLTest.java index 2fd814c87..968f6e3b8 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURLTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURLTest.java @@ -22,7 +22,6 @@ import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; -import edu.cornell.mannlib.vitro.webapp.dao.jena.MenuDaoJenaTest; import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames; /** @@ -44,7 +43,7 @@ public class ThumbnailImageURLTest extends AbstractTestClass{ setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF); Model model = ModelFactory.createDefaultModel(); - InputStream in = MenuDaoJenaTest.class.getResourceAsStream("resources/menuForTest.n3"); + InputStream in = ThumbnailImageURLTest.class.getResourceAsStream("testPerson.n3"); model.read(in,"","N3"); testModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,model); } @@ -70,7 +69,7 @@ public class ThumbnailImageURLTest extends AbstractTestClass{ Assert.assertNotNull( thumbnailField.getValues() ); Assert.assertEquals(1, thumbnailField.getValueCount()); - Assert.assertEquals("http://vivo.cornell.edu/individual/n13658", thumbnailField.getFirstValue()); + Assert.assertEquals("http://vivo.cornell.edu/individual/n54945", thumbnailField.getFirstValue()); } }