Fossil: Check-in [611b3b206b]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:	611b3b206bdfea6d2c71f4ff13a369918d5181ec
Date:	2010-03-15 16:16:34
User:	drh
Comment:	Show check-ins that mention a ticket in the ticket timeline.

Tags And Properties

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

Changes

hide diffs unified diffs patch

Changes to src/tkt.c

--- Old (cb76bfccd0c1a8af)
+++ New (26c5d6f1c68ffa4c)
 /*
 ** Copyright (c) 2007 D. Richard Hipp
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public
     Th_Store(z, P(z));
+  }
+}
 /*
-** Rebuild all tickets named in the _pending_ticket table.
-**
-** This routine is called just prior to commit after new
-** out-of-sequence ticket changes have been added.
-*/
-static int ticket_rebuild_at_commit(void){
-  Stmt q;
-  db_multi_exec(
-    "DELETE FROM ticket WHERE tkt_uuid IN _pending_ticket"
-  );
-  db_prepare(&q, "SELECT uuid FROM _pending_ticket");
-  while( db_step(&q)==SQLITE_ROW ){
-    const char *zUuid = db_column_text(&q, 0);
-    ticket_rebuild_entry(zUuid);
-  }
-  db_multi_exec(
-    "DELETE FROM _pending_ticket"
-  );
-  return 0;
-}
@@ 191 / < @@
-/*
 ** Update an entry of the TICKET table according to the information
 ** in the control file given in p.  Attempt to create the appropriate
 ** TICKET table entry if createFlag is true.  If createFlag is false,
 ** that means we already know the entry exists and so we can save the
 ** work of trying to create it.
 **
 ** Return TRUE if a new TICKET entry was created and FALSE if an
 ** existing entry was revised.
 */
-int ticket_insert(const Manifest *p, int createFlag, int checkTime){
+int ticket_insert(const Manifest *p, int createFlag, int rid){
   Blob sql;
   Stmt q;
   int i;
   const char *zSep;
   int rc = 0;
                    zName, zName, p->aField[i].zValue);
     }else{
       if( fieldId(zName)<0 ) continue;
       blob_appendf(&sql,", %s=%Q", zName, p->aField[i].zValue);
+    }
+    if( rid>0 ){
+      wiki_extract_links(p->aField[i].zValue, rid, 1, p->rDate, i==0, 0);
+    }
+  }
   blob_appendf(&sql, " WHERE tkt_uuid='%s' AND tkt_mtime<:mtime",
                      p->zTicketUuid);
   db_prepare(&q, "%s", blob_str(&sql));
   db_bind_double(&q, ":mtime", p->rDate);
   db_step(&q);
   db_finalize(&q);
-  if( checkTime && db_changes()==0 ){
-    static int isInit = 0;
-    if( !isInit ){
-      db_multi_exec("CREATE TEMP TABLE _pending_ticket(uuid TEXT UNIQUE)");
-      db_commit_hook(ticket_rebuild_at_commit, 1);
-      isInit = 1;
-    }
-    db_multi_exec("INSERT OR IGNORE INTO _pending_ticket "
-                  "VALUES(%Q)", p->zTicketUuid);
-  }
   blob_reset(&sql);
   return rc;
+}
 /*
   db_prepare(&q, "SELECT rid FROM tagxref WHERE tagid=%d ORDER BY mtime",tagid);
   while( db_step(&q)==SQLITE_ROW ){
     int rid = db_column_int(&q, 0);
     content_get(rid, &content);
     manifest_parse(&manifest, &content);
-    ticket_insert(&manifest, createFlag, 0);
+    ticket_insert(&manifest, createFlag, rid);
     manifest_ticket_event(rid, &manifest, createFlag, tagid);
     manifest_clear(&manifest);
     createFlag = 0;
+  }
   db_finalize(&q);
 void tkttimeline_page(void){
   Stmt q;
   char *zTitle;
   char *zSQL;
   const char *zUuid;
+  char *zFullUuid;
   int tagid;
+  char zGlobPattern[50];
   login_check_credentials();
   if( !g.okHistory || !g.okRdTkt ){ login_needed(); return; }
   zUuid = PD("name","");
   style_submenu_element("History", "History",
     "%s/info/%s", g.zTop, zUuid);
   zTitle = mprintf("Timeline Of Ticket %h", zUuid);
   style_header(zTitle);
   free(zTitle);
+  sqlite3_snprintf(6, zGlobPattern, "%s", zUuid);
+  canonical16(zGlobPattern, strlen(zGlobPattern));
   tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname GLOB 'tkt-%q*'",zUuid);
   if( tagid==0 ){
     @ No such ticket: %h(zUuid)
     style_footer();
     return;
+  }
+  zFullUuid = db_text(0, "SELECT substr(tagname, 5) FROM tag WHERE tagid=%d",
+                         tagid);
   zSQL = mprintf("%s AND event.objid IN "
-                 "  (SELECT rid FROM tagxref WHERE tagid=%d) "
+                 "  (SELECT rid FROM tagxref WHERE tagid=%d UNION"
@@ | / 622 / " SELECT srcid FROM backlink WHERE target GLOB '%.4s*' " @@
@@ | / 623 / "AND '%s' GLOB (target||'*')) " @@
                  "ORDER BY mtime DESC",
-                 timeline_query_for_www(), tagid);
+                 timeline_query_for_www(), tagid, zFullUuid, zFullUuid);
   db_prepare(&q, zSQL);
   free(zSQL);
   www_print_timeline(&q, TIMELINE_ARTID, 0);
   db_finalize(&q);
   style_footer();
+    }
     blob_reset(&val);
+  }
   @ </ol>
+}