diff --git a/solr/exampleSolr/conf/schema.xml b/solr/exampleSolr/conf/schema.xml index 7584c46dd..4438e571a 100644 --- a/solr/exampleSolr/conf/schema.xml +++ b/solr/exampleSolr/conf/schema.xml @@ -472,8 +472,7 @@ - - + @@ -485,14 +484,13 @@ - - + + - - + diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServlet.java index 5f9827518..fe4b9f63b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServlet.java @@ -377,7 +377,7 @@ public class JSONReconcileServlet extends VitroHttpServlet { String stemParam = (String) request.getParameter("stem"); boolean stem = "true".equals(stemParam); - String termName = stem ? VitroLuceneTermNames.AC_NAME_STEMMED : VitroLuceneTermNames.AC_NAME_UNSTEMMED; + String termName = stem ? VitroLuceneTermNames.NAME_STEMMED : VitroLuceneTermNames.NAME_UNSTEMMED; BooleanQuery boolQuery = new BooleanQuery(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonReconcileServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonReconcileServlet.java index 3c186675d..62f86e445 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonReconcileServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonReconcileServlet.java @@ -377,7 +377,7 @@ public class SolrJsonReconcileServlet extends VitroHttpServlet { String stemParam = (String) request.getParameter("stem"); boolean stem = "true".equals(stemParam); - String termName = stem ? VitroLuceneTermNames.AC_NAME_STEMMED : VitroLuceneTermNames.AC_NAME_UNSTEMMED; + String termName = stem ? VitroLuceneTermNames.NAME_STEMMED : VitroLuceneTermNames.NAME_UNSTEMMED; BooleanQuery boolQuery = new BooleanQuery(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java index 2e83e231f..aa37476ab 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java @@ -207,7 +207,7 @@ public class AutocompleteController extends VitroAjaxController { String stemParam = (String) request.getParameter("stem"); boolean stem = "true".equals(stemParam); - String termName = stem ? VitroLuceneTermNames.AC_NAME_STEMMED : VitroLuceneTermNames.AC_NAME_UNSTEMMED; + String termName = stem ? VitroLuceneTermNames.NAME_STEMMED : VitroLuceneTermNames.NAME_UNSTEMMED; BooleanQuery boolQuery = new BooleanQuery(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index c6ae4d3cb..2503aeeeb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -229,7 +229,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear Document document = searcherForRequest.doc(scoreDoc.doc); Explanation explanation = searcherForRequest.explain(query, scoreDoc.doc); - log.debug("Document title: "+ document.get(Entity2LuceneDoc.VitroLuceneTermNames.AC_NAME_STEMMED) + " score: " +scoreDoc.score); + log.debug("Document title: "+ document.get(Entity2LuceneDoc.VitroLuceneTermNames.NAME_STEMMED) + " score: " +scoreDoc.score); log.debug("Scoring of the doc explained " + explanation.toString()); log.debug("Explanation's description "+ explanation.getDescription()); log.debug("ALLTEXT: " + document.get(Entity2LuceneDoc.VitroLuceneTermNames.ALLTEXT)); @@ -405,7 +405,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear Document doc; try { doc = searcher.doc(topDocs.scoreDocs[i].doc); - String name =doc.get(Entity2LuceneDoc.term.AC_NAME_STEMMED); + String name =doc.get(Entity2LuceneDoc.term.NAME_STEMMED); if( name != null && name.length() > 0) alphas.add( name.substring(0, 1)); } catch (CorruptIndexException e) { @@ -622,7 +622,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear BooleanQuery boolQuery = new BooleanQuery(); boolQuery.add( query, BooleanClause.Occur.MUST ); boolQuery.add( - new WildcardQuery(new Term(Entity2LuceneDoc.term.AC_NAME_STEMMED, alpha+'*')), + new WildcardQuery(new Term(Entity2LuceneDoc.term.NAME_STEMMED, alpha+'*')), BooleanClause.Occur.MUST); query = boolQuery; } @@ -683,8 +683,8 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear // qp.setStemmedToUnstemmed(map); MultiFieldQueryParser qp = new MultiFieldQueryParser(Version.LUCENE_29, new String[]{ - VitroLuceneTermNames.AC_NAME_STEMMED, - VitroLuceneTermNames.AC_NAME_UNSTEMMED, + VitroLuceneTermNames.NAME_STEMMED, + VitroLuceneTermNames.NAME_UNSTEMMED, VitroLuceneTermNames.RDFTYPE, VitroLuceneTermNames.MONIKER, VitroLuceneTermNames.ALLTEXT, diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java index e4aa2abf5..1b9f30f4a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java @@ -86,11 +86,11 @@ public class Entity2LuceneDoc implements Obj2DocIface{ /** rdfs:label lowercased, tokenized, stop words, no stemming. * Used for autocomplete matching on proper names. **/ - public static String AC_NAME_UNSTEMMED = "acNameUnstemmed"; // was NAMEUNSTEMMED + public static String NAME_UNSTEMMED = "nameUnstemmed"; // was NAMEUNSTEMMED /** rdfs:label lowercased, tokenized, stop words, stemmed. * Used for autocomplete matching where stemming is desired (e.g., book titles) **/ - public static String AC_NAME_STEMMED = "acNameStemmed"; // was NAME + public static String NAME_STEMMED = "nameStemmed"; // was NAME } @@ -222,11 +222,11 @@ public class Entity2LuceneDoc implements Obj2DocIface{ nameLowerCase.setBoost(NAME_BOOST); doc.add(nameLowerCase); - Field nameUnstemmed = new Field(term.AC_NAME_UNSTEMMED, value, Field.Store.NO, Field.Index.ANALYZED); + Field nameUnstemmed = new Field(term.NAME_UNSTEMMED, value, Field.Store.NO, Field.Index.ANALYZED); nameUnstemmed.setBoost(NAME_BOOST); doc.add(nameUnstemmed); - Field nameStemmed = new Field(term.AC_NAME_STEMMED, value, Field.Store.NO, Field.Index.ANALYZED); + Field nameStemmed = new Field(term.NAME_STEMMED, value, Field.Store.NO, Field.Index.ANALYZED); nameStemmed.setBoost(NAME_BOOST); doc.add(nameStemmed); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java index 149fa4914..94411f132 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java @@ -7,8 +7,8 @@ import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.Vi import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames.CLASSLOCALNAME; import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames.CLASSLOCALNAMELOWERCASE; import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames.MONIKER; -import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames.AC_NAME_STEMMED; -import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames.AC_NAME_UNSTEMMED; +import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames.NAME_STEMMED; +import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames.NAME_UNSTEMMED; import static edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames.RDFTYPE; import java.io.File; @@ -246,8 +246,8 @@ public class LuceneSetup implements javax.servlet.ServletContextListener { analyzer.addAnalyzer(ALLTEXT, new HtmlLowerStopStemAnalyzer()); analyzer.addAnalyzer(ALLTEXTUNSTEMMED, new HtmlLowerStopAnalyzer()); - analyzer.addAnalyzer(AC_NAME_UNSTEMMED, new HtmlLowerStopAnalyzer()); - analyzer.addAnalyzer(AC_NAME_STEMMED, new HtmlLowerStopStemAnalyzer()); + analyzer.addAnalyzer(NAME_UNSTEMMED, new HtmlLowerStopAnalyzer()); + analyzer.addAnalyzer(NAME_STEMMED, new HtmlLowerStopStemAnalyzer()); analyzer.addAnalyzer(MONIKER, new StandardAnalyzer(Version.LUCENE_29)); analyzer.addAnalyzer(RDFTYPE, new StandardAnalyzer(Version.LUCENE_29)); analyzer.addAnalyzer(CLASSLOCALNAME, new HtmlLowerStopAnalyzer());