Fossil SCM
A better fix for the missing blog-entry on timeline problem.
Commit
57b676f1f1f221071230ae8646cb951db1a09f3c
Parent
25ae319b843d4ae…
1 file changed
+4
-6
+4
-6
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1706,15 +1706,14 @@ | ||
| 1706 | 1706 | sqlite3_snprintf(sizeof(zLength), zLength, "%d", nWiki); |
| 1707 | 1707 | tag_insert(zTag, 1, zLength, rid, p->rDate, rid); |
| 1708 | 1708 | free(zTag); |
| 1709 | 1709 | prior = db_int(0, |
| 1710 | 1710 | "SELECT rid FROM tagxref" |
| 1711 | - " WHERE tagid=%d AND mtime<%.17g" | |
| 1711 | + " WHERE tagid=%d AND mtime<%.17g AND rid!=%d" | |
| 1712 | 1712 | " ORDER BY mtime DESC", |
| 1713 | - tagid, p->rDate | |
| 1713 | + tagid, p->rDate, rid | |
| 1714 | 1714 | ); |
| 1715 | - if( prior==rid ) prior = 0; | |
| 1716 | 1715 | if( prior ){ |
| 1717 | 1716 | content_deltify(prior, rid, 0); |
| 1718 | 1717 | db_multi_exec( |
| 1719 | 1718 | "DELETE FROM event" |
| 1720 | 1719 | " WHERE type='e'" |
| @@ -1723,15 +1722,14 @@ | ||
| 1723 | 1722 | tagid, tagid |
| 1724 | 1723 | ); |
| 1725 | 1724 | } |
| 1726 | 1725 | subsequent = db_int(0, |
| 1727 | 1726 | "SELECT rid FROM tagxref" |
| 1728 | - " WHERE tagid=%d AND mtime>%.17g" | |
| 1727 | + " WHERE tagid=%d AND mtime>%.17g AND rid!=%d" | |
| 1729 | 1728 | " ORDER BY mtime", |
| 1730 | - tagid, p->rDate | |
| 1729 | + tagid, p->rDate, rid | |
| 1731 | 1730 | ); |
| 1732 | - if( subsequent==rid ) subsequent = 0; | |
| 1733 | 1731 | if( subsequent ){ |
| 1734 | 1732 | content_deltify(rid, subsequent, 0); |
| 1735 | 1733 | }else{ |
| 1736 | 1734 | db_multi_exec( |
| 1737 | 1735 | "REPLACE INTO event(type,mtime,objid,tagid,user,comment,bgcolor)" |
| 1738 | 1736 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1706,15 +1706,14 @@ | |
| 1706 | sqlite3_snprintf(sizeof(zLength), zLength, "%d", nWiki); |
| 1707 | tag_insert(zTag, 1, zLength, rid, p->rDate, rid); |
| 1708 | free(zTag); |
| 1709 | prior = db_int(0, |
| 1710 | "SELECT rid FROM tagxref" |
| 1711 | " WHERE tagid=%d AND mtime<%.17g" |
| 1712 | " ORDER BY mtime DESC", |
| 1713 | tagid, p->rDate |
| 1714 | ); |
| 1715 | if( prior==rid ) prior = 0; |
| 1716 | if( prior ){ |
| 1717 | content_deltify(prior, rid, 0); |
| 1718 | db_multi_exec( |
| 1719 | "DELETE FROM event" |
| 1720 | " WHERE type='e'" |
| @@ -1723,15 +1722,14 @@ | |
| 1723 | tagid, tagid |
| 1724 | ); |
| 1725 | } |
| 1726 | subsequent = db_int(0, |
| 1727 | "SELECT rid FROM tagxref" |
| 1728 | " WHERE tagid=%d AND mtime>%.17g" |
| 1729 | " ORDER BY mtime", |
| 1730 | tagid, p->rDate |
| 1731 | ); |
| 1732 | if( subsequent==rid ) subsequent = 0; |
| 1733 | if( subsequent ){ |
| 1734 | content_deltify(rid, subsequent, 0); |
| 1735 | }else{ |
| 1736 | db_multi_exec( |
| 1737 | "REPLACE INTO event(type,mtime,objid,tagid,user,comment,bgcolor)" |
| 1738 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1706,15 +1706,14 @@ | |
| 1706 | sqlite3_snprintf(sizeof(zLength), zLength, "%d", nWiki); |
| 1707 | tag_insert(zTag, 1, zLength, rid, p->rDate, rid); |
| 1708 | free(zTag); |
| 1709 | prior = db_int(0, |
| 1710 | "SELECT rid FROM tagxref" |
| 1711 | " WHERE tagid=%d AND mtime<%.17g AND rid!=%d" |
| 1712 | " ORDER BY mtime DESC", |
| 1713 | tagid, p->rDate, rid |
| 1714 | ); |
| 1715 | if( prior ){ |
| 1716 | content_deltify(prior, rid, 0); |
| 1717 | db_multi_exec( |
| 1718 | "DELETE FROM event" |
| 1719 | " WHERE type='e'" |
| @@ -1723,15 +1722,14 @@ | |
| 1722 | tagid, tagid |
| 1723 | ); |
| 1724 | } |
| 1725 | subsequent = db_int(0, |
| 1726 | "SELECT rid FROM tagxref" |
| 1727 | " WHERE tagid=%d AND mtime>%.17g AND rid!=%d" |
| 1728 | " ORDER BY mtime", |
| 1729 | tagid, p->rDate, rid |
| 1730 | ); |
| 1731 | if( subsequent ){ |
| 1732 | content_deltify(rid, subsequent, 0); |
| 1733 | }else{ |
| 1734 | db_multi_exec( |
| 1735 | "REPLACE INTO event(type,mtime,objid,tagid,user,comment,bgcolor)" |
| 1736 |