Attachment 1483911 Details for Bug 1625313 – Patch to fix the error messages about non UTF-8 URLs

[patch] Patch to fix the error messages about non UTF-8 URLs

recoll-restable-url-encode.diff (text/plain), 1.51 KB, created by Jean-Francois Dockes on 2018-09-17 08:27:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Francois Dockes

Created: 2018-09-17 08:27:33 UTC

Size: 1.51 KB

patch

obsolete

>commit d07112807c491fb2f8ccb4059ab22ada83deddac
>Author: Jean-Francois Dockes <jf@dockes.org>
>Date:   Mon Sep 17 10:21:34 2018 +0200
>
>    GUI restable: make sure the URL column is UTF-8, else url-encode it for display
>
>diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp
>index 30f7170d..5dbcde96 100644
>--- a/src/qtgui/restable.cpp
>+++ b/src/qtgui/restable.cpp
>@@ -362,19 +362,30 @@ QVariant RecollModel::data(const QModelIndex& index, int role) const
>     LOGDEB2("RecollModel::data: row " << index.row() << " col " <<
>             index.column() << " role " << role << "\n");
>     if (!m_source || role != Qt::DisplayRole || !index.isValid() ||
>-	index.column() >= int(m_fields.size())) {
>-	return QVariant();
>+        index.column() >= int(m_fields.size())) {
>+        return QVariant();
>     }
> 
>     Rcl::Doc doc;
>     if (!m_source->getDoc(index.row(), doc)) {
>-	return QVariant();
>+        return QVariant();
>     }
> 
>     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;
>-    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());
> }
>

Actions: View | Diff

Attachments on bug 1625313: 1483778 | 1483911