Index: src/search.c
==================================================================
--- src/search.c
+++ src/search.c
@@ -792,32 +792,35 @@
){
search_init(zPattern, "", "", " ... ",
SRCHFLG_STATIC|SRCHFLG_HTML);
if( (srchFlags & SRCH_DOC)!=0 ){
char *zDocGlob = db_get("doc-glob","");
- char *zDocBr = db_get("doc-branch","trunk");
- if( zDocGlob && zDocGlob[0] && zDocBr && zDocBr[0] ){
+ char *zDocBranches = db_get("doc-branch","trunk");
+ char *zDocBr = NULL;
+ if( zDocGlob && zDocGlob[0] && zDocBranches && zDocBranches[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,id,date,snip)"
- " SELECT printf('Document: %%s',title('d',blob.rid,foci.filename)),"
- " printf('/doc/%T/%%s',foci.filename),"
- " search_score(),"
- " 'd'||blob.rid,"
- " (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"
- " AND search_match(title('d',blob.rid,foci.filename),"
- " body('d',blob.rid,foci.filename))"
- " AND %z",
- zDocBr, glob_expr("foci.filename", zDocGlob)
- );
+ while ((zDocBr = strsep(&zDocBranches, ",")) != NULL) {
+ db_multi_exec(
+ "INSERT INTO x(label,url,score,id,date,snip)"
+ " SELECT printf('Document: %%s',title('d',blob.rid,foci.filename)),"
+ " printf('/doc/%T/%%s',foci.filename),"
+ " search_score(),"
+ " 'd'||blob.rid,"
+ " (SELECT datetime(event.mtime) FROM event"
+ " WHERE objid=symbolic_name_to_rid('%T')),"
+ " search_snippet()"
+ " FROM foci CROSS JOIN blob"
+ " WHERE checkinID=symbolic_name_to_rid('%T')"
+ " AND blob.uuid=foci.uuid"
+ " AND search_match(title('d',blob.rid,foci.filename),"
+ " body('d',blob.rid,foci.filename))"
+ " AND %z",
+ zDocBr, zDocBr, zDocBr, glob_expr("foci.filename", zDocGlob)
+ );
+ }
}
}
if( (srchFlags & SRCH_WIKI)!=0 ){
db_multi_exec(
"WITH wiki(name,rid,mtime) AS ("
@@ -1878,59 +1881,63 @@
** and if the latest check-in on doc-br is in the unindexed set of
** check-ins, then update all 'd' entries in FTSDOCS that have
** changed.
*/
static void search_update_doc_index(void){
- const char *zDocBr = db_get("doc-branch","trunk");
- int ckid = zDocBr ? symbolic_name_to_rid(zDocBr,"ci") : 0;
- double rTime;
- if( ckid==0 ) return;
- if( !db_exists("SELECT 1 FROM ftsdocs WHERE type='c' AND rid=%d"
- " AND NOT idxed", ckid) ) return;
-
- /* If we get this far, it means that changes to 'd' entries are
- ** required. */
- rTime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", ckid);
+ char *zDocBranches = db_get("doc-branch","trunk");
+ char *zDocBr = NULL;
db_multi_exec(
"CREATE TEMP TABLE current_docs(rid INTEGER PRIMARY KEY, name);"
"CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin;"
- "INSERT OR IGNORE INTO current_docs(rid, name)"
- " SELECT blob.rid, foci.filename FROM foci, blob"
- " WHERE foci.checkinID=%d AND blob.uuid=foci.uuid"
- " AND %z",
- ckid, glob_expr("foci.filename", db_get("doc-glob",""))
- );
- db_multi_exec(
- "DELETE FROM ftsidx WHERE rowid IN"
- " (SELECT rowid FROM ftsdocs WHERE type='d'"
- " AND rid NOT IN (SELECT rid FROM current_docs))"
- );
- db_multi_exec(
- "DELETE FROM ftsdocs WHERE type='d'"
- " AND rid NOT IN (SELECT rid FROM current_docs)"
- );
- db_multi_exec(
- "INSERT OR IGNORE INTO ftsdocs(type,rid,name,idxed,label,bx,url,mtime)"
- " SELECT 'd', rid, name, 0,"
- " title('d',rid,name),"
- " body('d',rid,name),"
- " printf('/doc/%T/%%s',urlencode(name)),"
- " %.17g"
- " FROM current_docs",
- zDocBr, rTime
- );
- db_multi_exec(
- "INSERT INTO ftsidx(rowid,title,body)"
- " SELECT rowid, label, bx FROM ftsdocs WHERE type='d' AND NOT idxed"
- );
- db_multi_exec(
- "UPDATE ftsdocs SET"
- " idxed=1,"
- " bx=NULL,"
- " label='Document: '||label"
- " WHERE type='d' AND NOT idxed"
- );
+ );
+ while ((zDocBr = strsep(&zDocBranches, ",")) != NULL) {
+ int ckid = symbolic_name_to_rid(zDocBr,"ci");
+ double rTime;
+ if( !db_exists("SELECT 1 FROM ftsdocs WHERE type='c' AND rid=%d"
+ " AND NOT idxed", ckid) ) continue;
+
+ /* If we get this far, it means that changes to 'd' entries are
+ ** required. */
+ rTime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", ckid);
+ db_multi_exec(
+ "INSERT OR IGNORE INTO current_docs(rid, name)"
+ " SELECT blob.rid, foci.filename FROM foci, blob"
+ " WHERE foci.checkinID=%d AND blob.uuid=foci.uuid"
+ " AND %z",
+ ckid, glob_expr("foci.filename", db_get("doc-glob",""))
+ );
+ db_multi_exec(
+ "DELETE FROM ftsidx WHERE rowid IN"
+ " (SELECT rowid FROM ftsdocs WHERE type='d'"
+ " AND rid NOT IN (SELECT rid FROM current_docs))"
+ );
+ db_multi_exec(
+ "DELETE FROM ftsdocs WHERE type='d'"
+ " AND rid NOT IN (SELECT rid FROM current_docs)"
+ );
+ db_multi_exec(
+ "INSERT OR IGNORE INTO ftsdocs(type,rid,name,idxed,label,bx,url,mtime)"
+ " SELECT 'd', rid, name, 0,"
+ " title('d',rid,name),"
+ " body('d',rid,name),"
+ " printf('/doc/%T/%%s',urlencode(name)),"
+ " %.17g"
+ " FROM current_docs",
+ zDocBr, rTime
+ );
+ db_multi_exec(
+ "INSERT INTO ftsidx(rowid,title,body)"
+ " SELECT rowid, label, bx FROM ftsdocs WHERE type='d' AND NOT idxed"
+ );
+ db_multi_exec(
+ "UPDATE ftsdocs SET"
+ " idxed=1,"
+ " bx=NULL,"
+ " label='Document: '||label"
+ " WHERE type='d' AND NOT idxed"
+ );
+ }
}
/*
** Deal with all of the unindexed 'c' terms in FTSDOCS
*/
Index: src/setup.c
==================================================================
--- src/setup.c
+++ src/setup.c
@@ -2191,10 +2191,11 @@
@
entry_attribute("Document Branch", 20, "doc-branch", "db", "trunk", 0);
@ When searching documents, use the versions of the files found at the
@ type of the "Document Branch" branch. Recommended value: "trunk".
@ Document search is disabled if blank.
+ @ Comma-separate multiple branches: "trunk,docs".
@
onoff_attribute("Search Check-in Comments", "search-ci", "sc", 0, 0);
@
onoff_attribute("Search Documents", "search-doc", "sd", 0, 0);
@