From 805a78c121eb0b05fd52439ad658e1eb2cc81a48 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 18 Jun 2010 00:46:37 -0400 Subject: Only look for [date] outside of metadata entries --- src/item.cc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/item.cc') diff --git a/src/item.cc b/src/item.cc index 63f0f3a9..4e9c7702 100644 --- a/src/item.cc +++ b/src/item.cc @@ -138,26 +138,26 @@ void item_t::parse_tags(const char * p, scope_t& scope, bool overwrite_existing) { - if (const char * b = std::strchr(p, '[')) { - if (*(b + 1) != '\0' && - (std::isdigit(*(b + 1)) || *(b + 1) == '=')) { - if (const char * e = std::strchr(p, ']')) { - char buf[256]; - std::strncpy(buf, b + 1, e - b - 1); - buf[e - b - 1] = '\0'; - - if (char * p = std::strchr(buf, '=')) { - *p++ = '\0'; - _date_eff = parse_date(p); + if (! std::strchr(p, ':')) { + if (const char * b = std::strchr(p, '[')) { + if (*(b + 1) != '\0' && + (std::isdigit(*(b + 1)) || *(b + 1) == '=')) { + if (const char * e = std::strchr(p, ']')) { + char buf[256]; + std::strncpy(buf, b + 1, e - b - 1); + buf[e - b - 1] = '\0'; + + if (char * p = std::strchr(buf, '=')) { + *p++ = '\0'; + _date_eff = parse_date(p); + } + if (buf[0]) + _date = parse_date(buf); } - if (buf[0]) - _date = parse_date(buf); } } - } - - if (! std::strchr(p, ':')) return; + } scoped_array buf(new char[std::strlen(p) + 1]); -- cgit v1.2.3