tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUI restable: make sure the URL column is UTF-8, else url-encode it for display

Browse Source
This commit is contained in:
Jean-Francois Dockes 2018-09-17 10:21:34 +02:00
parent b0bfed7b63
commit d07112807c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qtgui/restable.cpp
View File

@ -362,19 +362,30 @@ QVariant RecollModel::data(const QModelIndex& index, int role) const
LOGDEB2("RecollModel::data: row " << index.row() << " col " << LOGDEB2("RecollModel::data: row " << index.row() << " col " <<
index.column() << " role " << role << "\n"); index.column() << " role " << role << "\n");
if (!m_source || role != Qt::DisplayRole || !index.isValid() || if (!m_source || role != Qt::DisplayRole || !index.isValid() ||
index.column() >= int(m_fields.size())) { index.column() >= int(m_fields.size())) {
return QVariant(); return QVariant();
} }
Rcl::Doc doc; Rcl::Doc doc;
if (!m_source->getDoc(index.row(), doc)) { if (!m_source->getDoc(index.row(), doc)) {
return QVariant(); return QVariant();
} }
string colname = m_fields[index.column()]; string colname = m_fields[index.column()];
string data = m_getters[index.column()](colname, doc);
// Special case url, because it may not be utf-8. URL-encode in this case.
if (!colname.compare("url")) {
int ecnt;
string data1;
if (!transcode(data, data1, "UTF-8", "UTF-8", &ecnt) || ecnt > 0) {
data = url_encode(data);
}
}
list<string> lr; list<string> lr;
g_hiliter.plaintorich(m_getters[index.column()](colname, doc), lr, m_hdata); g_hiliter.plaintorich(data, lr, m_hdata);
return QString::fromUtf8(lr.front().c_str()); return QString::fromUtf8(lr.front().c_str());
} }