saberbud/zeal
1
0
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2026-08-29 08:34:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

registry: Fix search for queries containing separators (fixes #650)

Browse Source
This commit is contained in:
Oleg Shparber
2016-12-21 01:31:53 -05:00
parent 7e4e95644a
commit 8de33d1abe
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/registry/docset.cpp
+13 -11
View File
@@ -252,10 +252,7 @@ QList<SearchResult> Docset::search(const QString &query, const CancellationToken
{
// Make it safe to use in a SQL query.
QString sanitizedQuery = query;
sanitizedQuery.replace(QLatin1String("\\"), QLatin1String("\\\\"));
sanitizedQuery.replace(QLatin1String("_"), QLatin1String("\\_"));
sanitizedQuery.replace(QLatin1String("%"), QLatin1String("\\%"));
sanitizedQuery.replace(QLatin1String("'"), QLatin1String("''"));
sanitizedQuery.replace(QLatin1Char('\''), QLatin1String("''"));
QString queryStr;
if (m_type == Docset::Type::Dash) {
@@ -758,21 +755,26 @@ static void scoreFunc(sqlite3_context *context, int argc, sqlite3_value **argv)
++needleLen;
QScopedArrayPointer<unsigned char> needle(new unsigned char[needleLen + 1]);
QScopedArrayPointer<unsigned char> haystack(new unsigned char[haystackLen + 1]);
for (int i = 0; i < needleLen + 1; ++i) {
for (int i = 0, j = 0; i <= needleLen; ++i, ++j) {
unsigned char c = needleOrig[i];
if (c >= 'A' && c <= 'Z')
c += 32;
needle[i] = c;
if ((i > 0 && needleOrig[i - 1] == ':' && c == ':') // C++ (::)
|| c == '/' || c == '_' || c == ' ') { // Go, some Guides
needle[j] = '.';
} else if (c >= 'A' && c <= 'Z') {
needle[j] = c + 32;
} else {
needle[j] = c;
}
}
for (int i = 0, j = 0; i < haystackLen + 1; ++i, ++j) {
for (int i = 0, j = 0; i <= haystackLen; ++i, ++j) {
unsigned char c = haystackOrig[i];
if ((i > 0 && haystackOrig[i - 1] == ':' && c == ':') // C++ (::)
|| c == '/' || c == '_' || c == ' ') { // Go, some Guides
haystack[j] = '.';
} else if (c >= 'A' && c <= 'Z') {
haystack[j] = c + 32;
} else {
if (c >= 'A' && c <= 'Z')
c += 32;
haystack[j] = c;
}
}