From 4f0276c062d9aac4b18c6dda29a1bace4cb2b8ad Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 25 Aug 2011 22:19:25 -0400
Subject: [PATCH] DOM

- Implemented lookup for <id>.<attr> and <uuid>.<attr>.
---
 src/DOM.cpp | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 654a1fa7c..e853b26a6 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -235,13 +235,18 @@ const std::string DOM::get (const std::string& name, const Task& task)
   {
     if (n.skip ('.'))
     {
-      // TODO Obtain task 'id' from TDB2.
+      Task ref;
+      if (id == task.id)
+        ref = task;
+      else
+        context.tdb2.get (id, ref);
+
       std::string attr;
       n.getUntilEOS (attr);
 
-           if (attr == "id")                       return format (task.id);
-      else if (attr == "urgency")                  return format (task.urgency_c (), 4, 3);
-      else if (A3::is_attribute (name, canonical)) return task.get (canonical);
+           if (attr == "id")                       return format (ref.id);
+      else if (attr == "urgency")                  return format (ref.urgency_c (), 4, 3);
+      else if (A3::is_attribute (name, canonical)) return ref.get (canonical);
     }
   }
 
@@ -250,13 +255,18 @@ const std::string DOM::get (const std::string& name, const Task& task)
   {
     if (n.skip ('.'))
     {
-      // TODO Obtain task 'uuid' from TDB2.
+      Task ref;
+      if (uuid == task.get ("uuid"))
+        ref = task;
+      else
+        context.tdb2.get (uuid, ref);
+
       std::string attr;
       n.getUntilEOS (attr);
 
-           if (name == "id")                       return format (task.id);
-      else if (name == "urgency")                  return format (task.urgency_c (), 4, 3);
-      else if (A3::is_attribute (name, canonical)) return task.get (canonical);
+           if (name == "id")                       return format (ref.id);
+      else if (name == "urgency")                  return format (ref.urgency_c (), 4, 3);
+      else if (A3::is_attribute (name, canonical)) return ref.get (canonical);
     }
   }
 
@@ -264,7 +274,7 @@ const std::string DOM::get (const std::string& name, const Task& task)
   return this->get (name);
 }
 
-// TODO Need a context-specific DOM::set.  For Lua.
+// TODO Need a context-specific DOM::set.  For Lua.  Probably.
 
 ////////////////////////////////////////////////////////////////////////////////
 void DOM::set (const std::string& name, const std::string& value)