Fossil

Check-in [58804979]
Login

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: 58804979ab3bc93706041f100f55e321ac09659cc763dd5089c460e7d3934f5d
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
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/timeline.c.

  1783   1783                "SELECT date('now','-6 days','weekday 1');");
  1784   1784             zYearWeek = db_text(0,
  1785   1785                "SELECT strftime('%%Y-%%W','now','-6 days','weekday 1')");
  1786   1786           }
  1787   1787         }
  1788   1788         blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%W',event.mtime) ",
  1789   1789                      zYearWeek);
         1790  +      nEntry = -1;
  1790   1791       }
  1791   1792       else if( zDay ){
  1792   1793         zDay = db_text(0, "SELECT date(%Q)", zDay);
  1793   1794         if( zDay==0 || zDay[0]==0 ){
  1794   1795           zDay = db_text(0, "SELECT date('now')");
  1795   1796         }
  1796   1797         blob_append_sql(&cond, " AND %Q=date(event.mtime) ",
  1797   1798                      zDay);
         1799  +      nEntry = -1;
  1798   1800       }
  1799   1801       else if( zNDays ){
  1800   1802         nDays = atoi(zNDays);
  1801   1803         if( nDays<1 ) nDays = 1;
  1802   1804         blob_append_sql(&cond, " AND event.mtime>=julianday('now','-%d days') ",
  1803   1805                         nDays);
         1806  +      nEntry = -1;
  1804   1807       }
  1805   1808       if( zTagSql ){
  1806   1809         blob_append_sql(&cond,
  1807   1810           " AND (EXISTS(SELECT 1 FROM tagxref NATURAL JOIN tag"
  1808   1811           " WHERE %s AND tagtype>0 AND rid=blob.rid)\n", zTagSql/*safe-for-%s*/);
  1809   1812   
  1810   1813         if( related ){