From fb23bf73a3d65aa5bc062bbb530e9462c6f93346 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 6 Aug 2011 16:27:38 -0400
Subject: [PATCH] Import

- Trying different methods of making this code cleaner.  Not working
  so far.
---
 src/JSON.h                 |  6 ++++++
 src/commands/CmdImport.cpp | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/JSON.h b/src/JSON.h
index 749a6d594..7a3da7da7 100644
--- a/src/JSON.h
+++ b/src/JSON.h
@@ -122,5 +122,11 @@ namespace json
   std::string decode (const std::string&);
 }
 
+typedef std::vector<json::value*>                      json_array;
+typedef std::map<std::string, json::value*>            json_object;
+
+typedef std::vector <json::value*>::iterator           json_array_iter;
+typedef std::map <std::string, json::value*>::iterator json_object_iter;
+
 #endif
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 66de01e86..0b96337d5 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -97,18 +97,30 @@ int CmdImport::execute (std::string& output)
       std::cout << root->dump ()
                 << "\n";
 
-/*
       // For each object element...
+      json_object_iter i;
+      for (i  = ((json_object*)root)->begin ();
+           i != ((json_object*)root)->end ();
+           ++i)
+      {
+        std::cout << "!!!\n";
+      }
+
+/*
       std::map <std::string, json::value*>::iterator i;
       for (i  = ((std::map <std::string, json::value*>*)root)->begin ();
            i != ((std::map <std::string, json::value*>*)root)->end ();
            ++i)
       {
         Task task;
+        std::cout << "!!!\n";
 
         // TODO Navigate each object.
       }
 */
+
+      delete root;
+      root = NULL;
     }
   }