Skip to content

Commit f6f13f1

Browse files
RabidCicadaRabidCicada
committed
Adding the template updates I forgot
1 parent b4f76bb commit f6f13f1

File tree

4 files changed

+58
-40
lines changed

4 files changed

+58
-40
lines changed

‎haystack/templates/search_configuration/schema.xml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
<analyzer type="index">
5656
<tokenizer class="solr.WhitespaceTokenizerFactory" />
5757
<filter class="solr.LowerCaseFilterFactory" />
58-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
58+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
5959
<filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="15" />
6060
</analyzer>
6161
<analyzer type="query">
6262
<tokenizer class="solr.WhitespaceTokenizerFactory" />
6363
<filter class="solr.LowerCaseFilterFactory" />
64-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
64+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
6565
</analyzer>
6666
</fieldType>
6767

@@ -85,15 +85,6 @@
8585
{% endfor %}
8686
<uniqueKey>{{ ID }}</uniqueKey>
8787

88-
<!--
89-
Not required if the default search field (<str name="df">text</str>) is defined for
90-
/select request handler in sorlconfig.xml
91-
-->
92-
<defaultSearchField>{{ content_field_name }}</defaultSearchField>
93-
94-
<!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
95-
<solrQueryParser defaultOperator="{{ default_operator }}"/>
96-
9788
<!--
9889
######################## django-haystack specifics end ########################
9990
-->
@@ -410,7 +401,9 @@
410401
<analyzer type="query">
411402
<tokenizer class="solr.StandardTokenizerFactory"/>
412403
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
413-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
404+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
405+
format="solr" ignoreCase="false" expand="true"
406+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
414407
<filter class="solr.LowerCaseFilterFactory"/>
415408
</analyzer>
416409
</fieldType>
@@ -443,7 +436,9 @@
443436
</analyzer>
444437
<analyzer type="query">
445438
<tokenizer class="solr.StandardTokenizerFactory"/>
446-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
439+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
440+
format="solr" ignoreCase="false" expand="true"
441+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
447442
<filter class="solr.StopFilterFactory"
448443
ignoreCase="true"
449444
words="lang/stopwords_en.txt"
@@ -480,19 +475,21 @@
480475
ignoreCase="true"
481476
words="lang/stopwords_en.txt"
482477
/>
483-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
478+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
484479
<filter class="solr.LowerCaseFilterFactory"/>
485480
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
486481
<filter class="solr.PorterStemFilterFactory"/>
487482
</analyzer>
488483
<analyzer type="query">
489484
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
490-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
485+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
486+
format="solr" ignoreCase="false" expand="true"
487+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
491488
<filter class="solr.StopFilterFactory"
492489
ignoreCase="true"
493490
words="lang/stopwords_en.txt"
494491
/>
495-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
492+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
496493
<filter class="solr.LowerCaseFilterFactory"/>
497494
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
498495
<filter class="solr.PorterStemFilterFactory"/>
@@ -505,9 +502,11 @@
505502
<fieldType name="text_en_splitting_tight" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
506503
<analyzer>
507504
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
508-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
505+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
506+
format="solr" ignoreCase="false" expand="false"
507+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
509508
<filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt"/>
510-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
509+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
511510
<filter class="solr.LowerCaseFilterFactory"/>
512511
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
513512
<filter class="solr.EnglishMinimalStemFilterFactory"/>
@@ -531,7 +530,9 @@
531530
</analyzer>
532531
<analyzer type="query">
533532
<tokenizer class="solr.StandardTokenizerFactory"/>
534-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
533+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
534+
format="solr" ignoreCase="false" expand="true"
535+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
535536
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
536537
<filter class="solr.LowerCaseFilterFactory"/>
537538
</analyzer>

‎haystack/templates/search_configuration/solrconfig.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
that you fully re-index after changing this setting as it can
3636
affect both how text is indexed and queried.
3737
-->
38-
<luceneMatchVersion>6.4.0</luceneMatchVersion>
38+
<luceneMatchVersion>6.5.0</luceneMatchVersion>
3939
<schemaFactory class="ClassicIndexSchemaFactory"/>
4040

4141
<!-- <lib/> directives can be used to instruct Solr to load any Jars
@@ -1435,4 +1435,12 @@
14351435
EditorialMarkerFactory will do exactly that:
14361436
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
14371437
-->
1438+
1439+
<!-- Extras noted by users of DJangoHaystack -->
1440+
<requestHandler name="/analysis/field"
1441+
startup="lazy"
1442+
class="solr.FieldAnalysisRequestHandler" />
1443+
<requestHandler name="/analysis/document"
1444+
class="solr.DocumentAnalysisRequestHandler"
1445+
startup="lazy" />
14381446
</config>

