From 651cee5738304cafb5c5a4c32638e507ed134cac Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 30 Aug 2012 10:44:21 -0700
Subject: [PATCH] Clean up ledger JSON output.

---
 src/Ledger.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Ledger.cpp b/src/Ledger.cpp
index b6b7eedb0c..7895f81b98 100644
--- a/src/Ledger.cpp
+++ b/src/Ledger.cpp
@@ -417,23 +417,26 @@ void Ledger::addJson(Json::Value& ret, int options)
 	bool full = (options & LEDGER_JSON_FULL) != 0;
 	if(mClosed || full)
 	{
+		if (mClosed)
+			ledger["closed"] = true;
 		ledger["hash"] = mHash.GetHex();
 		ledger["transactionHash"] = mTransHash.GetHex();
 		ledger["accountHash"] = mAccountHash.GetHex();
-		if (mClosed) ledger["closed"] = true;
 		ledger["accepted"] = mAccepted;
 		ledger["totalCoins"] = boost::lexical_cast<std::string>(mTotCoins);
-		if ((mCloseFlags & sLCF_NoConsensusTime) != 0)
-			ledger["closeTimeEstimate"] = mCloseTime;
-		else
+		if (mCloseTime != 0)
 		{
-			ledger["closeTime"] = mCloseTime;
-			ledger["closeTimeResolution"] = mCloseResolution;
+			if ((mCloseFlags & sLCF_NoConsensusTime) != 0)
+				ledger["closeTimeEstimate"] = boost::posix_time::to_simple_string(ptFromSeconds(mCloseTime));
+			else
+			{
+				ledger["closeTime"] = boost::posix_time::to_simple_string(ptFromSeconds(mCloseTime));
+				ledger["closeTimeResolution"] = mCloseResolution;
+			}
 		}
 	}
-	else ledger["closed"] = false;
-	if (mCloseTime != 0)
-		ledger["closeTime"] = boost::posix_time::to_simple_string(ptFromSeconds(mCloseTime));
+	else
+		ledger["closed"] = false;
 	if (mTransactionMap && (full || ((options & LEDGER_JSON_DUMP_TXNS) != 0)))
 	{
 		Json::Value txns(Json::arrayValue);