Fossil SCM
Enable "fossil whatis" to actually find a wiki page when given --type w.
Commit
7627d4a73e2e726dc13e81bbaccccc70f17d19b488e0f887433563e32ec2652e
Parent
d85b2edbb6917c8…
1 file changed
+7
-2
+7
-2
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -182,10 +182,11 @@ | ||
| 182 | 182 | int i; |
| 183 | 183 | int startOfBranch = 0; |
| 184 | 184 | const char *zXTag; /* zTag with optional [...] removed */ |
| 185 | 185 | int nXTag; /* Size of zXTag */ |
| 186 | 186 | const char *zDate; /* Expanded date-time string */ |
| 187 | + const char *zTagPrefix = "sym"; | |
| 187 | 188 | |
| 188 | 189 | if( zType==0 || zType[0]==0 ){ |
| 189 | 190 | zType = "*"; |
| 190 | 191 | }else if( zType[0]=='b' ){ |
| 191 | 192 | zType = "ci"; |
| @@ -339,20 +340,24 @@ | ||
| 339 | 340 | } |
| 340 | 341 | db_finalize(&q); |
| 341 | 342 | if( rid ) return rid; |
| 342 | 343 | } |
| 343 | 344 | |
| 345 | + if( zType[0]=='w' ){ | |
| 346 | + zTagPrefix = "wiki"; | |
| 347 | + } | |
| 344 | 348 | /* Symbolic name */ |
| 345 | 349 | rid = db_int(0, |
| 346 | 350 | "SELECT event.objid, max(event.mtime)" |
| 347 | 351 | " FROM tag, tagxref, event" |
| 348 | - " WHERE tag.tagname='sym-%q' " | |
| 352 | + " WHERE tag.tagname='%q-%q' " | |
| 349 | 353 | " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 " |
| 350 | 354 | " AND event.objid=tagxref.rid " |
| 351 | 355 | " AND event.type GLOB '%q'", |
| 352 | - zTag, zType | |
| 356 | + zTagPrefix, zTag, zType | |
| 353 | 357 | ); |
| 358 | + | |
| 354 | 359 | if( rid>0 ){ |
| 355 | 360 | if( startOfBranch ) rid = start_of_branch(rid,1); |
| 356 | 361 | return rid; |
| 357 | 362 | } |
| 358 | 363 | |
| 359 | 364 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -182,10 +182,11 @@ | |
| 182 | int i; |
| 183 | int startOfBranch = 0; |
| 184 | const char *zXTag; /* zTag with optional [...] removed */ |
| 185 | int nXTag; /* Size of zXTag */ |
| 186 | const char *zDate; /* Expanded date-time string */ |
| 187 | |
| 188 | if( zType==0 || zType[0]==0 ){ |
| 189 | zType = "*"; |
| 190 | }else if( zType[0]=='b' ){ |
| 191 | zType = "ci"; |
| @@ -339,20 +340,24 @@ | |
| 339 | } |
| 340 | db_finalize(&q); |
| 341 | if( rid ) return rid; |
| 342 | } |
| 343 | |
| 344 | /* Symbolic name */ |
| 345 | rid = db_int(0, |
| 346 | "SELECT event.objid, max(event.mtime)" |
| 347 | " FROM tag, tagxref, event" |
| 348 | " WHERE tag.tagname='sym-%q' " |
| 349 | " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 " |
| 350 | " AND event.objid=tagxref.rid " |
| 351 | " AND event.type GLOB '%q'", |
| 352 | zTag, zType |
| 353 | ); |
| 354 | if( rid>0 ){ |
| 355 | if( startOfBranch ) rid = start_of_branch(rid,1); |
| 356 | return rid; |
| 357 | } |
| 358 | |
| 359 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -182,10 +182,11 @@ | |
| 182 | int i; |
| 183 | int startOfBranch = 0; |
| 184 | const char *zXTag; /* zTag with optional [...] removed */ |
| 185 | int nXTag; /* Size of zXTag */ |
| 186 | const char *zDate; /* Expanded date-time string */ |
| 187 | const char *zTagPrefix = "sym"; |
| 188 | |
| 189 | if( zType==0 || zType[0]==0 ){ |
| 190 | zType = "*"; |
| 191 | }else if( zType[0]=='b' ){ |
| 192 | zType = "ci"; |
| @@ -339,20 +340,24 @@ | |
| 340 | } |
| 341 | db_finalize(&q); |
| 342 | if( rid ) return rid; |
| 343 | } |
| 344 | |
| 345 | if( zType[0]=='w' ){ |
| 346 | zTagPrefix = "wiki"; |
| 347 | } |
| 348 | /* Symbolic name */ |
| 349 | rid = db_int(0, |
| 350 | "SELECT event.objid, max(event.mtime)" |
| 351 | " FROM tag, tagxref, event" |
| 352 | " WHERE tag.tagname='%q-%q' " |
| 353 | " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 " |
| 354 | " AND event.objid=tagxref.rid " |
| 355 | " AND event.type GLOB '%q'", |
| 356 | zTagPrefix, zTag, zType |
| 357 | ); |
| 358 | |
| 359 | if( rid>0 ){ |
| 360 | if( startOfBranch ) rid = start_of_branch(rid,1); |
| 361 | return rid; |
| 362 | } |
| 363 | |
| 364 |