From 3d1a5acafb6eb41a0ef9f464a0d458d02f7a0da1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 3 Sep 2011 11:17:12 -0400
Subject: [PATCH] TDB2

- Implemented high-level TDB2::id and TDB2:uuid that delegates to TF2.
- Fixed a bug in TDB2::modify that failed to properly overwrite a task.
---
 src/TDB2.cpp | 53 +++++++++++++++++++++++++++++++++++++++-------------
 src/TDB2.h   |  4 ++++
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index dc94def2f..ad3207a6f 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -156,11 +156,15 @@ void TF2::modify_task (const Task& task)
 //  std::cout << "# TF2::modify_task " << _file._data << "\n";
 
   // Modify in-place.
+  std::string uuid = task.get ("uuid");
   std::vector <Task>::iterator i;
   for (i = _tasks.begin (); i != _tasks.end (); ++i)
   {
-    if (i->get ("uuid") == task.get ("uuid"))
+    if (i->get ("uuid") == uuid)
     {
+//      std::cout << "# TF2::modify_task overwriting:\n"
+//                << "#   old " << i->composeF4 ()
+//                << "#   new " << task.composeF4 ();
       *i = task;
       break;
     }
@@ -546,22 +550,26 @@ void TDB2::modify (Task& task)
   // Ensure the task is consistent, and provide defaults if necessary.
   task.validate ();
 
-  // Update task in either completed or deleted.
-  // TODO Find task, overwrite it.
-  std::string status = task.get ("status");
-  if (status == "completed" ||
-      status == "deleted")
-    completed.modify_task (task);
-  else
+  // Find task, overwrite it.
+  Task original;
+  get (task.get ("uuid"), original);
+
+  std::string status = original.get ("status");
+  if (status == "pending" ||
+      status == "waiting" ||
+      status == "recurring")
+  {
     pending.modify_task (task);
+  }
+  else
+  {
+    completed.modify_task (task);
+  }
 
   // time <time>
   // old <task>
   // new <task>
   // ---
-  Task original;
-  get (task.get ("uuid"), original);
-
   undo.add_line ("time " + Date ().toEpochString () + "\n");
   undo.add_line ("old " + original.composeF4 ());
   undo.add_line ("new " + task.composeF4 ());
@@ -976,11 +984,10 @@ void TDB2::merge (const std::string& mergeFile)
       lmods.clear ();
       throw std::string ("Database is up-to-date, no merge required.");
     }
-
   }
   else // lit == l.end ()
   {
-    // nothing happend on the local branch
+    // nothing happened on the local branch
 /*
     std::cout << "No local changes detected.\n";
 */
@@ -1672,6 +1679,26 @@ const std::vector <Task> TDB2::siblings (Task& task)
   return results;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+std::string TDB2::uuid (int id)
+{
+  std::string result = pending.uuid (id);
+  if (result == "")
+    result = completed.uuid (id);
+
+  return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int TDB2::id (const std::string& uuid)
+{
+  int result = pending.id (uuid);
+  if (result == 0)
+    result = completed.id (uuid);
+
+  return result;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 bool TDB2::verifyUniqueUUID (const std::string& uuid)
 {
diff --git a/src/TDB2.h b/src/TDB2.h
index df216d73f..c3a0ea3e3 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -107,6 +107,10 @@ public:
   bool get (const std::string&, Task&);
   const std::vector <Task> siblings (Task&);
 
+  // ID <--> UUID mapping.
+  std::string uuid (int);
+  int id (const std::string&);
+
   void clear ();
   void dump ();