Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix search result links when the FTS index is not in use. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
7e56e360807f94f5d602fb308b091cdf |
| User & Date: | mistachkin 2015-02-05 01:56:55.603 |
Context
|
2015-02-05
| ||
| 03:39 | Add 'move-files' and 'remove-files' settings to enable moving or removing files when the mv or rm commands are used, respectively. ... (check-in: 21e08f0904 user: mistachkin tags: mvAndRmFiles) | |
| 02:51 | Fix the "Tickets" menu option on "San Francisco Modern" so that it points to /ticket instead of /reportlist. ... (check-in: b2f2f0ce2f user: drh tags: trunk) | |
| 02:01 | Merge trunk fixes into form-submenu. ... (check-in: d867a83545 user: drh tags: form-submenu) | |
| 01:56 | Fix search result links when the FTS index is not in use. ... (check-in: 7e56e36080 user: mistachkin tags: trunk) | |
| 01:16 | Update the Jim Tcl included with autosetup to 0.76. ... (check-in: 31c03de8f4 user: mistachkin tags: trunk) | |
Changes
Changes to src/search.c.
| ︙ | ︙ | |||
609 610 611 612 613 614 615 |
if( zDocGlob && zDocGlob[0] && zDocBr && zDocBr[0] ){
db_multi_exec(
"CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin;"
);
db_multi_exec(
"INSERT INTO x(label,url,score,date,snip)"
" SELECT printf('Document: %%s',foci.filename),"
| | | 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 |
if( zDocGlob && zDocGlob[0] && zDocBr && zDocBr[0] ){
db_multi_exec(
"CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin;"
);
db_multi_exec(
"INSERT INTO x(label,url,score,date,snip)"
" SELECT printf('Document: %%s',foci.filename),"
" printf('/doc/%T/%%s',foci.filename),"
" search_score(),"
" (SELECT datetime(event.mtime) FROM event"
" WHERE objid=symbolic_name_to_rid('trunk')),"
" search_snippet()"
" FROM foci CROSS JOIN blob"
" WHERE checkinID=symbolic_name_to_rid('trunk')"
" AND blob.uuid=foci.uuid"
|
| ︙ | ︙ | |||
634 635 636 637 638 639 640 |
" FROM tag, tagxref"
" WHERE tag.tagname GLOB 'wiki-*'"
" AND tagxref.tagid=tag.tagid"
" GROUP BY 1"
")"
"INSERT INTO x(label,url,score,date,snip)"
" SELECT printf('Wiki: %%s',name),"
| | | | | 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 |
" FROM tag, tagxref"
" WHERE tag.tagname GLOB 'wiki-*'"
" AND tagxref.tagid=tag.tagid"
" GROUP BY 1"
")"
"INSERT INTO x(label,url,score,date,snip)"
" SELECT printf('Wiki: %%s',name),"
" printf('/wiki?name=%%s',urlencode(name)),"
" search_score(),"
" datetime(mtime),"
" search_snippet()"
" FROM wiki"
" WHERE search_match(stext('w',rid,name));"
);
}
if( (srchFlags & SRCH_CKIN)!=0 ){
db_multi_exec(
"WITH ckin(uuid,rid,mtime) AS ("
" SELECT blob.uuid, event.objid, event.mtime"
" FROM event, blob"
" WHERE event.type='ci'"
" AND blob.rid=event.objid"
")"
"INSERT INTO x(label,url,score,date,snip)"
" SELECT printf('Check-in [%%.10s] on %%s',uuid,datetime(mtime)),"
" printf('/timeline?c=%%s&n=8&y=ci',uuid),"
" search_score(),"
" datetime(mtime),"
" search_snippet()"
" FROM ckin"
" WHERE search_match(stext('c',rid,NULL));"
);
}
if( (srchFlags & SRCH_TKT)!=0 ){
db_multi_exec(
"INSERT INTO x(label,url,score, date,snip)"
" SELECT printf('Ticket [%%.17s] on %%s',"
"tkt_uuid,datetime(tkt_mtime)),"
" printf('/tktview/%%.20s',tkt_uuid),"
" search_score(),"
" datetime(tkt_mtime),"
" search_snippet()"
" FROM ticket"
" WHERE search_match(stext('t',tkt_id,NULL));"
);
}
|
| ︙ | ︙ |