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

Windows: term prefixes: work around the fact that we forgot to lowercase the drive names

Browse Source
This commit is contained in:
Jean-Francois Dockes 2021-04-28 07:16:32 +01:00
parent 7a2428fb39
commit d76e279492
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/rcldb/rcldb.h
View File

@ -134,19 +134,24 @@ inline bool has_prefix(const string& trm)
inline string strip_prefix(const string& trm) inline string strip_prefix(const string& trm)
{ {
if (trm.empty()) if (!has_prefix(trm))
return trm; return trm;
string::size_type st = 0; string::size_type st = 0;
if (o_index_stripchars) { if (o_index_stripchars) {
st = trm.find_first_not_of("ABCDEFIJKLMNOPQRSTUVWXYZ"); st = trm.find_first_not_of("ABCDEFIJKLMNOPQRSTUVWXYZ");
if (st == string::npos) #ifdef _WIN32
return string(); // We have a problem there because we forgot to lowercase the drive
} else { // name. So if the found character is a colon consider the drive name as
if (has_prefix(trm)) { // the first non capital even if it is uppercase
st = trm.find_last_of(":") + 1; if (st != string::npos && st >= 2 && trm[st] == ':') {
} else { st -= 1;
return trm;
} }
#endif
} else {
st = trm.find_first_of(":", 1) + 1;
}
if (st == string::npos) {
return string(); // ??
} }
return trm.substr(st); return trm.substr(st);
} }
@ -154,13 +159,27 @@ inline string strip_prefix(const string& trm)
inline string get_prefix(const string& trm) inline string get_prefix(const string& trm)
{ {
if (!has_prefix(trm)) if (!has_prefix(trm))
return trm; return string();
string::size_type st = 0; string::size_type st = 0;
if (o_index_stripchars) { if (o_index_stripchars) {
st = trm.find_first_not_of("ABCDEFIJKLMNOPQRSTUVWXYZ"); st = trm.find_first_not_of("ABCDEFIJKLMNOPQRSTUVWXYZ");
if (st == string::npos) {
return string(); // ??
}
#ifdef _WIN32
// We have a problem there because we forgot to lowercase the drive
// name. So if the found character is a colon consider the drive name as
// the first non capital even if it is uppercase
if (st >= 2 && trm[st] == ':') {
st -= 1;
}
#endif
return trm.substr(0, st); return trm.substr(0, st);
} else { } else {
st = trm.find_last_of(":") + 1; st = trm.find_first_of(":", 1) + 1;
if (st == string::npos) {
return string(); // ??
}
return trm.substr(1, st-2); return trm.substr(1, st-2);
} }
} }