Fossil SCM
For help-text search, include the name of the command or setting as part of the searchable text. Also: Fix a bug in HTML-to-text translation of snippets.
Commit
55dd9896d7973e51d08984f55cbbc86d18cdea4db389811e6cc788e566925944
Parent
6d9f0f5f308d949…
1 file changed
+4
-3
+4
-3
| --- src/search.c | ||
| +++ src/search.c | ||
| @@ -622,14 +622,14 @@ | ||
| 622 | 622 | j += 3; |
| 623 | 623 | }else if( memcmp(&zSnip[j],">",4)==0 ){ |
| 624 | 624 | zSnip[k++] = '>'; |
| 625 | 625 | j += 3; |
| 626 | 626 | }else if( memcmp(&zSnip[j],""",6)==0 ){ |
| 627 | - zSnip[k++] = '<'; | |
| 627 | + zSnip[k++] = '"'; | |
| 628 | 628 | j += 5; |
| 629 | 629 | }else if( memcmp(&zSnip[j],"&",5)==0 ){ |
| 630 | - zSnip[k++] = '<'; | |
| 630 | + zSnip[k++] = '&'; | |
| 631 | 631 | j += 4; |
| 632 | 632 | }else{ |
| 633 | 633 | zSnip[k++] = c; |
| 634 | 634 | } |
| 635 | 635 | }else{ |
| @@ -1046,11 +1046,12 @@ | ||
| 1046 | 1046 | " '/help?cmd='||name," |
| 1047 | 1047 | " search_score()," |
| 1048 | 1048 | " 'h'||rowid," |
| 1049 | 1049 | " search_snippet()" |
| 1050 | 1050 | " FROM helptext" |
| 1051 | - " WHERE search_match('',helptext.helptext);" | |
| 1051 | + " WHERE search_match(format('the \"%%s\" %%s',name,type)," | |
| 1052 | + " helptext.helptext);" | |
| 1052 | 1053 | ); |
| 1053 | 1054 | } |
| 1054 | 1055 | } |
| 1055 | 1056 | |
| 1056 | 1057 | /* |
| 1057 | 1058 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -622,14 +622,14 @@ | |
| 622 | j += 3; |
| 623 | }else if( memcmp(&zSnip[j],">",4)==0 ){ |
| 624 | zSnip[k++] = '>'; |
| 625 | j += 3; |
| 626 | }else if( memcmp(&zSnip[j],""",6)==0 ){ |
| 627 | zSnip[k++] = '<'; |
| 628 | j += 5; |
| 629 | }else if( memcmp(&zSnip[j],"&",5)==0 ){ |
| 630 | zSnip[k++] = '<'; |
| 631 | j += 4; |
| 632 | }else{ |
| 633 | zSnip[k++] = c; |
| 634 | } |
| 635 | }else{ |
| @@ -1046,11 +1046,12 @@ | |
| 1046 | " '/help?cmd='||name," |
| 1047 | " search_score()," |
| 1048 | " 'h'||rowid," |
| 1049 | " search_snippet()" |
| 1050 | " FROM helptext" |
| 1051 | " WHERE search_match('',helptext.helptext);" |
| 1052 | ); |
| 1053 | } |
| 1054 | } |
| 1055 | |
| 1056 | /* |
| 1057 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -622,14 +622,14 @@ | |
| 622 | j += 3; |
| 623 | }else if( memcmp(&zSnip[j],">",4)==0 ){ |
| 624 | zSnip[k++] = '>'; |
| 625 | j += 3; |
| 626 | }else if( memcmp(&zSnip[j],""",6)==0 ){ |
| 627 | zSnip[k++] = '"'; |
| 628 | j += 5; |
| 629 | }else if( memcmp(&zSnip[j],"&",5)==0 ){ |
| 630 | zSnip[k++] = '&'; |
| 631 | j += 4; |
| 632 | }else{ |
| 633 | zSnip[k++] = c; |
| 634 | } |
| 635 | }else{ |
| @@ -1046,11 +1046,12 @@ | |
| 1046 | " '/help?cmd='||name," |
| 1047 | " search_score()," |
| 1048 | " 'h'||rowid," |
| 1049 | " search_snippet()" |
| 1050 | " FROM helptext" |
| 1051 | " WHERE search_match(format('the \"%%s\" %%s',name,type)," |
| 1052 | " helptext.helptext);" |
| 1053 | ); |
| 1054 | } |
| 1055 | } |
| 1056 | |
| 1057 | /* |
| 1058 |