From 74665136ead35a4725cd1afd82d0d5da0a621376 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Thu, 9 Jul 2020 09:28:42 +0200
Subject: [PATCH] Configured field type for russian

---
 vivocore/conf/schema.xml     | 14 +++++++++++++-
 vivocore/conf/solrconfig.xml |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/vivocore/conf/schema.xml b/vivocore/conf/schema.xml
index 8e0acfe..e5e761c 100644
--- a/vivocore/conf/schema.xml
+++ b/vivocore/conf/schema.xml
@@ -145,7 +145,7 @@
   <field name="indexedTime" type="long" indexed="true" stored="true"/>
   <field name="NAME_PHONETIC" type ="phonetic" indexed="true" stored="false" multiValued="true"/>
   
-  <field name="ALLTEXT" type="text" indexed="true" stored="true" multiValued="true"/>
+  <field name="ALLTEXT" type="text_ru_iph" indexed="true" stored="true" multiValued="true"/>
   <field name="ALLTEXTUNSTEMMED" type="textgen" indexed="true" stored="false" multiValued="true"/>
   
   <field name="THUMBNAIL" type="string" indexed="true" stored="true"/>
@@ -1299,6 +1299,18 @@
         <!-- less aggressive: <filter class="solr.RussianLightStemFilterFactory"/> -->
       </analyzer>
     </fieldType>
+
+    <fieldType name="text_ru_iph" class="solr.TextField" positionIncrementGap="100">
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <analyzer>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ru.txt" format="snowball" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Russian"/>
+        <!-- less aggressive: <filter class="solr.RussianLightStemFilterFactory"/> -->
+      </analyzer>
+    </fieldType>
+
     
     <!-- Swedish -->
     <fieldType name="text_sv" class="solr.TextField" positionIncrementGap="100">
diff --git a/vivocore/conf/solrconfig.xml b/vivocore/conf/solrconfig.xml
index 2936e57..03813c8 100644
--- a/vivocore/conf/solrconfig.xml
+++ b/vivocore/conf/solrconfig.xml
@@ -742,7 +742,7 @@
            <str name="hl.simple.post"><![CDATA[</strong>]]></str>
           <!--  Default value of mm is 100% which should result in AND behavior, still setting it here
           https://cwiki.apache.org/confluence/display/solr/The+DisMax+Query+Parser -->
-          <str name="mm">100%</str>
+          <str name="mm">1</str>
          </lst>
          <!--  Defaults from 4.7 solrconfig commented out below, df is for overriding the default field in schema.xml, http://wiki.apache.org/solr/SearchHandler#df -->
          <!--  lst name="defaults">
@@ -1649,4 +1649,4 @@
       <str name="fvCacheName">QUERY_DOC_FV</str>
     </transformer>
 
-</config>
\ No newline at end of file
+</config>