Fossil SCM

Fix search result links when the FTS index is not in use.

mistachkin 2015-02-05 01:56 trunk
Commit 7e56e360807f94f5d602fb308b091cdf222101b0
Parent 31c03de8f4259c8…
1 file changed +4 -4
~ src/search.c
M src/search.c
+4 -4
--- src/search.c
+++ src/search.c
@@ -611,11 +611,11 @@
611611
 "CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin;"
612612
 );
613613
 db_multi_exec(
614614
 "INSERT INTO x(label,url,score,date,snip)"
615615
 " SELECT printf('Document: %%s',foci.filename),"
616
- " printf('%R/doc/%T/%%s',foci.filename),"
616
+ " printf('/doc/%T/%%s',foci.filename),"
617617
 " search_score(),"
618618
 " (SELECT datetime(event.mtime) FROM event"
619619
 " WHERE objid=symbolic_name_to_rid('trunk')),"
620620
 " search_snippet()"
621621
 " FROM foci CROSS JOIN blob"
@@ -636,11 +636,11 @@
636636
 " AND tagxref.tagid=tag.tagid"
637637
 " GROUP BY 1"
638638
 ")"
639639
 "INSERT INTO x(label,url,score,date,snip)"
640640
 " SELECT printf('Wiki: %%s',name),"
641
- " printf('%R/wiki?name=%%s',urlencode(name)),"
641
+ " printf('/wiki?name=%%s',urlencode(name)),"
642642
 " search_score(),"
643643
 " datetime(mtime),"
644644
 " search_snippet()"
645645
 " FROM wiki"
646646
 " WHERE search_match(stext('w',rid,name));"
@@ -654,11 +654,11 @@
654654
 " WHERE event.type='ci'"
655655
 " AND blob.rid=event.objid"
656656
 ")"
657657
 "INSERT INTO x(label,url,score,date,snip)"
658658
 " SELECT printf('Check-in [%%.10s] on %%s',uuid,datetime(mtime)),"
659
- " printf('%R/timeline?c=%%s&n=8&y=ci',uuid),"
659
+ " printf('/timeline?c=%%s&n=8&y=ci',uuid),"
660660
 " search_score(),"
661661
 " datetime(mtime),"
662662
 " search_snippet()"
663663
 " FROM ckin"
664664
 " WHERE search_match(stext('c',rid,NULL));"
@@ -667,11 +667,11 @@
667667
 if( (srchFlags & SRCH_TKT)!=0 ){
668668
 db_multi_exec(
669669
 "INSERT INTO x(label,url,score, date,snip)"
670670
 " SELECT printf('Ticket [%%.17s] on %%s',"
671671
 "tkt_uuid,datetime(tkt_mtime)),"
672
- " printf('%R/tktview/%%.20s',tkt_uuid),"
672
+ " printf('/tktview/%%.20s',tkt_uuid),"
673673
 " search_score(),"
674674
 " datetime(tkt_mtime),"
675675
 " search_snippet()"
676676
 " FROM ticket"
677677
 " WHERE search_match(stext('t',tkt_id,NULL));"
678678
--- src/search.c
+++ src/search.c
@@ -611,11 +611,11 @@
611 "CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin;"
612 );
613 db_multi_exec(
614 "INSERT INTO x(label,url,score,date,snip)"
615 " SELECT printf('Document: %%s',foci.filename),"
616 " printf('%R/doc/%T/%%s',foci.filename),"
617 " search_score(),"
618 " (SELECT datetime(event.mtime) FROM event"
619 " WHERE objid=symbolic_name_to_rid('trunk')),"
620 " search_snippet()"
621 " FROM foci CROSS JOIN blob"
@@ -636,11 +636,11 @@
636 " AND tagxref.tagid=tag.tagid"
637 " GROUP BY 1"
638 ")"
639 "INSERT INTO x(label,url,score,date,snip)"
640 " SELECT printf('Wiki: %%s',name),"
641 " printf('%R/wiki?name=%%s',urlencode(name)),"
642 " search_score(),"
643 " datetime(mtime),"
644 " search_snippet()"
645 " FROM wiki"
646 " WHERE search_match(stext('w',rid,name));"
@@ -654,11 +654,11 @@
654 " WHERE event.type='ci'"
655 " AND blob.rid=event.objid"
656 ")"
657 "INSERT INTO x(label,url,score,date,snip)"
658 " SELECT printf('Check-in [%%.10s] on %%s',uuid,datetime(mtime)),"
659 " printf('%R/timeline?c=%%s&n=8&y=ci',uuid),"
660 " search_score(),"
661 " datetime(mtime),"
662 " search_snippet()"
663 " FROM ckin"
664 " WHERE search_match(stext('c',rid,NULL));"
@@ -667,11 +667,11 @@
667 if( (srchFlags & SRCH_TKT)!=0 ){
668 db_multi_exec(
669 "INSERT INTO x(label,url,score, date,snip)"
670 " SELECT printf('Ticket [%%.17s] on %%s',"
671 "tkt_uuid,datetime(tkt_mtime)),"
672 " printf('%R/tktview/%%.20s',tkt_uuid),"
673 " search_score(),"
674 " datetime(tkt_mtime),"
675 " search_snippet()"
676 " FROM ticket"
677 " WHERE search_match(stext('t',tkt_id,NULL));"
678
--- src/search.c
+++ src/search.c
@@ -611,11 +611,11 @@
611 "CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin;"
612 );
613 db_multi_exec(
614 "INSERT INTO x(label,url,score,date,snip)"
615 " SELECT printf('Document: %%s',foci.filename),"
616 " printf('/doc/%T/%%s',foci.filename),"
617 " search_score(),"
618 " (SELECT datetime(event.mtime) FROM event"
619 " WHERE objid=symbolic_name_to_rid('trunk')),"
620 " search_snippet()"
621 " FROM foci CROSS JOIN blob"
@@ -636,11 +636,11 @@
636 " AND tagxref.tagid=tag.tagid"
637 " GROUP BY 1"
638 ")"
639 "INSERT INTO x(label,url,score,date,snip)"
640 " SELECT printf('Wiki: %%s',name),"
641 " printf('/wiki?name=%%s',urlencode(name)),"
642 " search_score(),"
643 " datetime(mtime),"
644 " search_snippet()"
645 " FROM wiki"
646 " WHERE search_match(stext('w',rid,name));"
@@ -654,11 +654,11 @@
654 " WHERE event.type='ci'"
655 " AND blob.rid=event.objid"
656 ")"
657 "INSERT INTO x(label,url,score,date,snip)"
658 " SELECT printf('Check-in [%%.10s] on %%s',uuid,datetime(mtime)),"
659 " printf('/timeline?c=%%s&n=8&y=ci',uuid),"
660 " search_score(),"
661 " datetime(mtime),"
662 " search_snippet()"
663 " FROM ckin"
664 " WHERE search_match(stext('c',rid,NULL));"
@@ -667,11 +667,11 @@
667 if( (srchFlags & SRCH_TKT)!=0 ){
668 db_multi_exec(
669 "INSERT INTO x(label,url,score, date,snip)"
670 " SELECT printf('Ticket [%%.17s] on %%s',"
671 "tkt_uuid,datetime(tkt_mtime)),"
672 " printf('/tktview/%%.20s',tkt_uuid),"
673 " search_score(),"
674 " datetime(tkt_mtime),"
675 " search_snippet()"
676 " FROM ticket"
677 " WHERE search_match(stext('t',tkt_id,NULL));"
678

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button