crtxcr/looqs
1
0
Vork 0
Code Kwesties Pull-aanvragen 1 Publicaties Wiki Activiteit

search: fixed: order by after group by in content search

Bladeren bron
This commit is contained in:
Albert S. 2019-04-27 21:23:06 +02:00
bovenliggende 7df1ddf891
commit 6f92b9ff5a
1 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

5
shared/sqlitesearch.cpp
Bestand weergeven

@ -104,7 +104,7 @@ QString SqliteSearch::createSortSql(const SqliteSearch::Token &token)
// sort:(mtime desc, page asc)
if(token.key == "sort")
{
QString sortsql = " ORDER BY ";
QString sortsql;
QStringList splitted_inner = token.value.split(",");
for(int i = 0; i < splitted_inner.length(); i++)
{
@ -230,7 +230,7 @@ QSqlQuery SqliteSearch::makeSqlQuery(const QVector<SqliteSearch::Token> &tokens)
prepSql =
"SELECT file.path AS path, group_concat(content.page) AS pages, file.mtime AS mtime, file.size AS size, "
"file.filetype AS filetype FROM file INNER JOIN content ON file.id = content.fileid WHERE 1=1 AND " +
whereSql + " " + sortSql + " GROUP BY file.path";
whereSql + " GROUP BY file.path " + sortSql;
}
else
{
@ -265,6 +265,7 @@ QVector<SearchResult> SqliteSearch::search(const QString &query)
{
qDebug() << dbQuery.lastError();
qDebug() << dbQuery.executedQuery();
throw QSSGeneralException("SQL Error: " + dbQuery.lastError().text());
}