Differences From Artifact [77e25f7abc]:

• File src/timeline.c — part of check-in [465f8ecd4a] at 2013-11-12 19:41:19 on branch trunk — Restore the end-of-timeline marker only when no limit is active; otherwise, use a 'no more data' marker instead. Use -1 to indicate no limit in the SQL clause. (user: mistachkin size: 84363)

To Artifact [8dbf85b79e]:

• File src/timeline.c — part of check-in [f13ae6b673] at 2013-11-13 08:39:22 on branch trunk — Fix end-marker handling in "fossil timeline", broken by previous commit [465f8ecd4a]. (That's what the "n+1" in [14104fde04?ln=1818] was meant for, but -1 is always better) (user: jan.nijtmans size: 84401)

1821
1822
1823
1824
1825
1826
1827
1828
1829

1830
1831
1832
1833
1834
1835
1836
1837

    blob_appendf(&sql, " AND blob.rid IN ok");
  }
  if( zType && (zType[0]!='a') ){
    blob_appendf(&sql, " AND event.type=%Q ", zType);
  }
  blob_appendf(&sql, " ORDER BY event.mtime DESC");
  if( iOffset>0 ){
    int n2 = (n >= 0) ? n : -n;
    if( n2==0 ) n2 = -1; /* NO LIMIT */

    blob_appendf(&sql, " LIMIT %d OFFSET %d", n2, iOffset);
  }
  db_prepare(&q, blob_str(&sql));
  blob_reset(&sql);
  print_timeline(&q, n, width, verboseFlag);
  db_finalize(&q);
}

<
|
>
|

1821
1822
1823
1824
1825
1826
1827

1828
1829
1830
1831
1832
1833
1834
1835
1836
1837

    blob_appendf(&sql, " AND blob.rid IN ok");
  }
  if( zType && (zType[0]!='a') ){
    blob_appendf(&sql, " AND event.type=%Q ", zType);
  }
  blob_appendf(&sql, " ORDER BY event.mtime DESC");
  if( iOffset>0 ){

    /* Don't handle LIMIT here, otherwise print_timeline()
     * will not determine the end-marker correctly! */
    blob_appendf(&sql, " LIMIT -1 OFFSET %d", iOffset);
  }
  db_prepare(&q, blob_str(&sql));
  blob_reset(&sql);
  print_timeline(&q, n, width, verboseFlag);
  db_finalize(&q);
}