Add is null search query integrated with tree

daschuer · Jul 11, 2016 · 6aac36c · 6aac36c
1 parent adfbfbb
commit 6aac36c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/library/librarytreemodel.cpp b/src/library/librarytreemodel.cpp
@@ -97,8 +97,11 @@ QString LibraryTreeModel::getQuery(TreeItem* pTree) const {
     pAux = pTree;
     while (depth >= 0) {
         QString value = pAux->dataPath().toString();
-
-        result << m_sortOrder[depth] % ":\"" % value % "\"";
+        if (value == "") {
+            result << "\\+" + m_sortOrder[depth];
+        } else {
+            result << m_sortOrder[depth] % ":\"" % value % "\"";
+        }
         pAux = pAux->parent();
         --depth;
     }

diff --git a/src/library/searchqueryparser.cpp b/src/library/searchqueryparser.cpp
@@ -54,6 +54,7 @@ SearchQueryParser::SearchQueryParser(QSqlDatabase& database)
     m_allFilters.append(m_specialFilters);
 
     m_fuzzyMatcher = QRegExp(QString("^~(%1)$").arg(m_allFilters.join("|")));
+    m_isNullMatcher = QRegExp(QString("^\\\\\\+(%1)$").arg(m_allFilters.join("|")));
     m_textFilterMatcher = QRegExp(QString("^-?(%1):(.*)$").arg(m_textFilters.join("|")));
     m_numericFilterMatcher = QRegExp(QString("^-?(%1):(.*)$").arg(m_numericFilters.join("|")));
     m_specialFilterMatcher = QRegExp(QString("^[~-]?(%1):(.*)$").arg(m_specialFilters.join("|")));
@@ -116,6 +117,11 @@ void SearchQueryParser::parseTokens(QStringList tokens,
 
         if (m_fuzzyMatcher.indexIn(token) != -1) {
             // TODO(XXX): implement this feature.
+        } else if (m_isNullMatcher.indexIn(token) != -1) {
+            QString field = m_isNullMatcher.cap(1);
+            std::unique_ptr<QueryNode> pNode(std::make_unique<SqlNode>(
+                    field + " IS NULL"));
+            pQuery->addNode(std::move(pNode));
         } else if (m_textFilterMatcher.indexIn(token) != -1) {
             bool negate = token.startsWith(kNegatePrefix);
             QString field = m_textFilterMatcher.cap(1);

diff --git a/src/library/searchqueryparser.h b/src/library/searchqueryparser.h
@@ -34,6 +34,7 @@ class SearchQueryParser {
     QStringList m_allFilters;
     QHash<QString, QStringList> m_fieldToSqlColumns;
 
+    QRegExp m_isNullMatcher;
     QRegExp m_fuzzyMatcher;
     QRegExp m_textFilterMatcher;
     QRegExp m_numericFilterMatcher;