Fossil SCM
Output information on ambiguous event match.
Commit
aa10e756560dd22b0a238942a7ede622b0a18d11
Parent
8b9b44515ef2fd3…
1 file changed
+23
-6
+23
-6
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -436,16 +436,17 @@ | ||
| 436 | 436 | @ %s(zUuid)</a> - |
| 437 | 437 | object_description(rid, 0, 0); |
| 438 | 438 | @ </p></li> |
| 439 | 439 | } |
| 440 | 440 | db_finalize(&q); |
| 441 | - db_prepare(&q, " SELECT tkt_rid, tkt_uuid, title" | |
| 442 | - " FROM ticket, ticketchng" | |
| 443 | - " WHERE ticket.tkt_id = ticketchng.tkt_id" | |
| 444 | - " AND tkt_uuid GLOB '%q*'" | |
| 445 | - " GROUP BY tkt_uuid" | |
| 446 | - " ORDER BY tkt_ctime DESC", z); | |
| 441 | + db_prepare(&q, | |
| 442 | + " SELECT tkt_rid, tkt_uuid, title" | |
| 443 | + " FROM ticket, ticketchng" | |
| 444 | + " WHERE ticket.tkt_id = ticketchng.tkt_id" | |
| 445 | + " AND tkt_uuid GLOB '%q*'" | |
| 446 | + " GROUP BY tkt_uuid" | |
| 447 | + " ORDER BY tkt_ctime DESC", z); | |
| 447 | 448 | while( db_step(&q)==SQLITE_ROW ){ |
| 448 | 449 | int rid = db_column_int(&q, 0); |
| 449 | 450 | const char *zUuid = db_column_text(&q, 1); |
| 450 | 451 | const char *zTitle = db_column_text(&q, 2); |
| 451 | 452 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| @@ -452,10 +453,26 @@ | ||
| 452 | 453 | @ %s(zUuid)</a> - |
| 453 | 454 | @ <ul></ul> |
| 454 | 455 | @ Ticket |
| 455 | 456 | hyperlink_to_uuid(zUuid); |
| 456 | 457 | @ - %s(zTitle). |
| 458 | + @ <ul><li> | |
| 459 | + object_description(rid, 0, 0); | |
| 460 | + @ </li></ul> | |
| 461 | + @ </p></li> | |
| 462 | + } | |
| 463 | + db_finalize(&q); | |
| 464 | + db_prepare(&q, | |
| 465 | + "SELECT rid, uuid FROM" | |
| 466 | + " (SELECT tagxref.rid AS rid, substr(tagname, 7) AS uuid" | |
| 467 | + " FROM tagxref, tag WHERE tagxref.tagid = tag.tagid" | |
| 468 | + " AND tagname GLOB 'event-%q*') GROUP BY uuid", z); | |
| 469 | + while( db_step(&q)==SQLITE_ROW ){ | |
| 470 | + int rid = db_column_int(&q, 0); | |
| 471 | + const char* zUuid = db_column_text(&q, 1); | |
| 472 | + @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> | |
| 473 | + @ %s(zUuid)</a> - | |
| 457 | 474 | @ <ul><li> |
| 458 | 475 | object_description(rid, 0, 0); |
| 459 | 476 | @ </li></ul> |
| 460 | 477 | @ </p></li> |
| 461 | 478 | } |
| 462 | 479 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -436,16 +436,17 @@ | |
| 436 | @ %s(zUuid)</a> - |
| 437 | object_description(rid, 0, 0); |
| 438 | @ </p></li> |
| 439 | } |
| 440 | db_finalize(&q); |
| 441 | db_prepare(&q, " SELECT tkt_rid, tkt_uuid, title" |
| 442 | " FROM ticket, ticketchng" |
| 443 | " WHERE ticket.tkt_id = ticketchng.tkt_id" |
| 444 | " AND tkt_uuid GLOB '%q*'" |
| 445 | " GROUP BY tkt_uuid" |
| 446 | " ORDER BY tkt_ctime DESC", z); |
| 447 | while( db_step(&q)==SQLITE_ROW ){ |
| 448 | int rid = db_column_int(&q, 0); |
| 449 | const char *zUuid = db_column_text(&q, 1); |
| 450 | const char *zTitle = db_column_text(&q, 2); |
| 451 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| @@ -452,10 +453,26 @@ | |
| 452 | @ %s(zUuid)</a> - |
| 453 | @ <ul></ul> |
| 454 | @ Ticket |
| 455 | hyperlink_to_uuid(zUuid); |
| 456 | @ - %s(zTitle). |
| 457 | @ <ul><li> |
| 458 | object_description(rid, 0, 0); |
| 459 | @ </li></ul> |
| 460 | @ </p></li> |
| 461 | } |
| 462 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -436,16 +436,17 @@ | |
| 436 | @ %s(zUuid)</a> - |
| 437 | object_description(rid, 0, 0); |
| 438 | @ </p></li> |
| 439 | } |
| 440 | db_finalize(&q); |
| 441 | db_prepare(&q, |
| 442 | " SELECT tkt_rid, tkt_uuid, title" |
| 443 | " FROM ticket, ticketchng" |
| 444 | " WHERE ticket.tkt_id = ticketchng.tkt_id" |
| 445 | " AND tkt_uuid GLOB '%q*'" |
| 446 | " GROUP BY tkt_uuid" |
| 447 | " ORDER BY tkt_ctime DESC", z); |
| 448 | while( db_step(&q)==SQLITE_ROW ){ |
| 449 | int rid = db_column_int(&q, 0); |
| 450 | const char *zUuid = db_column_text(&q, 1); |
| 451 | const char *zTitle = db_column_text(&q, 2); |
| 452 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| @@ -452,10 +453,26 @@ | |
| 453 | @ %s(zUuid)</a> - |
| 454 | @ <ul></ul> |
| 455 | @ Ticket |
| 456 | hyperlink_to_uuid(zUuid); |
| 457 | @ - %s(zTitle). |
| 458 | @ <ul><li> |
| 459 | object_description(rid, 0, 0); |
| 460 | @ </li></ul> |
| 461 | @ </p></li> |
| 462 | } |
| 463 | db_finalize(&q); |
| 464 | db_prepare(&q, |
| 465 | "SELECT rid, uuid FROM" |
| 466 | " (SELECT tagxref.rid AS rid, substr(tagname, 7) AS uuid" |
| 467 | " FROM tagxref, tag WHERE tagxref.tagid = tag.tagid" |
| 468 | " AND tagname GLOB 'event-%q*') GROUP BY uuid", z); |
| 469 | while( db_step(&q)==SQLITE_ROW ){ |
| 470 | int rid = db_column_int(&q, 0); |
| 471 | const char* zUuid = db_column_text(&q, 1); |
| 472 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| 473 | @ %s(zUuid)</a> - |
| 474 | @ <ul><li> |
| 475 | object_description(rid, 0, 0); |
| 476 | @ </li></ul> |
| 477 | @ </p></li> |
| 478 | } |
| 479 |