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

NIHVIVO-2459 Untokenized, unstemmed autocomplete (e.g., in addAuthors form). Multi-word input not working yet.

Browse source
This commit is contained in:
ryounes 2011-05-17 20:02:40 +00:00
parent e4474d5e41
commit bb07c9ad7e
3 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
solr/exampleSolr/conf/schema.xml
View file

@ -480,7 +480,7 @@
<field name="classgroup" type="string" indexed="true" stored="true" multiValued="true"/> <field name="classgroup" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="PROHIBITED_FROM_TEXT_RESULTS" type="string" indexed="true" stored="false" multiValued="false"/> <field name="PROHIBITED_FROM_TEXT_RESULTS" type="string" indexed="true" stored="false" multiValued="false"/>
<field name="URI" type="string" indexed="true" stored="true" multiValued="false" omitNorms="true"/> <field name="URI" type="string" indexed="true" stored="true" multiValued="false" omitNorms="true"/>
<field name="nameRaw" type="string" indexed="true" stored="true" multiValued="true"/> <field name="nameRaw" type="string" indexed="false" stored="true" multiValued="true"/>
<!-- RY Not sure if we need to store nameLowercase. Is it ever displayed? --> <!-- RY Not sure if we need to store nameLowercase. Is it ever displayed? -->
<field name="nameLowercase" type="lowercase" indexed="true" stored="true" multiValued="true"/> <field name="nameLowercase" type="lowercase" indexed="true" stored="true" multiValued="true"/>
<field name="acNameUnstemmed" type="textUnstemmed" indexed="true" stored="false" multiValued="true"/> <field name="acNameUnstemmed" type="textUnstemmed" indexed="true" stored="false" multiValued="true"/>

2
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
View file

@ -689,7 +689,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
VitroLuceneTermNames.MONIKER, VitroLuceneTermNames.MONIKER,
VitroLuceneTermNames.ALLTEXT, VitroLuceneTermNames.ALLTEXT,
VitroLuceneTermNames.ALLTEXTUNSTEMMED, VitroLuceneTermNames.ALLTEXTUNSTEMMED,
VitroLuceneTermNames.NAME_RAW, VitroLuceneTermNames.NAME_LOWERCASE,
VitroLuceneTermNames.CLASSLOCALNAME, VitroLuceneTermNames.CLASSLOCALNAME,
VitroLuceneTermNames.CLASSLOCALNAMELOWERCASE }, analyzer); VitroLuceneTermNames.CLASSLOCALNAMELOWERCASE }, analyzer);

32
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrAutocompleteController.java
View file

@ -12,7 +12,6 @@ import java.util.Map;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -22,10 +21,9 @@ import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.core.SolrConfig; import org.apache.solr.common.params.FacetParams;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import org.xml.sax.SAXException;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseBasicAjaxControllers; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseBasicAjaxControllers;
@ -104,7 +102,9 @@ public class SolrAutocompleteController extends VitroAjaxController {
for (SolrDocument doc : docs) { for (SolrDocument doc : docs) {
try{ try{
String uri = doc.get(VitroLuceneTermNames.URI).toString(); String uri = doc.get(VitroLuceneTermNames.URI).toString();
String name = doc.get(VitroLuceneTermNames.NAME_RAW).toString(); // VitroLuceneTermNames.NAME_RAW is a multivalued field, so doc.get() returns a list
@SuppressWarnings("unchecked")
String name = ((List<String>) doc.get(VitroLuceneTermNames.NAME_RAW)).get(0);
SearchResult result = new SearchResult(name, uri); SearchResult result = new SearchResult(name, uri);
results.add(result); results.add(result);
} catch(Exception e){ } catch(Exception e){
@ -215,22 +215,16 @@ public class SolrAutocompleteController extends VitroAjaxController {
private SolrQuery setUntokenizedNameQuery(SolrQuery query, String querystr) { private SolrQuery setUntokenizedNameQuery(SolrQuery query, String querystr) {
//querystr = querystr.toLowerCase(); // Using facet method described in http://solr.pl/en/2010/10/18/solr-and-autocomplete-part-1/
querystr += "*"; // Consider using Solr Suggester in a future version.
//query = query.setQuery(VitroLuceneTermNames.NAME_LOWERCASE + ":" + querystr); return query.setFacet(true)
//query.addFilterQuery(VitroLuceneTermNames.NAME_LOWERCASE); .addFacetField(VitroLuceneTermNames.NAME_LOWERCASE)
//query.setQuery(querystr); .setFacetMinCount(1)
.setFacetLimit(MAX_QUERY_LENGTH)
try { .setFacetPrefix(querystr)//.toLowerCase())
SolrConfig config = new SolrConfig(); //.setFacetSort(FacetParams.FACET_SORT_INDEX) // sort by alpha (but doesn't work)
.setQuery("*:*");
} catch (Exception e) {
// TODO Auto-generated catch block
log.error(e, e);
return null;
}
return query;
} }
private void doNoQuery(HttpServletResponse response) throws IOException { private void doNoQuery(HttpServletResponse response) throws IOException {