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

Browse source
This commit is contained in:
anupsawant 2011-05-25 21:43:32 +00:00
parent ecca050bbc
commit 7d14c52c12
7 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/search/VitroTermNames.java
View file

@ -57,4 +57,8 @@ public class VitroTermNames {
/** field for beta values of all documents **/
public static final String BETA = "BETA";
/** adding phonetic field **/
public static final String ALLTEXT_PHONETIC = "ALLTEXT_PHONETIC";
public static final String NAME_PHONETIC = "NAME_PHONETIC";
}

1
webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/SearchQueryHandler.java
View file

@ -658,6 +658,7 @@ public class SearchQueryHandler {
}
beta = (float)Conn/totalInd;
beta *= 100;
beta += 1;
return beta;
}

1
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java
View file

@ -177,6 +177,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
SolrQuery query = getQuery(qtxt, maxHitCount, vreq);
SolrServer solr = SolrSetup.getSolrServer(getServletContext());
QueryResponse response = null;
try {
response = solr.query(query);

26
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java
View file

@ -71,9 +71,9 @@ public class IndividualToSolrDocument implements Obj2DocIface {
String classPublicNames = "";
SolrInputDocument doc = new SolrInputDocument();
//float beta = searchQueryHandler.calculateBeta(ent.getURI());
//doc.addField(term.BETA,beta);
float beta =1;
float beta = searchQueryHandler.calculateBeta(ent.getURI());
doc.addField(term.BETA,beta);
//float beta =1;
//DocId
String id = ent.getURI();
@ -156,10 +156,11 @@ public class IndividualToSolrDocument implements Obj2DocIface {
value = ent.getLocalName();
}
doc.addField(term.NAME_RAW, value, (NAME_BOOST*beta));
doc.addField(term.NAME_LOWERCASE, value.toLowerCase(),(NAME_BOOST*beta));
doc.addField(term.NAME_UNSTEMMED, value,(NAME_BOOST*beta));
doc.addField(term.NAME_STEMMED, value, (NAME_BOOST*beta));
doc.addField(term.NAME_RAW, value, NAME_BOOST+beta);
doc.addField(term.NAME_LOWERCASE, value.toLowerCase(),NAME_BOOST+beta);
doc.addField(term.NAME_UNSTEMMED, value,NAME_BOOST+beta);
doc.addField(term.NAME_STEMMED, value, NAME_BOOST+beta);
doc.addField(term.NAME_PHONETIC, value, PHONETIC_BOOST);
long tContextNodes = System.currentTimeMillis();
@ -245,8 +246,10 @@ public class IndividualToSolrDocument implements Obj2DocIface {
log.debug("time to include data property statements, object property statements in the index: " + Long.toString(System.currentTimeMillis() - tPropertyStatements));
doc.addField(term.ALLTEXT, value,(ALL_TEXT_BOOST*beta));
doc.addField(term.ALLTEXTUNSTEMMED, value,(ALL_TEXT_BOOST*beta));
doc.addField(term.ALLTEXT, value, 4*beta);
doc.addField(term.ALLTEXTUNSTEMMED, value, 4*beta);
doc.addField(term.ALLTEXT_PHONETIC, value, PHONETIC_BOOST);
doc.setDocumentBoost(2*beta);
}
return doc;
@ -289,7 +292,8 @@ public class IndividualToSolrDocument implements Obj2DocIface {
return ent;
}
public static float NAME_BOOST = 3.0F;
public static float ALL_TEXT_BOOST = 2.0F;
public static float NAME_BOOST = 2.0F;
public static float PHONETIC_BOOST = 0.1F;
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java
View file

@ -36,7 +36,6 @@ public class SolrIndexer implements IndexerIface {
@Override
public synchronized void index(Individual ind, boolean newDoc) throws IndexingException {
if( ! indexing )
throw new IndexingException("SolrIndexer: must call " +
"startIndexing() before index().");
@ -61,6 +60,7 @@ public class SolrIndexer implements IndexerIface {
Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
docs.add( solrDoc );
server.add( docs );
// if( !newDoc ){
// server.add( docs );
// log.debug("updated " + ind.getName() + " " + ind.getURI());