Fossil SCM
Replace a leftover use of the word 'stemmer' and add mention of the trigram tokenizer to the change log.
Commit
6a0858074d3407fe521edbbe217a3fb6d2e3e98356aff41e0622ca0af36a1c69
Parent
06c99b83ba6cd81…
2 files changed
+7
-7
+2
+7
-7
| --- src/search.c | ||
| +++ src/search.c | ||
| @@ -2039,20 +2039,20 @@ | ||
| 2039 | 2039 | if( strchr(zCtrl, aSetng[j].zSw[0])!=0 ){ |
| 2040 | 2040 | db_set_int(aSetng[j].zSetting/*works-like:"x"*/, iCmd-3, 0); |
| 2041 | 2041 | } |
| 2042 | 2042 | } |
| 2043 | 2043 | }else if( iCmd==5 ){ |
| 2044 | - int iOldStemmer, iNewStemmer; | |
| 2045 | - if( g.argc<4 ) usage("stemmer porter|on|off|trigram"); | |
| 2046 | - iOldStemmer = search_tokenizer_type(0); | |
| 2044 | + int iOldTokenizer, iNewTokenizer; | |
| 2045 | + if( g.argc<4 ) usage("tokenizer porter|on|off|trigram"); | |
| 2046 | + iOldTokenizer = search_tokenizer_type(0); | |
| 2047 | 2047 | db_set("search-tokenizer", |
| 2048 | 2048 | search_tokenizer_for_string(g.argv[3]), 0); |
| 2049 | - iNewStemmer = search_tokenizer_type(1); | |
| 2050 | - if( iOldStemmer!=iNewStemmer ){ | |
| 2049 | + iNewTokenizer = search_tokenizer_type(1); | |
| 2050 | + if( iOldTokenizer!=iNewTokenizer ){ | |
| 2051 | 2051 | /* Drop or rebuild index if stemmer changes. */ |
| 2052 | - iAction = 1 + ((iOldStemmer && iNewStemmer) | |
| 2053 | - ? 1 : (iNewStemmer ? 1 : 0)); | |
| 2052 | + iAction = 1 + ((iOldTokenizer && iNewTokenizer) | |
| 2053 | + ? 1 : (iNewTokenizer ? 1 : 0)); | |
| 2054 | 2054 | } |
| 2055 | 2055 | } |
| 2056 | 2056 | |
| 2057 | 2057 | /* destroy or rebuild the index, if requested */ |
| 2058 | 2058 | if( iAction>=1 ){ |
| 2059 | 2059 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -2039,20 +2039,20 @@ | |
| 2039 | if( strchr(zCtrl, aSetng[j].zSw[0])!=0 ){ |
| 2040 | db_set_int(aSetng[j].zSetting/*works-like:"x"*/, iCmd-3, 0); |
| 2041 | } |
| 2042 | } |
| 2043 | }else if( iCmd==5 ){ |
| 2044 | int iOldStemmer, iNewStemmer; |
| 2045 | if( g.argc<4 ) usage("stemmer porter|on|off|trigram"); |
| 2046 | iOldStemmer = search_tokenizer_type(0); |
| 2047 | db_set("search-tokenizer", |
| 2048 | search_tokenizer_for_string(g.argv[3]), 0); |
| 2049 | iNewStemmer = search_tokenizer_type(1); |
| 2050 | if( iOldStemmer!=iNewStemmer ){ |
| 2051 | /* Drop or rebuild index if stemmer changes. */ |
| 2052 | iAction = 1 + ((iOldStemmer && iNewStemmer) |
| 2053 | ? 1 : (iNewStemmer ? 1 : 0)); |
| 2054 | } |
| 2055 | } |
| 2056 | |
| 2057 | /* destroy or rebuild the index, if requested */ |
| 2058 | if( iAction>=1 ){ |
| 2059 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -2039,20 +2039,20 @@ | |
| 2039 | if( strchr(zCtrl, aSetng[j].zSw[0])!=0 ){ |
| 2040 | db_set_int(aSetng[j].zSetting/*works-like:"x"*/, iCmd-3, 0); |
| 2041 | } |
| 2042 | } |
| 2043 | }else if( iCmd==5 ){ |
| 2044 | int iOldTokenizer, iNewTokenizer; |
| 2045 | if( g.argc<4 ) usage("tokenizer porter|on|off|trigram"); |
| 2046 | iOldTokenizer = search_tokenizer_type(0); |
| 2047 | db_set("search-tokenizer", |
| 2048 | search_tokenizer_for_string(g.argv[3]), 0); |
| 2049 | iNewTokenizer = search_tokenizer_type(1); |
| 2050 | if( iOldTokenizer!=iNewTokenizer ){ |
| 2051 | /* Drop or rebuild index if stemmer changes. */ |
| 2052 | iAction = 1 + ((iOldTokenizer && iNewTokenizer) |
| 2053 | ? 1 : (iNewTokenizer ? 1 : 0)); |
| 2054 | } |
| 2055 | } |
| 2056 | |
| 2057 | /* destroy or rebuild the index, if requested */ |
| 2058 | if( iAction>=1 ){ |
| 2059 |
+2
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -4,10 +4,12 @@ | ||
| 4 | 4 | * The stock OCI container no longer includes BusyBox, thus no longer |
| 5 | 5 | needs to start as root to chroot that power away. That in turn |
| 6 | 6 | frees us from needing to build and install the container as root, |
| 7 | 7 | since it no longer has to create a private <tt>/dev</tt> tree |
| 8 | 8 | inside the jail for Fossil's use. |
| 9 | + * Add support for the trigram tokenizer for FTS5 search to enable | |
| 10 | + searching in Chinese. | |
| 9 | 11 | |
| 10 | 12 | <h2 id='v2_21'>Changes for version 2.21 (2023-02-25)</h2> |
| 11 | 13 | * Users can request a password reset. This feature is disabledby default. Use |
| 12 | 14 | the new [/help?cmd=self-pw-reset|self-pw-reset property] to enable it. |
| 13 | 15 | New web pages [/help?cmd=/resetpw|/resetpw] and |
| 14 | 16 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -4,10 +4,12 @@ | |
| 4 | * The stock OCI container no longer includes BusyBox, thus no longer |
| 5 | needs to start as root to chroot that power away. That in turn |
| 6 | frees us from needing to build and install the container as root, |
| 7 | since it no longer has to create a private <tt>/dev</tt> tree |
| 8 | inside the jail for Fossil's use. |
| 9 | |
| 10 | <h2 id='v2_21'>Changes for version 2.21 (2023-02-25)</h2> |
| 11 | * Users can request a password reset. This feature is disabledby default. Use |
| 12 | the new [/help?cmd=self-pw-reset|self-pw-reset property] to enable it. |
| 13 | New web pages [/help?cmd=/resetpw|/resetpw] and |
| 14 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -4,10 +4,12 @@ | |
| 4 | * The stock OCI container no longer includes BusyBox, thus no longer |
| 5 | needs to start as root to chroot that power away. That in turn |
| 6 | frees us from needing to build and install the container as root, |
| 7 | since it no longer has to create a private <tt>/dev</tt> tree |
| 8 | inside the jail for Fossil's use. |
| 9 | * Add support for the trigram tokenizer for FTS5 search to enable |
| 10 | searching in Chinese. |
| 11 | |
| 12 | <h2 id='v2_21'>Changes for version 2.21 (2023-02-25)</h2> |
| 13 | * Users can request a password reset. This feature is disabledby default. Use |
| 14 | the new [/help?cmd=self-pw-reset|self-pw-reset property] to enable it. |
| 15 | New web pages [/help?cmd=/resetpw|/resetpw] and |
| 16 |