SHA1 Hash:	580d6ad8c747c7fed75fd390c670c657c3359e21
Date:	2009-01-21 01:23:40
User:	drh
Comment:	Suppress the display of the artificate ID on the timeline which showing changes to wiki or tickets.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/branch.c from [124ac5fc7f] to [dc5b99a321].

@@ -231,11 +231,11 @@
   db_prepare(&q,
     "%s AND blob.rid IN (SELECT rid FROM tagxref WHERE tagtype>0 AND tagid=%d)"
     " ORDER BY event.mtime DESC",
     timeline_query_for_www(), TAG_NEWBRANCH
   );
-  www_print_timeline(&q);
+  www_print_timeline(&q, 0, 0);
   db_finalize(&q);
   @ <br clear="both">
   @ <script>
   @ function xin(id){
   @ }

Modified src/descendants.c from [6edb8b041e] to [4af89fd5e9].

@@ -297,11 +297,11 @@
     "%s"
     "   AND blob.rid IN leaves"
     " ORDER BY event.mtime DESC",
     timeline_query_for_www()
   );
-  www_print_timeline(&q);
+  www_print_timeline(&q, 0, 0);
   db_finalize(&q);
   @ <br clear="both">
   @ <script>
   @ function xin(id){
   @ }

Modified src/tagview.c from [565eefa2cf] to [0e640840d1].

@@ -183,11 +183,11 @@
          " ORDER BY 3 desc",
          timeline_query_for_www(), tagid
   );
   db_prepare(&q, zSql);
   free(zSql);
-  www_print_timeline(&q);
+  www_print_timeline(&q, 0, 0);
   db_finalize(&q);
 }
 
 /*
 ** WEBPAGE: /tagview

Modified src/timeline.c from [9af5050c9a] to [7e388fb127].

@@ -95,10 +95,17 @@
   );
   return nNonBranch;
 }
 
 /*
+** Allowed flags for the tmFlags argument to www_print_timeline
+*/
+#if INTERFACE
+#define TIMELINE_ARTID  0x0001   /* Show artifact IDs on non-check-in lines */
+#endif
+
+/*
 ** Output a timeline in the web format given a query.  The query
 ** should return these columns:
 **
 **    0.  rid
 **    1.  UUID
@@ -111,11 +118,13 @@
 **    8.  background color
 **    9.  type ("ci", "w")
 **   10.  list of symbolic tags.
 */
 void www_print_timeline(
-  Stmt *pQuery          /* Query to implement the timeline */
+  Stmt *pQuery,          /* Query to implement the timeline */
+  int tmFlags,           /* Flags controlling display behavior */
+  void (*xExtra)(int)    /* Routine to call on each line of display */
 ){
   int wikiFlags;
   int mxWikiLen;
   Blob comment;
   char zPrevDate[20];
@@ -174,11 +183,11 @@
         }
       }
       if( isLeaf ){
         @ <b>Leaf</b>
       }
-    }else{
+    }else if( (tmFlags & TIMELINE_ARTID)!=0 ){
       hyperlink_to_uuid(zUuid);
     }
     db_column_blob(pQuery, 3, &comment);
     if( mxWikiLen>0 && blob_size(&comment)>mxWikiLen ){
       Blob truncated;
@@ -463,11 +472,11 @@
   }
   blob_zero(&sql);
   db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC");
   @ <h2>%b(&desc)</h2>
   blob_reset(&desc);
-  www_print_timeline(&q);
+  www_print_timeline(&q, 0, 0);
   db_finalize(&q);
 
   @ <script>
   @ var parentof = new Object();
   @ var childof = new Object();

Modified src/tkt.c from [06fa0eeb84] to [a24e654e39].

@@ -636,11 +636,11 @@
                  "  (SELECT rid FROM tagxref WHERE tagid=%d) "
                  "ORDER BY mtime DESC",
                  timeline_query_for_www(), tagid);
   db_prepare(&q, zSQL);
   free(zSQL);
-  www_print_timeline(&q);
+  www_print_timeline(&q, TIMELINE_ARTID, 0);
   db_finalize(&q);
   style_footer();
 }
 
 /*

Modified src/wiki.c from [af5301943f] to [ad80e67405].

@@ -484,11 +484,11 @@
                        "(SELECT tagid FROM tag WHERE tagname='wiki-%q'))"
                  "ORDER BY mtime DESC",
                  timeline_query_for_www(), zPageName);
   db_prepare(&q, zSQL);
   free(zSQL);
-  www_print_timeline(&q);
+  www_print_timeline(&q, TIMELINE_ARTID, 0);
   db_finalize(&q);
   style_footer();
 }
 
 /*