Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistent encoder names #29492

Merged
merged 3 commits into from
Jul 23, 2018
Merged

Consistent encoder names #29492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae91d17
Consistent encoder names
russcam Apr 12, 2018
904f7af
Use consistent encoder names across docs and tests
russcam Jul 20, 2018
e65632a
Revert test filter names back
russcam Jul 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/plugins/analysis-phonetic.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ The `phonetic` token filter takes the following settings:
`encoder`::

Which phonetic encoder to use. Accepts `metaphone` (default),
`doublemetaphone`, `soundex`, `refinedsoundex`, `caverphone1`,
`double_metaphone`, `soundex`, `refined_soundex`, `caverphone1`,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe also change "refinedsoundec" in plugins/analysis-phonetic/src/test/resources/org/elasticsearch/index/analysis/phonetic-1.yml then

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mabe also change doublemetaphone in plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticFactoryTests.java and plugins/analysis-phonetic/src/test/resources/org/elasticsearch/index/analysis/phonetic-1.yml then

`caverphone2`, `cologne`, `nysiis`, `koelnerphonetik`, `haasephonetik`,
`beidermorse`, `daitch_mokotoff`.
`beider_morse`, `daitch_mokotoff`.
Copy link
Member

@cbuescher cbuescher Apr 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is changes, beidermorse in L28 should be changed as well. Also there is an occurence in plugins/analysis-phonetic/src/test/resources/org/elasticsearch/index/analysis/phonetic-1.yml and plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticFactoryTests.java where we should then also test with this name, although the other variant is supported as well.


`replace`::

Whether or not the original token should be replaced by the phonetic
token. Accepts `true` (default) and `false`. Not supported by
`beidermorse` encoding.
`beider_morse` encoding.

[source,js]
--------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions plugins/analysis-phonetic/src/test/resources/org/elasticsearch/index/analysis/phonetic-1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ index:
filter:
doublemetaphonefilter:
type: phonetic
encoder: doublemetaphone
encoder: double_metaphone
metaphonefilter:
type: phonetic
encoder: metaphone
Expand All @@ -12,16 +12,16 @@ index:
encoder: soundex
refinedsoundexfilter:
type: phonetic
encoder: refinedsoundex
encoder: refined_soundex
caverphonefilter:
type: phonetic
encoder: caverphone
beidermorsefilter:
type: phonetic
encoder: beidermorse
encoder: beider_morse
beidermorsefilterfrench:
type: phonetic
encoder: beidermorse
encoder: beider_morse
languageset : [ "french" ]
koelnerphonetikfilter:
type: phonetic
Expand Down