tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix to previous abstract fix

Browse Source
This commit is contained in:
dockes 2008-12-17 16:20:06 +00:00
parent c13c07bc86
commit a4dda86ed9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rcldb/rcldb.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.153 2008-12-17 14:26:49 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.154 2008-12-17 16:19:58 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -200,7 +200,7 @@ static list<string> noPrefixList(const list<string>& in)
return out; return out;
} }
//#define DEBUGABSTRACT //#define DEBUGABSTRACT 1
#ifdef DEBUGABSTRACT #ifdef DEBUGABSTRACT
#define LOGABS LOGDEB #define LOGABS LOGDEB
#else #else
@ -362,16 +362,19 @@ string Db::Native::makeAbstract(Xapian::docid docid, Query *query)
ii < (unsigned int)ipos + qtrmwrdcnt) { ii < (unsigned int)ipos + qtrmwrdcnt) {
sparseDoc[ii] = occupiedmarker; sparseDoc[ii] = occupiedmarker;
} else if (!sparseDoc[ii].compare(ellipsis)) { } else if (!sparseDoc[ii].compare(ellipsis)) {
// For an empty, slot, the test has a side // For an empty slot, the test has a side
// effect of inserting an empty string which // effect of inserting an empty string which
// is what we want // is what we want
sparseDoc[ii] = emptys; sparseDoc[ii] = emptys;
} }
} }
// Add ... at the end. This may be replaced later by // Add ... at the end. This may be replaced later by
// an overlapping extract // an overlapping extract. Take care not to replace an
if (sparseDoc[sto+1].empty()) // empty string here, we really want an empty slot,
// use find()
if (sparseDoc.find(sto+1) == sparseDoc.end()) {
sparseDoc[sto+1] = ellipsis; sparseDoc[sto+1] = ellipsis;
}
// Limit to allocated occurences and total size // Limit to allocated occurences and total size
if (++occurrences >= maxoccs || if (++occurrences >= maxoccs ||