search: default sort by mtime and page
Dieser Commit ist enthalten in:
Ursprung
8c027566e3
Commit
c338bb20bd
@ -194,8 +194,8 @@ QPair<QString, QVector<QString>> SqliteSearch::createSql(const SqliteSearch::Tok
|
||||
QSqlQuery SqliteSearch::makeSqlQuery(const QVector<SqliteSearch::Token> &tokens)
|
||||
{
|
||||
QString whereSql;
|
||||
QString sortSql;
|
||||
QString limitSql;
|
||||
QString sortSql;
|
||||
QVector<QString> bindValues;
|
||||
bool isContentSearch = false;
|
||||
for(const Token &c : tokens)
|
||||
@ -223,6 +223,10 @@ QSqlQuery SqliteSearch::makeSqlQuery(const QVector<SqliteSearch::Token> &tokens)
|
||||
QString prepSql;
|
||||
if(isContentSearch)
|
||||
{
|
||||
if(sortSql.isEmpty())
|
||||
{
|
||||
sortSql = "ORDER BY file.mtime DESC, content.page ASC";
|
||||
}
|
||||
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 " +
|
||||
@ -230,6 +234,10 @@ QSqlQuery SqliteSearch::makeSqlQuery(const QVector<SqliteSearch::Token> &tokens)
|
||||
}
|
||||
else
|
||||
{
|
||||
if(sortSql.isEmpty())
|
||||
{
|
||||
sortSql = "ORDER BY file.mtime DESC";
|
||||
}
|
||||
prepSql = "SELECT file.path AS path, '0' as pages, file.mtime AS mtime, file.size AS size, file.filetype AS "
|
||||
"filetype FROM file WHERE 1=1 AND " +
|
||||
whereSql + " " + sortSql;
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren