litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-350 Fix the ThumbnailURL query so we only get the desired result.

Browse source
This commit is contained in:
j2blake 2013-10-15 17:27:39 -04:00
parent 08dab8e52f
commit 9901d50010
1 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ThumbnailImageURL.java
View file

@ -2,6 +2,9 @@
package edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding; package edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding;
import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.THUMBNAIL;
import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.THUMBNAIL_URL;
import java.util.Iterator; import java.util.Iterator;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -9,21 +12,17 @@ import org.apache.commons.logging.LogFactory;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.QuerySolutionMap;
import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
public class ThumbnailImageURL implements DocumentModifier { public class ThumbnailImageURL implements DocumentModifier {
private static final String prefix = "prefix owl: <http://www.w3.org/2002/07/owl#> " private static final String PREFIX = "prefix owl: <http://www.w3.org/2002/07/owl#> "
+ " prefix vitroDisplay: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> " + " prefix vitroDisplay: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> "
+ " prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> " + " prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> "
+ " prefix core: <http://vivoweb.org/ontology/core#> " + " prefix core: <http://vivoweb.org/ontology/core#> "
@ -32,19 +31,14 @@ public class ThumbnailImageURL implements DocumentModifier {
+ " prefix localNav: <http://vitro.mannlib.cornell.edu/ns/localnav#> " + " prefix localNav: <http://vitro.mannlib.cornell.edu/ns/localnav#> "
+ " prefix bibo: <http://purl.org/ontology/bibo/> "; + " prefix bibo: <http://purl.org/ontology/bibo/> ";
private static final String query = prefix + private static final String QUERY_TEMPLATE = PREFIX
+ " SELECT (str(?downloadLocation) as ?DownloadLocation) WHERE { "
" SELECT (str(?downloadLocation) as ?DownloadLocation) WHERE { " + + " ?uri <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage> ?a . "
" ?uri <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage> ?a . " + + " ?a <http://vitro.mannlib.cornell.edu/ns/vitro/public#downloadLocation> ?downloadLocation . } ";
" ?a <http://vitro.mannlib.cornell.edu/ns/vitro/public#downloadLocation> ?downloadLocation . } " ;
//" ?b <http://vitro.mannlib.cornell.edu/ns/vitro/public#directDownloadUrl> ?thumbnailLocationURL . } ";
private RDFServiceFactory rsf; private RDFServiceFactory rsf;
private Log log = LogFactory.getLog(ThumbnailImageURL.class); private Log log = LogFactory.getLog(ThumbnailImageURL.class);
static VitroSearchTermNames term = new VitroSearchTermNames();
String fieldForThumbnailURL = term.THUMBNAIL_URL;
public ThumbnailImageURL( RDFServiceFactory rsf ){ public ThumbnailImageURL( RDFServiceFactory rsf ){
this.rsf = rsf; this.rsf = rsf;
@ -55,30 +49,29 @@ public class ThumbnailImageURL implements DocumentModifier {
StringBuffer addUri) throws SkipIndividualException { StringBuffer addUri) throws SkipIndividualException {
//add a field for storing the location of thumbnail for the individual. //add a field for storing the location of thumbnail for the individual.
doc.addField(fieldForThumbnailURL, runQueryForThumbnailLocation(individual)); doc.addField(THUMBNAIL_URL, runQueryForThumbnailLocation(individual));
addThumbnailExistance(individual, doc); addThumbnailExistence(individual, doc);
} }
/** /**
* Adds if the individual has a thumbnail image or not. * Adds if the individual has a thumbnail image or not.
*/ */
protected void addThumbnailExistance(Individual ind, SolrInputDocument doc) { protected void addThumbnailExistence(Individual ind, SolrInputDocument doc) {
try{ try{
if(ind.hasThumb()) if(ind.hasThumb())
doc.addField(term.THUMBNAIL, "1"); doc.addField(THUMBNAIL, "1");
else else
doc.addField(term.THUMBNAIL, "0"); doc.addField(THUMBNAIL, "0");
}catch(Exception ex){ }catch(Exception ex){
log.debug("could not index thumbnail: " + ex); log.debug("could not index thumbnail: " + ex);
} }
} }
protected String runQueryForThumbnailLocation(Individual individual) { protected String runQueryForThumbnailLocation(Individual individual) {
StringBuffer result = new StringBuffer(); StringBuffer result = new StringBuffer();
QuerySolutionMap initialBinding = new QuerySolutionMap();
Resource uriResource = ResourceFactory.createResource(individual.getURI()); String uri = "<" + individual.getURI() + "> ";
initialBinding.add("uri", uriResource); String query = QUERY_TEMPLATE.replaceAll("\\?uri", uri);
RDFService rdf = rsf.getRDFService(); RDFService rdf = rsf.getRDFService();
try{ try{
@ -106,6 +99,7 @@ public class ThumbnailImageURL implements DocumentModifier {
@Override @Override
public void shutdown() { public void shutdown() {
// nothing to release.
} }
} }