fix #2564 add analyzer for description field

codelibs · May 6, 2021 · e624a92 · e624a92
1 parent bfcde3f
commit e624a92
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 6 deletions.
diff --git a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
@@ -94,7 +94,7 @@ protected void setupListCondition(final DataConfigCB cb, final DataConfigPager d
             cb.query().setHandlerName_Wildcard(wrapQuery(dataConfigPager.handlerName));
         }
         if (StringUtil.isNotBlank(dataConfigPager.description)) {
-            cb.query().setDescription_Wildcard(wrapQuery(dataConfigPager.description));
+            cb.query().setDescription_MatchPhrase(wrapQuery(dataConfigPager.description));
         }
         // TODO Long, Integer, String supported only.
 

diff --git a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
@@ -103,7 +103,7 @@ protected void setupListCondition(final FileConfigCB cb, final FileConfigPager f
             cb.query().setPaths_Wildcard(wrapQuery(fileConfigPager.paths));
         }
         if (StringUtil.isNotBlank(fileConfigPager.description)) {
-            cb.query().setDescription_Wildcard(wrapQuery(fileConfigPager.description));
+            cb.query().setDescription_MatchPhrase(wrapQuery(fileConfigPager.description));
         }
         // TODO Long, Integer, String supported only.
 

diff --git a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
@@ -111,7 +111,7 @@ protected void setupListCondition(final WebConfigCB cb, final WebConfigPager web
             cb.query().setUrls_Wildcard(wrapQuery(webConfigPager.urls));
         }
         if (StringUtil.isNotBlank(webConfigPager.description)) {
-            cb.query().setDescription_Wildcard(wrapQuery(webConfigPager.description));
+            cb.query().setDescription_MatchPhrase(wrapQuery(webConfigPager.description));
         }
         // TODO Long, Integer, String supported only.
 

diff --git a/src/main/resources/fess_indices/.fess_config.data_config.json b/src/main/resources/fess_indices/.fess_config.data_config.json
@@ -5,6 +5,21 @@
       "number_of_shards": 1,
       "number_of_replicas": 0,
       "auto_expand_replicas": "0-1"
+    },
+    "analysis": {
+      "analyzer": {
+        "standard_analyzer": {
+          "type": "custom",
+          "tokenizer": "standard",
+          "filter": [
+            "cjk_width",
+            "asciifolding",
+            "lowercase",
+            "stop",
+            "stemmer"
+          ]
+        }
+      }
     }
   }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.data_config/data_config.json b/src/main/resources/fess_indices/.fess_config.data_config/data_config.json
@@ -40,7 +40,8 @@
         "type": "long"
       },
       "description" : {
-        "type": "text"
+        "type": "text",
+        "analyzer": "standard_analyzer"
       }
     }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.file_config.json b/src/main/resources/fess_indices/.fess_config.file_config.json
@@ -5,6 +5,21 @@
       "number_of_shards": 1,
       "number_of_replicas": 0,
       "auto_expand_replicas": "0-1"
+    },
+    "analysis": {
+      "analyzer": {
+        "standard_analyzer": {
+          "type": "custom",
+          "tokenizer": "standard",
+          "filter": [
+            "cjk_width",
+            "asciifolding",
+            "lowercase",
+            "stop",
+            "stemmer"
+          ]
+        }
+      }
     }
   }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.file_config/file_config.json b/src/main/resources/fess_indices/.fess_config.file_config/file_config.json
@@ -64,7 +64,8 @@
         "type": "long"
       },
       "description" : {
-        "type": "text"
+        "type": "text",
+        "analyzer": "standard_analyzer"
       }
     }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.web_config.json b/src/main/resources/fess_indices/.fess_config.web_config.json
@@ -5,6 +5,21 @@
       "number_of_shards": 1,
       "number_of_replicas": 0,
       "auto_expand_replicas": "0-1"
+    },
+    "analysis": {
+      "analyzer": {
+        "standard_analyzer": {
+          "type": "custom",
+          "tokenizer": "standard",
+          "filter": [
+            "cjk_width",
+            "asciifolding",
+            "lowercase",
+            "stop",
+            "stemmer"
+          ]
+        }
+      }
     }
   }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.web_config/web_config.json b/src/main/resources/fess_indices/.fess_config.web_config/web_config.json
@@ -67,7 +67,8 @@
         "type": "long"
       },
       "description" : {
-        "type": "text"
+        "type": "text",
+        "analyzer": "standard_analyzer"
       }
     }
 }