nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Multiple search support and SQL optimization

Browse Source
This commit is contained in:
Dušan Poizl
2022-04-11 20:12:06 +02:00
parent c51be18d28
commit e5cd25cc77
3 changed files with 66 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database.cpp
+2 -1
View File
@@ -30,7 +30,8 @@ bool Database::init()
m_database.exec("CREATE TABLE IF NOT EXISTS fits_files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE, mtime DATETIME)");
m_database.exec("CREATE TABLE IF NOT EXISTS fits_headers (id INTEGER PRIMARY KEY AUTOINCREMENT, id_file INTEGER,"
"key VARCHAR(81), value VARCHAR(81), comment VARCHAR(81), FOREIGN KEY(id_file) REFERENCES fits_files(id) ON DELETE CASCADE)");
m_database.exec("CREATE INDEX IF NOT EXISTS key_value ON fits_headers(key, value)");
m_database.exec("CREATE INDEX IF NOT EXISTS key_value ON fits_headers(key, value)");
m_database.exec("CREATE INDEX IF NOT EXISTS id_file ON fits_headers(id_file)");
QSqlError error = m_database.lastError();
if(error.type() == QSqlError::NoError)
databaseview.cpp
+59 -22
View File
@@ -6,6 +6,7 @@
#include <QHeaderView>
#include <QSqlError>
#include <QDebug>
#include <iostream>
const QStringList DEFAULT_COLUMNS = {"EXPTIME", "OBJECT", "RA", "DEC"};
@@ -57,8 +58,8 @@ void FITSFileModel::sort(int column, Qt::SortOrder order)
m_sort.clear();
else if(column <= m_columns.size())
{
if(column == 0)m_sort = " ORDER BY file ";
else m_sort = QString(" ORDER BY \"%1\" ").arg(m_columns.at(column-1));
if(column == 0)m_sort = " ORDER BY f.file ";
else m_sort = QString(" ORDER BY \"h%1_value\" ").arg(column-1);
m_sort += order == Qt::AscendingOrder ? "ASC" : "DESC";
prepareQuery();
}
@@ -70,31 +71,55 @@ void FITSFileModel::setColumns(const QStringList &columns)
prepareQuery();
}
void FITSFileModel::setFilter(const QString &key, const QString &value)
void FITSFileModel::setFilter(const QStringList &key, const QStringList &value)
{
if(value.isEmpty())
{
m_having.clear();
m_key.clear();
m_value.clear();
}
else
{
if(!m_columns.contains(key) && key != "file")m_columns.append(key);
m_having = QString(" HAVING \"%1\" LIKE \"%2\"").arg(key).arg(value);
m_key = key;
m_value = value;
}
prepareQuery();
}
void FITSFileModel::prepareQuery()
{
QString sql = "SELECT file,";
QString cols;
QString join;
QString where;
QString sql = "SELECT f.file,";
for(int i=0; i<m_value.size(); i++)
{
if(m_key[i] == "file")
where = QString(" WHERE f.file LIKE '%1'").arg(m_value[i]);
else
join += QString(" JOIN fits_headers AS s%1 ON f.id=s%1.id_file AND s%1.key='%2' AND s%1.value LIKE '%3'").arg(i).arg(m_key[i]).arg(m_value[i]);
}
int i=0;
for(auto &column : m_columns)
{
sql += QString("GROUP_CONCAT(CASE WHEN key=\"%1\" THEN value END) AS \"%1\",").arg(column);
cols += QString("GROUP_CONCAT(h%1.value) AS h%1_value,").arg(i);
join += QString(" LEFT JOIN fits_headers AS h%1 ON f.id=h%1.id_file AND h%1.key='%2'").arg(i).arg(column);
i++;
}
sql.chop(1);
sql += " FROM fits_files LEFT JOIN fits_headers ON fits_files.id=id_file GROUP BY fits_files.id" + m_having + m_sort;
cols.chop(1);
sql += cols;
sql += " FROM fits_files AS f";
sql += join;
sql += where;
sql += " GROUP BY f.id" + m_sort;
setQuery(sql);
qDebug() << sql;
setHeaderData(0, Qt::Horizontal, tr("File name"));
i = 1;
for(auto &column : m_columns)
{
setHeaderData(i++, Qt::Horizontal, column);
}
std::cout << sql.toStdString() << std::endl;
if(lastError().type() != QSqlError::NoError)
qDebug() << lastError();
}
@@ -126,19 +151,20 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
hlayout->addWidget(selectColumnsButton);
connect(selectColumnsButton, &QPushButton::pressed, this, &DataBaseView::selectColumns);
m_filterKeyword = new QComboBox(this);
m_filterKeyword->addItem("file");
m_filterKeyword->addItems(m_database->getFitsKeywords());
m_search = new QLineEdit(this);
m_search->setPlaceholderText(tr("Text to search, you can % as wildcard"));
connect(m_search, &QLineEdit::returnPressed, this, &DataBaseView::applyFilter);
for(int i=0; i<3; i++)
{
m_filterKeyword[i] = new QComboBox(this);
m_filterKeyword[i]->addItem("file");
m_filterKeyword[i]->addItems(m_database->getFitsKeywords());
m_search[i] = new QLineEdit(this);
m_search[i]->setPlaceholderText(tr("Text to search, you can % as wildcard"));
connect(m_search[i], &QLineEdit::returnPressed, this, &DataBaseView::applyFilter);
hlayout->addWidget(m_filterKeyword[i]);
hlayout->addWidget(m_search[i]);
}
QPushButton *filterButton = new QPushButton(tr("Filter"), this);
connect(filterButton, SIGNAL(pressed()), this, SLOT(applyFilter()));
hlayout->addWidget(m_filterKeyword);
hlayout->addWidget(m_search);
hlayout->addWidget(filterButton);
}
@@ -175,6 +201,17 @@ void DataBaseView::itemActivated(const QModelIndex &index)
void DataBaseView::applyFilter()
{
m_model->setFilter(m_filterKeyword->currentText(), m_search->text());
QStringList keys;
QStringList values;
for(int i=0; i<3; i++)
{
QString key = m_filterKeyword[i]->currentText();
if(!m_search[i]->text().isEmpty() && !keys.contains(key))
{
keys.append(key);
values.append(m_search[i]->text());
}
}
m_model->setFilter(keys, values);
}
databaseview.h
+5 -4
View File
@@ -25,12 +25,13 @@ class FITSFileModel : public QSqlQueryModel
Q_OBJECT
QStringList m_columns;
QString m_sort;
QString m_having;
QStringList m_key;
QStringList m_value;
public:
FITSFileModel(QObject *parent = nullptr);
void sort(int column, Qt::SortOrder order);
void setColumns(const QStringList &columns);
void setFilter(const QString &key, const QString &value);
void setFilter(const QStringList &key, const QStringList &value);
protected:
void prepareQuery();
};
@@ -41,8 +42,8 @@ class DataBaseView : public QWidget
Database *m_database;
QTableView *m_tableView;
FITSFileModel *m_model;
QComboBox *m_filterKeyword;
QLineEdit *m_search;
QComboBox *m_filterKeyword[3];
QLineEdit *m_search[3];
public:
explicit DataBaseView(Database *database, QWidget *parent = nullptr);
~DataBaseView();