Fossil SCM
Always include nodes identified by sel1= and sel2= query parameters in the /timeline display.
Commit
f7af223e1a661a511f90120ffa171dd32eecc9c0396ae1c42b7ed9001da1bbc3
Parent
9b041508850d959…
1 file changed
+6
+6
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -2194,10 +2194,12 @@ | ||
| 2194 | 2194 | ); |
| 2195 | 2195 | } |
| 2196 | 2196 | db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related"); |
| 2197 | 2197 | } |
| 2198 | 2198 | add_extra_rids("pathnode",P("x")); |
| 2199 | + add_extra_rids("pathnode",P("sel1")); | |
| 2200 | + add_extra_rids("pathnode",P("sel2")); | |
| 2199 | 2201 | blob_append_sql(&sql, " AND event.objid IN pathnode"); |
| 2200 | 2202 | if( zChng ){ |
| 2201 | 2203 | db_multi_exec( |
| 2202 | 2204 | "DELETE FROM pathnode\n" |
| 2203 | 2205 | " WHERE NOT EXISTS(SELECT 1 FROM mlink, filename\n" |
| @@ -2268,10 +2270,12 @@ | ||
| 2268 | 2270 | } |
| 2269 | 2271 | db_multi_exec( |
| 2270 | 2272 | "CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)" |
| 2271 | 2273 | ); |
| 2272 | 2274 | add_extra_rids("ok", P("x")); |
| 2275 | + add_extra_rids("ok", P("sel1")); | |
| 2276 | + add_extra_rids("ok", P("sel2")); | |
| 2273 | 2277 | blob_append_sql(&sql, " AND event.objid IN ok"); |
| 2274 | 2278 | nd = 0; |
| 2275 | 2279 | if( d_rid ){ |
| 2276 | 2280 | double rStopTime = 9e99; |
| 2277 | 2281 | zFwdTo = P("ft"); |
| @@ -2760,10 +2764,12 @@ | ||
| 2760 | 2764 | int ridMark = name_to_rid(zMark); |
| 2761 | 2765 | db_multi_exec( |
| 2762 | 2766 | "INSERT OR IGNORE INTO selected_nodes(rid) VALUES(%d)", ridMark); |
| 2763 | 2767 | } |
| 2764 | 2768 | add_extra_rids("selected_nodes",P("x")); |
| 2769 | + add_extra_rids("selected_nodes",P("sel1")); | |
| 2770 | + add_extra_rids("selected_nodes",P("sel2")); | |
| 2765 | 2771 | if( related==0 ){ |
| 2766 | 2772 | blob_append_sql(&cond, " AND blob.rid IN selected_nodes"); |
| 2767 | 2773 | }else{ |
| 2768 | 2774 | db_multi_exec( |
| 2769 | 2775 | "CREATE TEMP TABLE related_nodes(rid INTEGER PRIMARY KEY);" |
| 2770 | 2776 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2194,10 +2194,12 @@ | |
| 2194 | ); |
| 2195 | } |
| 2196 | db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related"); |
| 2197 | } |
| 2198 | add_extra_rids("pathnode",P("x")); |
| 2199 | blob_append_sql(&sql, " AND event.objid IN pathnode"); |
| 2200 | if( zChng ){ |
| 2201 | db_multi_exec( |
| 2202 | "DELETE FROM pathnode\n" |
| 2203 | " WHERE NOT EXISTS(SELECT 1 FROM mlink, filename\n" |
| @@ -2268,10 +2270,12 @@ | |
| 2268 | } |
| 2269 | db_multi_exec( |
| 2270 | "CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)" |
| 2271 | ); |
| 2272 | add_extra_rids("ok", P("x")); |
| 2273 | blob_append_sql(&sql, " AND event.objid IN ok"); |
| 2274 | nd = 0; |
| 2275 | if( d_rid ){ |
| 2276 | double rStopTime = 9e99; |
| 2277 | zFwdTo = P("ft"); |
| @@ -2760,10 +2764,12 @@ | |
| 2760 | int ridMark = name_to_rid(zMark); |
| 2761 | db_multi_exec( |
| 2762 | "INSERT OR IGNORE INTO selected_nodes(rid) VALUES(%d)", ridMark); |
| 2763 | } |
| 2764 | add_extra_rids("selected_nodes",P("x")); |
| 2765 | if( related==0 ){ |
| 2766 | blob_append_sql(&cond, " AND blob.rid IN selected_nodes"); |
| 2767 | }else{ |
| 2768 | db_multi_exec( |
| 2769 | "CREATE TEMP TABLE related_nodes(rid INTEGER PRIMARY KEY);" |
| 2770 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2194,10 +2194,12 @@ | |
| 2194 | ); |
| 2195 | } |
| 2196 | db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related"); |
| 2197 | } |
| 2198 | add_extra_rids("pathnode",P("x")); |
| 2199 | add_extra_rids("pathnode",P("sel1")); |
| 2200 | add_extra_rids("pathnode",P("sel2")); |
| 2201 | blob_append_sql(&sql, " AND event.objid IN pathnode"); |
| 2202 | if( zChng ){ |
| 2203 | db_multi_exec( |
| 2204 | "DELETE FROM pathnode\n" |
| 2205 | " WHERE NOT EXISTS(SELECT 1 FROM mlink, filename\n" |
| @@ -2268,10 +2270,12 @@ | |
| 2270 | } |
| 2271 | db_multi_exec( |
| 2272 | "CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)" |
| 2273 | ); |
| 2274 | add_extra_rids("ok", P("x")); |
| 2275 | add_extra_rids("ok", P("sel1")); |
| 2276 | add_extra_rids("ok", P("sel2")); |
| 2277 | blob_append_sql(&sql, " AND event.objid IN ok"); |
| 2278 | nd = 0; |
| 2279 | if( d_rid ){ |
| 2280 | double rStopTime = 9e99; |
| 2281 | zFwdTo = P("ft"); |
| @@ -2760,10 +2764,12 @@ | |
| 2764 | int ridMark = name_to_rid(zMark); |
| 2765 | db_multi_exec( |
| 2766 | "INSERT OR IGNORE INTO selected_nodes(rid) VALUES(%d)", ridMark); |
| 2767 | } |
| 2768 | add_extra_rids("selected_nodes",P("x")); |
| 2769 | add_extra_rids("selected_nodes",P("sel1")); |
| 2770 | add_extra_rids("selected_nodes",P("sel2")); |
| 2771 | if( related==0 ){ |
| 2772 | blob_append_sql(&cond, " AND blob.rid IN selected_nodes"); |
| 2773 | }else{ |
| 2774 | db_multi_exec( |
| 2775 | "CREATE TEMP TABLE related_nodes(rid INTEGER PRIMARY KEY);" |
| 2776 |