Diff
Not logged in

Differences From:

File src/timeline.c part of check-in [097479f99a] - Better defaults for new databases and clones. Use *CURRENT* to identify the current checkout for TTY timelines. by drh on 2007-09-26 02:00:26. [view]

To:

File src/timeline.c part of check-in [6d58613757] - Timeline comments are now rendered as wiki. Wiki changes appear on the timeline. by drh on 2007-10-06 16:37:39. [view]

@@ -98,14 +98,16 @@
  ){
   char zPrevDate[20];
   int cnt = 0;
   zPrevDate[0] = 0;
+  Blob comment;
 
   db_multi_exec(
      "CREATE TEMP TABLE IF NOT EXISTS seen(rid INTEGER PRIMARY KEY);"
      "DELETE FROM seen;"
   );
   @ <table cellspacing=0 border=0 cellpadding=0>
+  blob_zero(&comment);
   while( db_step(pQuery)==SQLITE_ROW ){
     int rid = db_column_int(pQuery, 0);
     const char *zUuid = db_column_text(pQuery, 1);
     int nPChild = db_column_int(pQuery, 5);
@@ -152,9 +154,11 @@
     }
     if( isLeaf ){
       @ <b>Leaf</b>
     }
-    @ %h(db_column_text(pQuery,3))
+    db_column_blob(pQuery, 3, &comment);
+    wiki_convert(&comment, 0);
+    blob_reset(&comment);
     @ (by %h(db_column_text(pQuery,4)))</td></tr>
   }
   @ </table>
 }
@@ -458,9 +462,9 @@
     @ SELECT
     @   blob.rid,
     @   uuid,
     @   datetime(event.mtime,'localtime'),
-    @   coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')',
+    @   coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user,'?') ||')',
     @   (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
     @   (SELECT count(*) FROM plink WHERE cid=blob.rid)
     @ FROM event, blob
     @ WHERE blob.rid=event.objid