indexing: record protected subject when indexing cleartext

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index 4d1b08d6f7006885d4894cca03599f6eecaf1032..9e1005a3058c8330334525943d03e8e7bee896a5 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1238,6 +1238,14 @@ _notmuch_message_set_header_values (notmuch_message_t *message,
     message->modified = true;
 }
 
+void
+_notmuch_message_update_subject (notmuch_message_t *message,
+                                const char *subject)
+{
+    message->doc.add_value (NOTMUCH_VALUE_SUBJECT, subject);
+    message->modified = true;
+}
+
 /* Upgrade a message to support NOTMUCH_FEATURE_LAST_MOD.  The caller
  * must call _notmuch_message_sync. */
 void
@@ -1446,8 +1454,12 @@ _notmuch_message_gen_terms (notmuch_message_t *message,
     term_gen->set_termpos (message->termpos);
 
     if (prefix_name) {
+       const char *prefix = _notmuch_database_prefix (message->notmuch, prefix_name);
+       if (prefix == NULL)
+           return NOTMUCH_PRIVATE_STATUS_BAD_PREFIX;
+
        _notmuch_message_invalidate_metadata (message, prefix_name);
-       term_gen->index_text (text, 1, _find_prefix (prefix_name));
+       term_gen->index_text (text, 1, prefix);
     } else {
        term_gen->index_text (text);
     }