Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Do not limit the number of rows shown in a timeline using the n= query parameter if any of the yw=, ymd=, or days= query parameters are present. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
58804979ab3bc93706041f100f55e321 |
| User & Date: | drh 2018-04-26 20:54:11 |
Context
|
2018-04-27
| ||
| 00:52 | Fix typo in annotate documentation (check-in: 4dcda7d9 user: andygoth tags: trunk) | |
|
2018-04-26
| ||
| 20:54 | Do not limit the number of rows shown in a timeline using the n= query parameter if any of the yw=, ymd=, or days= query parameters are present. (check-in: 58804979 user: drh tags: trunk) | |
| 20:47 | On the banner for days=, ymd=, and yw= include a count of the number of timeline items. (check-in: d5fd4e26 user: drh tags: trunk) | |
Changes
Changes to src/timeline.c.
1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 |
"SELECT date('now','-6 days','weekday 1');");
zYearWeek = db_text(0,
"SELECT strftime('%%Y-%%W','now','-6 days','weekday 1')");
}
}
blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%W',event.mtime) ",
zYearWeek);
}
else if( zDay ){
zDay = db_text(0, "SELECT date(%Q)", zDay);
if( zDay==0 || zDay[0]==0 ){
zDay = db_text(0, "SELECT date('now')");
}
blob_append_sql(&cond, " AND %Q=date(event.mtime) ",
zDay);
}
else if( zNDays ){
nDays = atoi(zNDays);
if( nDays<1 ) nDays = 1;
blob_append_sql(&cond, " AND event.mtime>=julianday('now','-%d days') ",
nDays);
}
if( zTagSql ){
blob_append_sql(&cond,
" AND (EXISTS(SELECT 1 FROM tagxref NATURAL JOIN tag"
" WHERE %s AND tagtype>0 AND rid=blob.rid)\n", zTagSql/*safe-for-%s*/);
if( related ){
|
> > > |
1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 |
"SELECT date('now','-6 days','weekday 1');");
zYearWeek = db_text(0,
"SELECT strftime('%%Y-%%W','now','-6 days','weekday 1')");
}
}
blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%W',event.mtime) ",
zYearWeek);
nEntry = -1;
}
else if( zDay ){
zDay = db_text(0, "SELECT date(%Q)", zDay);
if( zDay==0 || zDay[0]==0 ){
zDay = db_text(0, "SELECT date('now')");
}
blob_append_sql(&cond, " AND %Q=date(event.mtime) ",
zDay);
nEntry = -1;
}
else if( zNDays ){
nDays = atoi(zNDays);
if( nDays<1 ) nDays = 1;
blob_append_sql(&cond, " AND event.mtime>=julianday('now','-%d days') ",
nDays);
nEntry = -1;
}
if( zTagSql ){
blob_append_sql(&cond,
" AND (EXISTS(SELECT 1 FROM tagxref NATURAL JOIN tag"
" WHERE %s AND tagtype>0 AND rid=blob.rid)\n", zTagSql/*safe-for-%s*/);
if( related ){
|