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

VIVO-742 Change client code to use SearchEngine interface.

Browse source 
Removed SolrQueryTest until I can see how to update it. Everything compiles and tests run, but haven't tried running VIVO yet.
This commit is contained in:
j2blake 2014-04-22 15:10:49 -04:00
parent cb204a3926
commit d73c82cd55
6 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
View file

@ -18,9 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaObjectPropetyOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaSolrQueryOptions;
/**
@ -122,7 +120,6 @@ public class AddConceptThroughObjectPropertyGenerator extends DefaultObjectPrope
}
String[] typesArray = types.toArray(new String[types.size()]);
field.setOptions( new IndividualsViaSolrQueryOptions(
vreq.getSession().getServletContext(),
getSubjectUri(),
predicateUri,
getObjectUri(),

8
src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java
View file

@ -10,7 +10,6 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.solr.common.SolrInputDocument;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.query.Query;
@ -27,6 +26,7 @@ import com.hp.hpl.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument;
import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier;
@ -241,17 +241,18 @@ public class CalculateParameters implements DocumentModifier {
}
@Override
public void modifyDocument(Individual individual, SolrInputDocument doc, StringBuffer addUri) {
public void modifyDocument(Individual individual, SearchInputDocument doc, StringBuffer addUri) {
// TODO Auto-generated method stub
// calculate beta value.
log.debug("Parameter calculation starts..");
float beta = calculateBeta(individual.getURI());
doc.addField(VitroSearchTermNames.BETA, beta);
doc.addField(VitroSearchTermNames.BETA, (Object) beta);
doc.setDocumentBoost(beta + doc.getDocumentBoost() );
log.debug("Parameter calculation is done");
}
@Override
public void shutdown(){
shutdown=true;
}
@ -267,6 +268,7 @@ class TotalInd implements Runnable{
this.totalCountQuery = totalCountQuery;
}
@Override
public void run(){
int totalInd=0;
Query query;

12
src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java
View file

@ -9,13 +9,13 @@ import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.PREFE
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.solr.common.SolrInputDocument;
import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
@ -44,7 +44,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
private static final ResultParser PREFERRED_TITLE_PARSER = new ResultParser() {
@Override
public void parse(String uri, QuerySolution solution, SolrInputDocument doc) {
public void parse(String uri, QuerySolution solution, SearchInputDocument doc) {
String title = getLiteralValue(solution, "title");
if (StringUtils.isNotBlank(title)) {
doc.addField(PREFERRED_TITLE, title);
@ -68,7 +68,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
private static final ResultParser EMAIL_PARSER = new ResultParser() {
@Override
public void parse(String uri, QuerySolution solution,
SolrInputDocument doc) {
SearchInputDocument doc) {
String email = getLiteralValue(solution, "email");
if (StringUtils.isNotBlank(email)) {
doc.addField(ALLTEXT, email);
@ -85,7 +85,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
}
@Override
public void modifyDocument(Individual individual, SolrInputDocument doc,
public void modifyDocument(Individual individual, SearchInputDocument doc,
StringBuffer addUri) {
if (individual == null)
return;
@ -96,7 +96,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
}
private void processQuery(Individual individual, String queryTemplate,
ResultParser resultParser, SolrInputDocument doc) {
ResultParser resultParser, SearchInputDocument doc) {
String uri = "<" + individual.getURI() + "> ";
String query = queryTemplate.replaceAll("\\?uri", uri);
@ -124,7 +124,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
}
private abstract static class ResultParser {
public abstract void parse(String uri, QuerySolution solution, SolrInputDocument doc);
public abstract void parse(String uri, QuerySolution solution, SearchInputDocument doc);
String getLiteralValue(QuerySolution solution, String name) {
RDFNode node = solution.get(name);