gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

DOM

Browse Source 
- When attributes are accessed via DOM references, the value extracted is now
  imbued with the attribute type.
This commit is contained in:
Paul Beckingham
2014-06-24 22:16:57 -04:00
parent f72aa7b02c
commit db6cecd2f3
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/DOM.cpp
View File

@@ -245,8 +245,20 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value)
std::string canonical; std::string canonical;
if (task.size () && context.parser.canonicalize (canonical, "attribute", name)) if (task.size () && context.parser.canonicalize (canonical, "attribute", name))
{ {
value = Variant (task.get (canonical)); Column* column = context.columns[canonical];
return true; if (column)
{
if (column->type () == "date")
value = Variant (task.get_date (canonical), Variant::type_date);
else if (column->type () == "duration")
value = Variant ((time_t) Duration (task.get (canonical)), Variant::type_duration);
else if (column->type () == "numeric")
value = Variant (task.get_float (canonical));
else
value = Variant (task.get (canonical));
return true;
}
} }
} }
else if (elements.size () > 1) else if (elements.size () > 1)
@@ -301,14 +313,19 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value)
if (elements.size () == 2) if (elements.size () == 2)
{ {
Column* column = context.columns[canonical]; Column* column = context.columns[canonical];
if (column && column->type () == "date") if (column)
value = Variant (ref.get_date (canonical), Variant::type_date); {
else if (column && column->type () == "duration") if (column->type () == "date")
value = Variant ((time_t) Duration (ref.get (canonical)), Variant::type_duration); value = Variant (ref.get_date (canonical), Variant::type_date);
else else if (column->type () == "duration")
value = Variant (ref.get (canonical)); value = Variant ((time_t) Duration (ref.get (canonical)), Variant::type_duration);
else if (column->type () == "numeric")
value = Variant (ref.get_float (canonical));
else
value = Variant (ref.get (canonical));
return true; return true;
}
} }
else if (elements.size () == 3) else if (elements.size () == 3)
{ {