Skip to content

Commit

Permalink
update schema config for geo related things and spell/suggest
Browse files Browse the repository at this point in the history
  • Loading branch information
mejackreed committed Mar 29, 2018
1 parent 9d53b49 commit 9045318
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 3 deletions.
46 changes: 43 additions & 3 deletions lib/generators/blacklight/templates/solr/conf/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

<field name="lat" type="tdouble" stored="true" indexed="true" multiValued="false"/>
<field name="lng" type="tdouble" stored="true" indexed="true" multiValued="false"/>
<dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/>
<!-- NOTE: not all possible Solr field types are represented in the dynamic fields -->

<!-- text (_t...) -->
Expand Down Expand Up @@ -186,6 +185,14 @@
<dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
<dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>

<dynamicField name="*_srpt" type="location_rpt" stored="true" indexed="true" multiValued="true" />
<dynamicField name="*_bbox" type="bbox" stored="true" indexed="true" />


<!-- suggest and spelling -->
<dynamicField name="*spell" type="textSpell" indexed="true" stored="false" multiValued="true" />
<dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />

<!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
<field name="all_text_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>

Expand All @@ -202,7 +209,16 @@
<copyField source="*_tesim" dest="all_text_timv" maxChars="3000"/>
<copyField source="*_ssim" dest="all_text_timv" maxChars="3000"/>
<copyField source="*_si" dest="all_text_timv" maxChars="3000"/>


<copyField source="*_tsim" dest="suggest"/>
<copyField source="*_tesim" dest="suggest"/>
<copyField source="*_ssim" dest="suggest"/>
<copyField source="*_si" dest="suggest"/>

<copyField source="*_tsim" dest="spell"/>
<copyField source="*_tesim" dest="spell"/>
<copyField source="*_ssim" dest="spell"/>
<copyField source="*_si" dest="spell"/>

<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
Expand Down Expand Up @@ -250,7 +266,12 @@
http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
-->
<fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers"/>

<field name="bbox" type="bbox" />
<fieldType name="bbox" class="solr.BBoxField"
geo="true" distanceUnits="kilometers" numberType="_bbox_coord" storeSubFields="false"/>
<fieldType name="_bbox_coord" class="solr.TrieDoubleField" precisionStep="8" docValues="true" stored="false"/>

<fieldType name="text" class="solr.TextField" omitNorms="false">
<analyzer>
Expand Down Expand Up @@ -319,6 +340,25 @@
<tokenizer class="solr.KeywordTokenizerFactory"/>
</analyzer>
</fieldType>

<fieldType name="textSpell" class="solr.TextField" positionIncrementGap="100" >
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
</analyzer>
</fieldType>

<fieldType name="textSuggest" class="solr.TextField" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.KeywordTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
</analyzer>
</fieldType>

<!-- queries for paths match documents at that path, or in descendent paths -->
<fieldType name="descendent_path" class="solr.TextField">
Expand Down
21 changes: 21 additions & 0 deletions lib/generators/blacklight/templates/solr/conf/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,27 @@
</lst>
</searchComponent>

<searchComponent name="suggest" class="solr.SuggestComponent">
<lst name="suggester">
<str name="name">mySuggester</str>
<str name="lookupImpl">FuzzyLookupFactory</str>
<str name="suggestAnalyzerFieldType">textSuggest</str>
<str name="buildOnCommit">true</str>
<str name="field">suggest</str>
</lst>
</searchComponent>

<requestHandler name="/suggest" class="solr.SearchHandler" startup="lazy">
<lst name="defaults">
<str name="suggest">true</str>
<str name="suggest.count">5</str>
<str name="suggest.dictionary">mySuggester</str>
</lst>
<arr name="components">
<str>suggest</str>
</arr>
</requestHandler>

<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />

<requestDispatcher handleSelect="true" >
Expand Down

0 comments on commit 9045318

Please sign in to comment.