From: dan <Dan Kennedy>
Date: Tue, 24 Oct 2023 16:06:56 +0000 (+0000)
Subject: Fix a problem with the fts5 highlight() and snippet() functions when used with tokeni... 
X-Git-Tag: version-3.44.0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3da982635ccf5c172ec594d4c76c258000d17f4b;p=thirdparty%2Fsqlite.git

Fix a problem with the fts5 highlight() and snippet() functions when used with tokenizers like "trigram" that output overlapping tokens. Forum post [forum:/forumpost/63735293ec|63735293ec].

FossilOrigin-Name: e952db86faaafd2ef8558175ebcae6834d0b0002813cc78c7ae7da713604cbec
---

3da982635ccf5c172ec594d4c76c258000d17f4b
diff --cc manifest
index 3c9098773b,5cbda42c7c..f72955b93a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Spelling\simprovements,\sin\scomments\sonly
- D 2023-10-24T15:11:55.292
+ C Fix\sa\sproblem\swith\sthe\sfts5\shighlight()\sand\ssnippet()\sfunctions\swhen\sused\swith\stokenizers\slike\s"trigram"\sthat\soutput\soverlapping\stokens.\sForum\spost\s[forum:/forumpost/63735293ec|63735293ec].
 -D 2023-10-24T15:53:02.462
++D 2023-10-24T16:06:56.794
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2138,8 -2138,11 +2138,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 65bcc583784476f8cc52dfe72ecc52df93d0ec5817c313ad7a83905c0047dd8c
- R c8334cab1fcc469c9751c0c187d23f95
- U larrybr
- Z 39c62f83179e0f32d38df3d4da9ac443
 -P 0c4907ddf9abd1ebfef31c1a53d702c4dcaa015c0032b8b52774c9e260b6cfd7
 -R 41175df0065ba91132d9e078adcc9517
 -T *branch * fts5-trigram-snippet-fix
 -T *sym-fts5-trigram-snippet-fix *
 -T -sym-trunk *
++P 9ee25eeaf17124dbe34b961384e74c1ae239ee1798bb01907938600ed6b4066f d570aa02f79b1d7d3889e33f9eebab1b7edcf5231b1357451eed9a538607de54
++R 4c04974dbac2d5b02e9db5f09d63c22c
++T +closed d570aa02f79b1d7d3889e33f9eebab1b7edcf5231b1357451eed9a538607de54
+ U dan
 -Z fb6ef8c426c83834a5c6c815bfcd6614
++Z 7a83bdd07c56b465bbc46bd2267d0f1f
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 1f637be117,3af9e01b11..200a4a1138
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9ee25eeaf17124dbe34b961384e74c1ae239ee1798bb01907938600ed6b4066f
 -d570aa02f79b1d7d3889e33f9eebab1b7edcf5231b1357451eed9a538607de54
++e952db86faaafd2ef8558175ebcae6834d0b0002813cc78c7ae7da713604cbec