From 83d082ca23dad5b1d6bf6d2ca5dc51c68b5a0d87 Mon Sep 17 00:00:00 2001 From: anupsawant Date: Wed, 1 Jun 2011 00:12:33 +0000 Subject: [PATCH] --- .../webapp/search/solr/ContextNodeFields.java | 4 +-- .../search/solr/IndividualToSolrDocument.java | 31 ++++++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java index dd52bd6ae..039bfd601 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java @@ -496,7 +496,7 @@ public class ContextNodeFields implements DocumentModifier{ RDFNode linkedAuthor = soln.get("linkedAuthor"); if(linkedAuthor != null){ - propertyValues.append(" publications " + linkedAuthor.toString()); + propertyValues.append(" publications " + linkedAuthor.toString() + " publications "); }else{ log.debug("linkedAuthor is null "); } @@ -531,7 +531,7 @@ public class ContextNodeFields implements DocumentModifier{ RDFNode features = soln.get("features"); if(features != null){ - propertyValues.append(" publications " + features.toString()); + propertyValues.append(" publications " + features.toString() + " publications "); }else{ log.debug("features is null "); } 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 2160e1bf3..ff14f0b7f 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 @@ -206,19 +206,28 @@ public class IndividualToSolrDocument implements Obj2DocIface { } } - - doc.addField(term.NAME_RAW, value, NAME_BOOST); - doc.addField(term.NAME_LOWERCASE, value.toLowerCase(),NAME_BOOST); - doc.addField(term.NAME_UNSTEMMED, value,NAME_BOOST); - doc.addField(term.NAME_STEMMED, value, NAME_BOOST); - doc.addField(term.NAME_PHONETIC, value, PHONETIC_BOOST); + if(documentModifiers == null){ + doc.addField(term.NAME_RAW, value, NAME_BOOST); + doc.addField(term.NAME_LOWERCASE, value.toLowerCase(),NAME_BOOST); + doc.addField(term.NAME_UNSTEMMED, value,NAME_BOOST); + doc.addField(term.NAME_STEMMED, value, NAME_BOOST); + doc.addField(term.NAME_PHONETIC, value, PHONETIC_BOOST); + }else{ + doc.addField(term.NAME_RAW, value); + doc.addField(term.NAME_LOWERCASE, value.toLowerCase()); + doc.addField(term.NAME_UNSTEMMED, value); + doc.addField(term.NAME_STEMMED, value); + doc.addField(term.NAME_PHONETIC, value, PHONETIC_BOOST); + } long tMoniker = System.currentTimeMillis(); + if(documentModifiers == null){ //boost for entity if(ent.getSearchBoost() != null && ent.getSearchBoost() != 0) doc.setDocumentBoost(ent.getSearchBoost()); + } //thumbnail try{ @@ -268,9 +277,9 @@ public class IndividualToSolrDocument implements Obj2DocIface { log.debug("time to include data property statements, object property statements in the index: " + Long.toString(System.currentTimeMillis() - tPropertyStatements)); String alltext = allTextValue.toString(); - doc.addField(term.ALLTEXT, alltext, ALL_TEXT_BOOST); - doc.addField(term.ALLTEXTUNSTEMMED, alltext, ALL_TEXT_BOOST); - doc.addField(term.ALLTEXT_PHONETIC, alltext, PHONETIC_BOOST); + doc.addField(term.ALLTEXT, alltext); + doc.addField(term.ALLTEXTUNSTEMMED, alltext); + doc.addField(term.ALLTEXT_PHONETIC, alltext); //run the document modifiers if( documentModifiers != null ){ @@ -284,9 +293,7 @@ public class IndividualToSolrDocument implements Obj2DocIface { return doc; } - /* - * Method for calculation of PHI for a doc. - */ +