From 967e855f6bbf3c42cc30669af6abb58ca47ad024 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Fri, 29 Apr 2022 01:25:03 +0300 Subject: [PATCH] message: add docid param to sexp --- lib/message/mu-message-sexp.cc | 8 ++++---- lib/message/mu-message.hh | 4 ++-- lib/mu-server.cc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/message/mu-message-sexp.cc b/lib/message/mu-message-sexp.cc index 2da93a8b..1ee8eebf 100644 --- a/lib/message/mu-message-sexp.cc +++ b/lib/message/mu-message-sexp.cc @@ -140,12 +140,12 @@ add_date_and_size(Sexp::List& items, const Message& message) } Mu::Sexp::List -Message::to_sexp_list() const +Message::to_sexp_list(unsigned docid) const { Sexp::List items; - // if (docid != 0) - // items.add_prop(":docid", Sexp::make_number(docid)); + if (docid != 0) + items.add_prop(":docid", Sexp::make_number(docid)); add_prop_nonempty(items, ":subject", subject()); add_prop_nonempty(items, ":message-id", message_id()); @@ -169,7 +169,7 @@ Message::to_sexp_list() const } Mu::Sexp -Message::to_sexp() const +Message::to_sexp(unsigned docid) const { return Sexp::make_list(to_sexp_list()); } diff --git a/lib/message/mu-message.hh b/lib/message/mu-message.hh index d1fa5aa3..6ab255e0 100644 --- a/lib/message/mu-message.hh +++ b/lib/message/mu-message.hh @@ -279,8 +279,8 @@ public: * * @return a Mu::Sexp or a Mu::Sexp::List representing the message. */ - Mu::Sexp::List to_sexp_list() const; - Mu::Sexp to_sexp() const; + Mu::Sexp::List to_sexp_list(unsigned docid=0) const; + Mu::Sexp to_sexp(unsigned docid=0) const; /* * And some non-const message, for updating an existing diff --git a/lib/mu-server.cc b/lib/mu-server.cc index d9223405..b333e1d7 100644 --- a/lib/mu-server.cc +++ b/lib/mu-server.cc @@ -184,7 +184,7 @@ Server::Private::build_message_sexp(const Message& msg, Store::Id docid, const Option qm) const { - auto msgsexp{msg.to_sexp_list()}; + auto msgsexp{msg.to_sexp_list(docid)}; if (qm) msgsexp.add_prop(":meta", build_metadata(*qm));