From: alex <alex@alex-VirtualBox.(none)>
Date: Fri, 1 Mar 2013 22:35:20 +0000 (+0400)
Subject: Improve getblock/getblockbynumber output
X-Git-Tag: v0.4.0-unstable~28
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=825cabed0c50029d2e807f106cc92b1de5f8efb6

Improve getblock/getblockbynumber output
---

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 755ac7d..d2e20f9 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -211,17 +211,19 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool fPri
     {
         if (fPrintTransactionDetail)
         {
-            txinfo.push_back(tx.ToStringShort());
-            txinfo.push_back(DateTimeStrFormat(tx.nTime));
-            BOOST_FOREACH(const CTxIn& txin, tx.vin)
-                txinfo.push_back(txin.ToStringShort());
-            BOOST_FOREACH(const CTxOut& txout, tx.vout)
-                txinfo.push_back(txout.ToStringShort());
+            Object entry;
+
+            entry.push_back(Pair("txid", tx.GetHash().GetHex()));
+            TxToJSON(tx, entry);
+            entry.push_back(Pair("time", (boost::int64_t)tx.nTime));
+
+            txinfo.push_back(entry);
         }
         else
             txinfo.push_back(tx.GetHash().GetHex());
     }
-    result.push_back(Pair("tx", txinfo));
+        result.push_back(Pair("tx", txinfo));
+
     return result;
 }