From b2f219b308805dff48a8944ae5288fa4efc639e6 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Thu, 20 Dec 2018 16:42:13 +0100
Subject: [PATCH] GUI preview: trim wildcards from user terms for insertion in
 search combobox

---
 src/qtgui/preview_w.cpp | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/qtgui/preview_w.cpp b/src/qtgui/preview_w.cpp
index f8376055..54536030 100644
--- a/src/qtgui/preview_w.cpp
+++ b/src/qtgui/preview_w.cpp
@@ -67,6 +67,35 @@ static const QKeySequence prevDocInTabKS(Qt::ShiftModifier+Qt::Key_Up);
 static const QKeySequence closeTabKS(Qt::ControlModifier+Qt::Key_W);
 static const QKeySequence printTabKS(Qt::ControlModifier+Qt::Key_P);
 
+// Make an attempt at trimming wildcard exprs at both ends of string
+static void trimwildcards(string& elt)
+{
+    if (elt.empty())
+        return;
+    string::size_type initsize;
+    do {
+        initsize = elt.size();
+        // Trim wildcard chars. 
+        trimstring(elt, " *?");
+        // Trim wildcard char classes 
+        if (elt.size() && elt.back() == ']') {
+            string::size_type offs = elt.find_last_of("[");
+            if (offs != string::npos) {
+                elt = elt.substr(0, offs);
+                if (elt.size() && elt.back() == '[') {
+                    elt.erase(elt.end()-1);
+                }
+            }
+        }
+        if (elt.size() && elt.front() == '[') {
+            string::size_type offs = elt.find_first_of("]");
+            if (offs != string::npos) {
+                elt.erase(0, offs+1);
+            }
+        }
+    } while (elt.size() && elt.size() != initsize);
+}
+
 void Preview::init()
 {
     LOGDEB("Preview::init\n");
@@ -77,8 +106,11 @@ void Preview::init()
 
     for (const auto& ugroup : m_hData.ugroups) {
         QString s;
-        for (const auto& elt : ugroup) {
-            s.append(u8s2qs(elt));
+        for (auto elt : ugroup) {
+            trimwildcards(elt);
+            if (!elt.empty()) {
+                s.append(u8s2qs(elt));
+            }
         }
         s = s.trimmed();
         searchTextCMB->addItem(s);