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

TW-1636: UUID with numeric-only first segment is not parsed properly

Browse Source 
- Switched Nibbler::getUUID to Nibbler::getPartialUUID, which caused partial
  UUID mathcing to fail sometimes.
- Changed precedence to search for UUID before ID, which solves the numeric
  UUID problem.
This commit is contained in:
Paul Beckingham
2015-08-08 00:49:54 -04:00
parent 9cdabf288e
commit 2a621a4367
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/DOM.cpp
View File

@@ -255,24 +255,23 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value)
std::string uuid;
bool proceed = false;
if (n.getInt (id) && n.depleted ())
if (n.getPartialUUID (uuid) && n.depleted ())
{
if (id == task.id)
if (uuid == task.get ("uuid"))
ref = task;
else
context.tdb2.get (id, ref);
context.tdb2.get (uuid, ref);
proceed = true;
}
else
{
n.restore ();
if (n.getUUID (uuid) && n.depleted ())
if (n.getInt (id) && n.depleted ())
{
if (uuid == task.get ("uuid"))
if (id == task.id)
ref = task;
else
context.tdb2.get (uuid, ref);
context.tdb2.get (id, ref);
proceed = true;
}