sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support payee uuid directive

Browse source 
The semantics of this are a little bit tricky: we want, if we come
across a transaction with exactly the given UUID, to set the
transaction's payee to be the specified one.

We need to set that payee before the first post in the transaction is
parsed, otherwise that post will inherit the wrong payee; however, we
need to do it after the transaction's tags have been parsed.  The
implementation as it is in this commit is potentially a little
wasteful, if there are post-like (non-comment non-assertion) entries
in the transaction that don't successfully parse as posts.
This commit is contained in:
Christophe Rhodes 2014-05-13 16:08:10 +01:00
parent bcb28b066f
commit da51f5b510
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/journal.h
View file

@ -63,6 +63,8 @@ typedef std::list<auto_xact_t *> auto_xacts_list;
typedef std::list<period_xact_t *> period_xacts_list;
typedef std::pair<mask_t, string> payee_alias_mapping_t;
typedef std::list<payee_alias_mapping_t> payee_alias_mappings_t;
typedef std::pair<string, string> payee_uuid_mapping_t;
typedef std::list<payee_uuid_mapping_t> payee_uuid_mappings_t;
typedef std::pair<mask_t, account_t *> account_mapping_t;
typedef std::list<account_mapping_t> account_mappings_t;
typedef std::map<string, account_t *> accounts_map;
@ -134,6 +136,7 @@ public:
bool recursive_aliases;
bool no_aliases;
payee_alias_mappings_t payee_alias_mappings;
payee_uuid_mappings_t payee_uuid_mappings;
account_mappings_t account_mappings;
accounts_map account_aliases;
account_mappings_t payees_for_unknown_accounts;

21
src/textual.cc
View file

@ -155,6 +155,7 @@ namespace {
void payee_directive(char * line);
void payee_alias_directive(const string& payee, string alias);
void payee_uuid_directive(const string& payee, string uuid);
void commodity_directive(char * line);
void commodity_alias_directive(commodity_t& comm, string alias);
@ -1035,6 +1036,8 @@ void instance_t::payee_directive(char * line)
string keyword(p);
if (keyword == "alias")
payee_alias_directive(payee, b);
if (keyword == "uuid")
payee_uuid_directive(payee, b);
}
}
@ -1045,6 +1048,13 @@ void instance_t::payee_alias_directive(const string& payee, string alias)
.push_back(payee_alias_mapping_t(mask_t(alias), payee));
}
void instance_t::payee_uuid_directive(const string& payee, string uuid)
{
trim(uuid);
context.journal->payee_uuid_mappings
.push_back(payee_uuid_mapping_t(uuid, payee));
}
void instance_t::commodity_directive(char * line)
{
char * p = skip_ws(line);
@ -1862,6 +1872,17 @@ xact_t * instance_t::parse_xact(char * line,
else {
reveal_context = false;
if (!last_post) {
if (xact->has_tag(_("UUID"))) {
string uuid = xact->get_tag(_("UUID"))->to_string();
foreach (payee_uuid_mapping_t value, context.journal->payee_uuid_mappings) {
if (value.first.compare(uuid) == 0) {
xact->payee = value.second;
}
}
}
}
if (post_t * post =
parse_post(p, len - (p - line), account, xact.get())) {
reveal_context = true;