Fossil

Changes On Branch search-terms-highlighting
Login

Changes On Branch search-terms-highlighting

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch search-terms-highlighting Excluding Merge-Ins

This is equivalent to a diff from 96bf76a4b1 to 2b5f9b211c

2022-02-10
15:50
Update the built-in SQLite to the latest 3.38.0 beta that includes the performance enhancements on the datetime() function. ... (check-in: 740d655e55 user: drh tags: trunk)
00:29
Merge from trunk ... (Leaf check-in: 2b5f9b211c user: george tags: search-terms-highlighting)
00:22
Merge from trunk ... (Leaf check-in: a961a67ba7 user: george tags: rptview-submenu-paralink)
00:17
Merge from trunk ... (check-in: 88ff4e5dea user: george tags: wcontent-subsets)
00:12
Merge from trunk ... (Leaf check-in: 9b76469b38 user: george tags: th1-doc-vars)
00:05
Remove unused local variable from cgi_parse_POST_JSON() to fix a compiler warning. ... (check-in: 96bf76a4b1 user: george tags: trunk)
2022-02-09
20:23
Cherrypicked [92221aaa192e82] and [7283ae6e120c10] on behalf of George. ... (check-in: f902814db6 user: stephan tags: trunk)
2022-01-21
20:34
Merge from trunk ... (check-in: 8d78edddf7 user: george tags: search-terms-highlighting)

Changes to src/search.c.
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
** If z[] is of the form "<mark>TEXT</mark>" where TEXT contains
** no white-space or punctuation, then return the length of the mark.
*/
static int isSnippetMark(const char *z){
  int n;
  if( strncmp(z,"<mark>",6)!=0 ) return 0;
  n = 6;
  while( fossil_isalnum(z[n]) ) n++;
  if( strncmp(&z[n],"</mark>",7)!=0 ) return 0;
  return n+7;
}

/*
** Return a copy of zSnip (in memory obtained from fossil_malloc()) that
** has all "<" characters, other than those on <mark> and </mark>,







|







975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
** If z[] is of the form "<mark>TEXT</mark>" where TEXT contains
** no white-space or punctuation, then return the length of the mark.
*/
static int isSnippetMark(const char *z){
  int n;
  if( strncmp(z,"<mark>",6)!=0 ) return 0;
  n = 6;
  while( z[n]!=0 && z[n]!='<' ) n++;
  if( strncmp(&z[n],"</mark>",7)!=0 ) return 0;
  return n+7;
}

/*
** Return a copy of zSnip (in memory obtained from fossil_malloc()) that
** has all "<" characters, other than those on <mark> and </mark>,