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

shared,gui: SearchResult: remove page vector

Bladeren bron 
Since the previous commit we don't group the results
anymore, making the vector redundant
This commit is contained in:
Albert S. 2022-08-24 00:00:09 +02:00
bovenliggende eef0fae137
commit 10d61acbd0
3 gewijzigde bestanden met toevoegingen van 6 en 18 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

8
gui/mainwindow.cpp
Bestand weergeven

@ -944,12 +944,8 @@ void MainWindow::makePreviews(int page)
}
RenderTarget renderTarget;
renderTarget.path = sr.fileData.absPath;
for(unsigned int pagenum : sr.pages)
{
renderTarget.page = (int)pagenum;
targets.append(renderTarget);
}
renderTarget.page = (int)sr.page;
targets.append(renderTarget);
}
int numpages = ceil(static_cast<double>(targets.size()) / previewsPerPage);
ui->spinPreviewPage->setMaximum(numpages);

2
shared/searchresult.h
Bestand weergeven

@ -6,7 +6,7 @@ class SearchResult
{
public:
FileData fileData;
QVector<unsigned int> pages;
unsigned int page;
bool wasContentSearch = false;
};

14
shared/sqlitesearch.cpp
Bestand weergeven

@ -194,7 +194,7 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
sortSql = "ORDER BY rank";
}
}
prepSql = "SELECT file.path AS path, content.page AS pages, file.mtime AS mtime, file.size AS size, "
prepSql = "SELECT file.path AS path, content.page AS page, file.mtime AS mtime, file.size AS size, "
"file.filetype AS filetype FROM file INNER JOIN content ON file.id = content.fileid " +
joinSql + " WHERE 1=1 AND " + whereSql + " " + sortSql;
}
@ -204,7 +204,7 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
{
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 "
prepSql = "SELECT file.path AS path, '0' as page, file.mtime AS mtime, file.size AS size, file.filetype AS "
"filetype FROM file WHERE 1=1 AND " +
whereSql + " " + sortSql;
}
@ -247,15 +247,7 @@ QVector<SearchResult> SqliteSearch::search(const LooqsQuery &query)
result.fileData.mtime = dbQuery.value("mtime").toUInt();
result.fileData.size = dbQuery.value("size").toUInt();
result.fileData.filetype = dbQuery.value("filetype").toChar();
QString pages = dbQuery.value("pages").toString();
QStringList pagesList = pages.split(",");
for(QString &page : pagesList)
{
if(page != "")
{
result.pages.append(page.toUInt());
}
}
result.page = dbQuery.value("page").toUInt();
result.wasContentSearch = contentSearch;
results.append(result);
}