Fossil SCM
Fix some bugs in tech note search indexing
Commit
76f8bfd5f97cc1243a8919e9a33a2d4b1e0643ab76bb8f9268186ea7127de879
Parent
467512031f482b1…
1 file changed
+6
-4
+6
-4
| --- src/search.c | ||
| +++ src/search.c | ||
| @@ -1514,12 +1514,12 @@ | ||
| 1514 | 1514 | db_multi_exec( |
| 1515 | 1515 | "INSERT OR IGNORE INTO ftsdocs(type,rid,idxed)" |
| 1516 | 1516 | " SELECT 't', tkt_id, 0 FROM ticket;" |
| 1517 | 1517 | ); |
| 1518 | 1518 | db_multi_exec( |
| 1519 | - "INSERT OR IGNORE INTO ftsdocs(type,rid,idxed)" | |
| 1520 | - " SELECT 'e', objid, 0 FROM event WHERE type='e';" | |
| 1519 | + "INSERT OR IGNORE INTO ftsdocs(type,rid,name,idxed)" | |
| 1520 | + " SELECT 'e', objid, comment, 0 FROM event WHERE type='e';" | |
| 1521 | 1521 | ); |
| 1522 | 1522 | } |
| 1523 | 1523 | |
| 1524 | 1524 | /* |
| 1525 | 1525 | ** The document described by cType,rid,zName is about to be added or |
| @@ -1696,13 +1696,15 @@ | ||
| 1696 | 1696 | db_multi_exec( |
| 1697 | 1697 | "UPDATE ftsdocs SET idxed=1," |
| 1698 | 1698 | " (name,label,url,mtime) = " |
| 1699 | 1699 | " (SELECT ftsdocs.name," |
| 1700 | 1700 | " 'Tech Note: '||ftsdocs.name," |
| 1701 | - " '/technote/'||urlencode(ftsdocs.name)," | |
| 1701 | + " '/technote/'||substr(tag.tagname,7)," | |
| 1702 | 1702 | " tagxref.mtime" |
| 1703 | - " FROM tagxref WHERE tagxref.rid=ftsdocs.rid)" | |
| 1703 | + " FROM tagxref, tag USING (tagid)" | |
| 1704 | + " WHERE tagxref.rid=ftsdocs.rid" | |
| 1705 | + " AND tagname GLOB 'event-*')" | |
| 1704 | 1706 | " WHERE ftsdocs.type='e' AND NOT ftsdocs.idxed" |
| 1705 | 1707 | ); |
| 1706 | 1708 | } |
| 1707 | 1709 | |
| 1708 | 1710 | /* |
| 1709 | 1711 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -1514,12 +1514,12 @@ | |
| 1514 | db_multi_exec( |
| 1515 | "INSERT OR IGNORE INTO ftsdocs(type,rid,idxed)" |
| 1516 | " SELECT 't', tkt_id, 0 FROM ticket;" |
| 1517 | ); |
| 1518 | db_multi_exec( |
| 1519 | "INSERT OR IGNORE INTO ftsdocs(type,rid,idxed)" |
| 1520 | " SELECT 'e', objid, 0 FROM event WHERE type='e';" |
| 1521 | ); |
| 1522 | } |
| 1523 | |
| 1524 | /* |
| 1525 | ** The document described by cType,rid,zName is about to be added or |
| @@ -1696,13 +1696,15 @@ | |
| 1696 | db_multi_exec( |
| 1697 | "UPDATE ftsdocs SET idxed=1," |
| 1698 | " (name,label,url,mtime) = " |
| 1699 | " (SELECT ftsdocs.name," |
| 1700 | " 'Tech Note: '||ftsdocs.name," |
| 1701 | " '/technote/'||urlencode(ftsdocs.name)," |
| 1702 | " tagxref.mtime" |
| 1703 | " FROM tagxref WHERE tagxref.rid=ftsdocs.rid)" |
| 1704 | " WHERE ftsdocs.type='e' AND NOT ftsdocs.idxed" |
| 1705 | ); |
| 1706 | } |
| 1707 | |
| 1708 | /* |
| 1709 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -1514,12 +1514,12 @@ | |
| 1514 | db_multi_exec( |
| 1515 | "INSERT OR IGNORE INTO ftsdocs(type,rid,idxed)" |
| 1516 | " SELECT 't', tkt_id, 0 FROM ticket;" |
| 1517 | ); |
| 1518 | db_multi_exec( |
| 1519 | "INSERT OR IGNORE INTO ftsdocs(type,rid,name,idxed)" |
| 1520 | " SELECT 'e', objid, comment, 0 FROM event WHERE type='e';" |
| 1521 | ); |
| 1522 | } |
| 1523 | |
| 1524 | /* |
| 1525 | ** The document described by cType,rid,zName is about to be added or |
| @@ -1696,13 +1696,15 @@ | |
| 1696 | db_multi_exec( |
| 1697 | "UPDATE ftsdocs SET idxed=1," |
| 1698 | " (name,label,url,mtime) = " |
| 1699 | " (SELECT ftsdocs.name," |
| 1700 | " 'Tech Note: '||ftsdocs.name," |
| 1701 | " '/technote/'||substr(tag.tagname,7)," |
| 1702 | " tagxref.mtime" |
| 1703 | " FROM tagxref, tag USING (tagid)" |
| 1704 | " WHERE tagxref.rid=ftsdocs.rid" |
| 1705 | " AND tagname GLOB 'event-*')" |
| 1706 | " WHERE ftsdocs.type='e' AND NOT ftsdocs.idxed" |
| 1707 | ); |
| 1708 | } |
| 1709 | |
| 1710 | /* |
| 1711 |