0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2549 add aws elasticsearch

Browse source
This commit is contained in:
Shinsuke Sugaya 2021-03-23 21:38:28 +09:00
parent dfb0e15da6
commit fdf27d658e
5 changed files with 1889 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/Constants.java
View file

@ -456,6 +456,8 @@ public class Constants extends CoreLibConstants {
public static final String FESEN_TYPE_CLOUD = "cloud";
public static final String FESEN_TYPE_AWS = "aws";
public static final String FESEN_USERNAME = "fesen.username";
public static final String FESEN_PASSWORD = "fesen.password";

27
src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
View file

@ -248,6 +248,7 @@ public class SearchEngineClient implements Client {
if (runner == null) {
switch (fessConfig.getFesenType()) {
case Constants.FESEN_TYPE_CLOUD:
case Constants.FESEN_TYPE_AWS:
httpAddress = org.codelibs.fess.util.ResourceUtil.getFesenHttpUrl();
break;
default:
@ -400,6 +401,7 @@ public class SearchEngineClient implements Client {
if (uploadConfig) {
switch (fesenType) {
case Constants.FESEN_TYPE_CLOUD:
case Constants.FESEN_TYPE_AWS:
// nothing
break;
default:
@ -411,15 +413,7 @@ public class SearchEngineClient implements Client {
final String indexConfigFile = getResourcePath(indexConfigPath, fesenType, "/" + index + ".json");
try {
String source = FileUtil.readUTF8(indexConfigFile);
String dictionaryPath = System.getProperty("fess.dictionary.path", StringUtil.EMPTY);
if (StringUtil.isNotBlank(dictionaryPath) && !dictionaryPath.endsWith("/")) {
dictionaryPath = dictionaryPath + "/";
}
source = source.replaceAll(Pattern.quote("${fess.dictionary.path}"), dictionaryPath);
source = source.replaceAll(Pattern.quote("${fess.index.codec}"), fessConfig.getIndexCodec());
source = source.replaceAll(Pattern.quote("${fess.index.number_of_shards}"), numberOfShards);
source = source.replaceAll(Pattern.quote("${fess.index.auto_expand_replicas}"), autoExpandReplicas);
final String source = readIndexSetting(fesenType, indexConfigFile, numberOfShards, autoExpandReplicas);
final CreateIndexResponse indexResponse = client.admin().indices().prepareCreate(indexName).setSource(source, XContentType.JSON)
.execute().actionGet(fessConfig.getIndexIndicesTimeout());
if (indexResponse.isAcknowledged()) {
@ -435,6 +429,21 @@ public class SearchEngineClient implements Client {
return false;
}
protected String readIndexSetting(final String fesenType, final String indexConfigFile, final String numberOfShards,
final String autoExpandReplicas) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
String source = FileUtil.readUTF8(indexConfigFile);
String dictionaryPath = System.getProperty("fess.dictionary.path", StringUtil.EMPTY);
if (StringUtil.isNotBlank(dictionaryPath) && !dictionaryPath.endsWith("/")) {
dictionaryPath = dictionaryPath + "/";
}
source = source.replaceAll(Pattern.quote("${fess.dictionary.path}"), dictionaryPath);
source = source.replaceAll(Pattern.quote("${fess.index.codec}"), fessConfig.getIndexCodec());
source = source.replaceAll(Pattern.quote("${fess.index.number_of_shards}"), numberOfShards);
source = source.replaceAll(Pattern.quote("${fess.index.auto_expand_replicas}"), autoExpandReplicas);
return source;
}
protected String getResourcePath(final String basePath, final String type, final String path) {
final String target = basePath + "/_" + type + path;
if (ResourceUtil.getResourceNoException(target) != null) {

1
src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
View file

@ -340,6 +340,7 @@ public interface FessProp {
default boolean isResultCollapsed() {
switch (getFesenType()) {
case Constants.FESEN_TYPE_CLOUD:
case Constants.FESEN_TYPE_AWS:
return false;
default:
return getSystemPropertyAsBoolean(Constants.RESULT_COLLAPSED_PROPERTY, false);

1276
src/main/resources/fess_indices/_aws/fess.json Normal file
View file

File diff suppressed because one or more lines are too long

592
src/main/resources/fess_indices/_aws/fess/doc.json Normal file
View file

@ -0,0 +1,592 @@
{
"dynamic_templates": [
{
"lang_ar": {
"match": "*_ar",
"mapping": {
"type": "text",
"analyzer": "arabic_analyzer"
}
}
},
{
"lang_bg": {
"match": "*_bg",
"mapping": {
"type": "text",
"analyzer": "bulgarian_analyzer"
}
}
},
{
"lang_bn": {
"match": "*_bn",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_ca": {
"match": "*_ca",
"mapping": {
"type": "text",
"analyzer": "catalan_analyzer"
}
}
},
{
"lang_ca": {
"match": "*_ckb-iq",
"mapping": {
"type": "text",
"analyzer": "sorani_analyzer"
}
}
},
{
"lang_cs": {
"match": "*_cs",
"mapping": {
"type": "text",
"analyzer": "czech_analyzer"
}
}
},
{
"lang_da": {
"match": "*_da",
"mapping": {
"type": "text",
"analyzer": "danish_analyzer"
}
}
},
{
"lang_de": {
"match": "*_de",
"mapping": {
"type": "text",
"analyzer": "german_analyzer"
}
}
},
{
"lang_el": {
"match": "*_el",
"mapping": {
"type": "text",
"analyzer": "greek_analyzer"
}
}
},
{
"lang_en": {
"match": "*_en",
"mapping": {
"type": "text",
"analyzer": "english_analyzer"
}
}
},
{
"lang_en": {
"match": "*_en-ie",
"mapping": {
"type": "text",
"analyzer": "irish_analyzer"
}
}
},
{
"lang_es": {
"match": "*_es",
"mapping": {
"type": "text",
"analyzer": "spanish_analyzer"
}
}
},
{
"lang_et": {
"match": "*_et",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_et": {
"match": "*_eu",
"mapping": {
"type": "text",
"analyzer": "basque_analyzer"
}
}
},
{
"lang_fa": {
"match": "*_fa",
"mapping": {
"type": "text",
"analyzer": "persian_analyzer"
}
}
},
{
"lang_fi": {
"match": "*_fi",
"mapping": {
"type": "text",
"analyzer": "finnish_analyzer"
}
}
},
{
"lang_fr": {
"match": "*_fr",
"mapping": {
"type": "text",
"analyzer": "french_analyzer"
}
}
},
{
"lang_gl": {
"match": "*_gl",
"mapping": {
"type": "text",
"analyzer": "galician_analyzer"
}
}
},
{
"lang_gu": {
"match": "*_gu",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_he": {
"match": "*_he",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_hi": {
"match": "*_hi",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_hr": {
"match": "*_hr",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_hu": {
"match": "*_hu",
"mapping": {
"type": "text",
"analyzer": "hungarian_analyzer"
}
}
},
{
"lang_hu": {
"match": "*_hy",
"mapping": {
"type": "text",
"analyzer": "armenian_analyzer"
}
}
},
{
"lang_id": {
"match": "*_id",
"mapping": {
"type": "text",
"analyzer": "indonesian_analyzer"
}
}
},
{
"lang_it": {
"match": "*_it",
"mapping": {
"type": "text",
"analyzer": "italian_analyzer"
}
}
},
{
"lang_ja": {
"match": "*_ja",
"mapping": {
"type": "text",
"analyzer": "japanese_analyzer"
}
}
},
{
"lang_ko": {
"match": "*_ko",
"mapping": {
"type": "text",
"analyzer": "korean_analyzer"
}
}
},
{
"lang_lt": {
"match": "*_lt",
"mapping": {
"type": "text",
"analyzer": "lithuanian_analyzer"
}
}
},
{
"lang_lv": {
"match": "*_lv",
"mapping": {
"type": "text",
"analyzer": "latvian_analyzer"
}
}
},
{
"lang_mk": {
"match": "*_mk",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_ml": {
"match": "*_ml",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_nl": {
"match": "*_nl",
"mapping": {
"type": "text",
"analyzer": "dutch_analyzer"
}
}
},
{
"lang_no": {
"match": "*_no",
"mapping": {
"type": "text",
"analyzer": "norwegian_analyzer"
}
}
},
{
"lang_pa": {
"match": "*_pa",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_pl": {
"match": "*_pl",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_pt": {
"match": "*_pt",
"mapping": {
"type": "text",
"analyzer": "portuguese_analyzer"
}
}
},
{
"lang_pt-br": {
"match": "*_pt-br",
"mapping": {
"type": "text",
"analyzer": "brazilian_analyzer"
}
}
},
{
"lang_ro": {
"match": "*_ro",
"mapping": {
"type": "text",
"analyzer": "romanian_analyzer"
}
}
},
{
"lang_ru": {
"match": "*_ru",
"mapping": {
"type": "text",
"analyzer": "russian_analyzer"
}
}
},
{
"lang_si": {
"match": "*_si",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_sq": {
"match": "*_sq",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_sv": {
"match": "*_sv",
"mapping": {
"type": "text",
"analyzer": "swedish_analyzer"
}
}
},
{
"lang_ta": {
"match": "*_ta",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_te": {
"match": "*_te",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_th": {
"match": "*_th",
"mapping": {
"type": "text",
"analyzer": "thai_analyzer"
}
}
},
{
"lang_tl": {
"match": "*_tl",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_tr": {
"match": "*_tr",
"mapping": {
"type": "text",
"analyzer": "turkish_analyzer"
}
}
},
{
"lang_uk": {
"match": "*_uk",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_ur": {
"match": "*_ur",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_vi": {
"match": "*_vi",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
},
{
"lang_zh-cn": {
"match": "*_zh-cn",
"mapping": {
"type": "text",
"analyzer": "simplified_chinese_analyzer"
}
}
},
{
"lang_zh-tw": {
"match": "*_zh-tw",
"mapping": {
"type": "text",
"analyzer": "empty_analyzer"
}
}
}
],
"properties": {
"anchor": {
"type": "keyword"
},
"boost": {
"type": "float"
},
"click_count": {
"type": "long"
},
"config_id": {
"type": "keyword"
},
"important_content": {
"type": "text",
"analyzer": "standard_analyzer",
"search_analyzer": "standard_search_analyzer",
"term_vector": "with_positions_offsets"
},
"content": {
"type": "text",
"analyzer": "standard_analyzer",
"search_analyzer": "standard_search_analyzer",
"term_vector": "with_positions_offsets"
},
"content_minhash": {
"type": "keyword",
"index": false
},
"content_minhash_bits": {
"type": "keyword",
"index": false
},
"content_length": {
"type": "long"
},
"created": {
"type": "date",
"format": "date_optional_time"
},
"timestamp": {
"type": "date",
"format": "date_optional_time"
},
"expires": {
"type": "date",
"format": "date_optional_time"
},
"digest": {
"type": "text",
"index": false
},
"doc_id": {
"type": "keyword"
},
"favorite_count": {
"type": "long"
},
"filename": {
"type": "keyword"
},
"filetype": {
"type": "keyword"
},
"host": {
"type": "keyword"
},
"lang": {
"type": "keyword"
},
"last_modified": {
"type": "date",
"format": "date_optional_time"
},
"location": {
"type": "geo_point"
},
"mimetype": {
"type": "keyword"
},
"parent_id": {
"type": "keyword"
},
"role": {
"type": "keyword"
},
"label": {
"type": "keyword"
},
"virtual_host": {
"type": "keyword"
},
"segment": {
"type": "keyword"
},
"site": {
"type": "keyword"
},
"title": {
"type": "text",
"analyzer": "standard_analyzer",
"search_analyzer": "standard_search_analyzer",
"term_vector": "with_positions_offsets"
},
"thumbnail": {
"type": "keyword"
},
"url": {
"type": "keyword"
}
}
}