- The import command now uses the built-in Task::parseJSON method.
- Began t3.t.cpp for JSON parsing tests.
This commit is contained in:
Paul Beckingham 2013-05-20 16:31:57 -04:00
parent 6a97017c79
commit b408458439
5 changed files with 60 additions and 117 deletions

View file

@ -98,121 +98,15 @@ int CmdImport::execute (std::string& output)
continue;
// Parse the whole thing.
json::value* root = json::parse (object);
if (root->type () == json::j_object)
{
json::object* root_obj = (json::object*)root;
Task task;
Task task (object);
// For each object element...
json_object_iter i;
for (i = root_obj->_data.begin ();
i != root_obj->_data.end ();
++i)
{
// If the attribute is a recognized column.
Column* col = context.columns[i->first];
if (col)
{
// Any specified id is ignored.
if (i->first == "id")
;
// Urgency, if present, is ignored.
else if (i->first == "urgency")
;
// Dates are converted from ISO to epoch.
else if (col->type () == "date")
{
Date d (unquoteText (i->second->dump ()));
task.set (i->first, d.toEpochString ());
}
// Tags are an array of JSON strings.
else if (i->first == "tags")
{
json::array* tags = (json::array*)i->second;
json_array_iter t;
for (t = tags->_data.begin ();
t != tags->_data.end ();
++t)
{
json::string* tag = (json::string*)*t;
task.addTag (tag->_data);
}
}
// Other types are simply added.
else
task.set (i->first, unquoteText (i->second->dump ()));
}
// Several attributes do not have columns.
// mask
// imask
// parent
// UDA orphans
else
{
// Annotations are an array of JSON objects with 'entry' and
// 'description' values and must be converted.
if (i->first == "annotations")
{
std::map <std::string, std::string> annos;
json::array* atts = (json::array*)i->second;
json_array_iter annotations;
for (annotations = atts->_data.begin ();
annotations != atts->_data.end ();
++annotations)
{
json::object* annotation = (json::object*)*annotations;
json::string* when = (json::string*)annotation->_data["entry"];
json::string* what = (json::string*)annotation->_data["description"];
if (! when)
throw format (STRING_TASK_NO_ENTRY, *line);
if (! what)
throw format (STRING_TASK_NO_DESC, *line);
std::string name = "annotation_" + Date (when->_data).toEpochString ();
annos.insert (std::make_pair (name, what->_data));
}
task.setAnnotations (annos);
}
// Attributes without columns are simply added.
else if (i->first == "parent" ||
i->first == "mask" ||
i->first == "imask")
{
task.set (i->first, unquoteText (i->second->dump ()));
}
// UDA Orphan - must be preserved.
else
{
task.set (i->first, unquoteText (i->second->dump ()));
}
}
}
context.tdb2.add (task);
++count;
std::cout << " "
<< task.get ("uuid")
<< " "
<< task.get ("description")
<< "\n";
}
else
throw format (STRING_CMD_IMPORT_NOT_JSON, *line);
delete root;
context.tdb2.add (task);
++count;
std::cout << " "
<< task.get ("uuid")
<< " "
<< task.get ("description")
<< "\n";
}
}