‎test_haystack/solr_tests/server/confdir/schema.xml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
<analyzer type="index">
5656
<tokenizer class="solr.WhitespaceTokenizerFactory" />
5757
<filter class="solr.LowerCaseFilterFactory" />
58-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
58+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
5959
<filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="15" />
6060
</analyzer>
6161
<analyzer type="query">
6262
<tokenizer class="solr.WhitespaceTokenizerFactory" />
6363
<filter class="solr.LowerCaseFilterFactory" />
64-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
64+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
6565
</analyzer>
6666
</fieldType>
6767

@@ -83,15 +83,6 @@
8383

8484
<uniqueKey>id</uniqueKey>
8585

86-
<!--
87-
Not required if the default search field (<str name="df">text</str>) is defined for
88-
/select request handler in sorlconfig.xml
89-
-->
90-
<defaultSearchField>text</defaultSearchField>
91-
92-
<!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
93-
<solrQueryParser defaultOperator="AND"/>
94-
9586
<field name="author" type="string" indexed="true" stored="true" multiValued="false" omitNorms="false"/>
9687
<field name="average_rating" type="floats" indexed="true" stored="true" multiValued="false"/>
9788
<field name="cat" type="text_ws" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
@@ -429,7 +420,9 @@
429420
<analyzer type="query">
430421
<tokenizer class="solr.StandardTokenizerFactory"/>
431422
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
432-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
423+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
424+
format="solr" ignoreCase="false" expand="true"
425+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
433426
<filter class="solr.LowerCaseFilterFactory"/>
434427
</analyzer>
435428
</fieldType>
@@ -462,7 +455,9 @@
462455
</analyzer>
463456
<analyzer type="query">
464457
<tokenizer class="solr.StandardTokenizerFactory"/>
465-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
458+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
459+
format="solr" ignoreCase="false" expand="true"
460+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
466461
<filter class="solr.StopFilterFactory"
467462
ignoreCase="true"
468463
words="lang/stopwords_en.txt"
@@ -499,19 +494,21 @@
499494
ignoreCase="true"
500495
words="lang/stopwords_en.txt"
501496
/>
502-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
497+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
503498
<filter class="solr.LowerCaseFilterFactory"/>
504499
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
505500
<filter class="solr.PorterStemFilterFactory"/>
506501
</analyzer>
507502
<analyzer type="query">
508503
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
509-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
504+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
505+
format="solr" ignoreCase="false" expand="true"
506+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
510507
<filter class="solr.StopFilterFactory"
511508
ignoreCase="true"
512509
words="lang/stopwords_en.txt"
513510
/>
514-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
511+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
515512
<filter class="solr.LowerCaseFilterFactory"/>
516513
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
517514
<filter class="solr.PorterStemFilterFactory"/>
@@ -524,9 +521,11 @@
524521
<fieldType name="text_en_splitting_tight" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
525522
<analyzer>
526523
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
527-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
524+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
525+
format="solr" ignoreCase="false" expand="false"
526+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
528527
<filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt"/>
529-
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
528+
<filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
530529
<filter class="solr.LowerCaseFilterFactory"/>
531530
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
532531
<filter class="solr.EnglishMinimalStemFilterFactory"/>
@@ -550,7 +549,9 @@
550549
</analyzer>
551550
<analyzer type="query">
552551
<tokenizer class="solr.StandardTokenizerFactory"/>
553-
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
552+
<filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"
553+
format="solr" ignoreCase="false" expand="true"
554+
tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
554555
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
555556
<filter class="solr.LowerCaseFilterFactory"/>
556557
</analyzer>

‎test_haystack/solr_tests/server/confdir/solrconfig.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
that you fully re-index after changing this setting as it can
3636
affect both how text is indexed and queried.
3737
-->
38-
<luceneMatchVersion>6.4.0</luceneMatchVersion>
38+
<luceneMatchVersion>6.5.0</luceneMatchVersion>
3939
<schemaFactory class="ClassicIndexSchemaFactory"/>
4040

4141
<!-- <lib/> directives can be used to instruct Solr to load any Jars
@@ -1435,4 +1435,12 @@
14351435
EditorialMarkerFactory will do exactly that:
14361436
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
14371437
-->
1438+
1439+
<!-- Extras noted by users of DJangoHaystack -->
1440+
<requestHandler name="/analysis/field"
1441+
startup="lazy"
1442+
class="solr.FieldAnalysisRequestHandler" />
1443+
<requestHandler name="/analysis/document"
1444+
class="solr.DocumentAnalysisRequestHandler"
1445+
startup="lazy" />
14381446
</config>

0 commit comments

Comments
 (0)