IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Csv Import - Use GncNumeric rather than GncRational

Browse Source 
This simplifies several lines of code.
This commit is contained in:
Geert Janssens 2017-02-20 17:30:16 +01:00
parent c2f21f0162
commit 7a394321e2
2 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/import-export/csv-imp/gnc-trans-props.cpp
View File

@ -206,10 +206,10 @@ time64 parse_date (const std::string &date_str, int format)
/** Convert str into a GncRational using the user-specified (import) currency format. /** Convert str into a GncRational using the user-specified (import) currency format.
* @param str The string to be parsed * @param str The string to be parsed
* @param currency_format The currency format to use. * @param currency_format The currency format to use.
* @return a GncRational * @return a GncNumeric
* @exception May throw std::invalid argument if string can't be parsed properly * @exception May throw std::invalid argument if string can't be parsed properly
*/ */
GncRational parse_amount (const std::string &str, int currency_format) GncNumeric parse_amount (const std::string &str, int currency_format)
{ {
/* If a cell is empty or just spaces return invalid amount */ /* If a cell is empty or just spaces return invalid amount */
if(!boost::regex_search(str, boost::regex("[0-9]"))) if(!boost::regex_search(str, boost::regex("[0-9]")))
@ -240,7 +240,7 @@ GncRational parse_amount (const std::string &str, int currency_format)
break; break;
} }
return GncRational(val); return GncNumeric(val);
} }
static char parse_reconciled (const std::string& reconcile) static char parse_reconciled (const std::string& reconcile)
@ -631,16 +631,18 @@ std::string GncPreSplit::verify_essentials (void)
/** Adds a split to a transaction. /** Adds a split to a transaction.
* @param trans The transaction to add a split to * @param trans The transaction to add a split to
* @param account The account used for the split * @param account The split's account
* @param book The book where the split should be stored * @param amount The split's amount
* @param amount The amount of the split * @param rec_state The split's reconcile status
* @param rec_date The split's reconcile date
* @param price The split's conversion rate from account commodity to transaction commodity
*/ */
static void trans_add_split (Transaction* trans, Account* account, GncRational amount, static void trans_add_split (Transaction* trans, Account* account, GncNumeric amount,
const boost::optional<std::string>& action, const boost::optional<std::string>& action,
const boost::optional<std::string>& memo, const boost::optional<std::string>& memo,
const boost::optional<char>& rec_state, const boost::optional<char>& rec_state,
const boost::optional<time64> rec_date, const boost::optional<time64> rec_date,
const boost::optional<GncRational> price) const boost::optional<GncNumeric> price)
{ {
QofBook* book = xaccTransGetBook (trans); QofBook* book = xaccTransGetBook (trans);
auto split = xaccMallocSplit (book); auto split = xaccMallocSplit (book);
@ -649,14 +651,11 @@ static void trans_add_split (Transaction* trans, Account* account, GncRational a
xaccSplitSetAmount (split, static_cast<gnc_numeric>(amount)); xaccSplitSetAmount (split, static_cast<gnc_numeric>(amount));
auto trans_curr = xaccTransGetCurrency(trans); auto trans_curr = xaccTransGetCurrency(trans);
auto acct_comm = xaccAccountGetCommodity(account); auto acct_comm = xaccAccountGetCommodity(account);
GncNumeric value;
if (gnc_commodity_equiv(trans_curr, acct_comm)) if (gnc_commodity_equiv(trans_curr, acct_comm))
xaccSplitSetValue (split, static_cast<gnc_numeric>(amount)); value = amount;
else if (price) else if (price)
{ value = amount * *price;
auto value = gnc_numeric_mul (static_cast<gnc_numeric>(amount),
static_cast<gnc_numeric>(*price), GNC_DENOM_AUTO, GNC_HOW_RND_ROUND);
xaccSplitSetValue (split, value);
}
else else
{ {
auto tts = xaccTransRetDatePostedTS (trans); auto tts = xaccTransRetDatePostedTS (trans);
@ -666,22 +665,21 @@ static void trans_add_split (Transaction* trans, Account* account, GncRational a
if (nprice) if (nprice)
{ {
/* Found a usable price. Let's check if the conversion direction is right */ /* Found a usable price. Let's check if the conversion direction is right */
gnc_numeric rate = {0, 1}; GncNumeric rate;
if (gnc_commodity_equiv(gnc_price_get_currency(nprice), trans_curr)) if (gnc_commodity_equiv(gnc_price_get_currency(nprice), trans_curr))
rate = gnc_price_get_value(nprice); rate = gnc_price_get_value(nprice);
else else
rate = gnc_numeric_invert(gnc_price_get_value(nprice)); rate = static_cast<GncNumeric>(gnc_price_get_value(nprice)).inv();
auto value = gnc_numeric_mul (static_cast<gnc_numeric>(amount), value = amount * rate;
rate, GNC_DENOM_AUTO, GNC_HOW_RND_ROUND);
xaccSplitSetValue (split, value);
} }
else else
{ {
PWARN("No price found, using a price of 1."); PWARN("No price found, using a price of 1.");
xaccSplitSetValue (split, static_cast<gnc_numeric>(amount)); value = amount;
} }
} }
xaccSplitSetValue (split, static_cast<gnc_numeric>(value));
if (memo) if (memo)
xaccSplitSetMemo (split, memo->c_str()); xaccSplitSetMemo (split, memo->c_str());
@ -714,9 +712,9 @@ void GncPreSplit::create_split (Transaction* trans)
Account *account = nullptr; Account *account = nullptr;
Account *taccount = nullptr; Account *taccount = nullptr;
auto deposit = GncRational (0, 1); auto deposit = GncNumeric();
auto withdrawal = GncRational (0, 1); auto withdrawal = GncNumeric();
auto amount = GncRational (0, 1); auto amount = GncNumeric();
if (m_account) if (m_account)
account = *m_account; account = *m_account;
@ -727,10 +725,7 @@ void GncPreSplit::create_split (Transaction* trans)
if (m_withdrawal) if (m_withdrawal)
withdrawal = *m_withdrawal; withdrawal = *m_withdrawal;
amount = GncRational(gnc_numeric_add (static_cast<gnc_numeric>(deposit), amount = deposit + withdrawal;
static_cast<gnc_numeric>(withdrawal),
xaccAccountGetCommoditySCU (account),
GNC_HOW_RND_ROUND_HALF_UP));
/* Add a split with the cumulative amount value. */ /* Add a split with the cumulative amount value. */
trans_add_split (trans, account, amount, m_action, m_memo, m_rec_state, m_rec_date, m_price); trans_add_split (trans, account, amount, m_action, m_memo, m_rec_state, m_rec_date, m_price);
@ -743,7 +738,7 @@ void GncPreSplit::create_split (Transaction* trans)
auto inv_price = m_price; auto inv_price = m_price;
if (m_price) if (m_price)
inv_price = m_price->inv(); inv_price = m_price->inv();
trans_add_split (trans, taccount, gnc_numeric_neg(amount), m_taction, m_tmemo, m_trec_state, m_trec_date, inv_price); trans_add_split (trans, taccount, -amount, m_taction, m_tmemo, m_trec_state, m_trec_date, inv_price);
} }
created = true; created = true;

10
src/import-export/csv-imp/gnc-trans-props.hpp
View File

@ -41,7 +41,7 @@ extern "C" {
#include <map> #include <map>
#include <memory> #include <memory>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <gnc-rational.hpp> #include <gnc-numeric.hpp>
/** Enumeration for column types. These are the different types of /** Enumeration for column types. These are the different types of
* columns that can exist in a CSV/Fixed-Width file. There should be * columns that can exist in a CSV/Fixed-Width file. There should be
@ -105,7 +105,7 @@ GncTransPropType sanitize_trans_prop (GncTransPropType prop, bool multi_split);
time64 parse_date (const std::string &date_str, int format); time64 parse_date (const std::string &date_str, int format);
gnc_commodity* parse_commodity (const std::string& comm_str); gnc_commodity* parse_commodity (const std::string& comm_str);
GncRational parse_amount (const std::string &str, int currency_format); GncNumeric parse_amount (const std::string &str, int currency_format);
struct GncPreTrans struct GncPreTrans
{ {
@ -171,9 +171,9 @@ private:
int m_currency_format; int m_currency_format;
boost::optional<std::string> m_action; boost::optional<std::string> m_action;
boost::optional<Account*> m_account; boost::optional<Account*> m_account;
boost::optional<GncRational> m_deposit; boost::optional<GncNumeric> m_deposit;
boost::optional<GncRational> m_withdrawal; boost::optional<GncNumeric> m_withdrawal;
boost::optional<GncRational> m_price; boost::optional<GncNumeric> m_price;
boost::optional<std::string> m_memo; boost::optional<std::string> m_memo;
boost::optional<char> m_rec_state; boost::optional<char> m_rec_state;
boost::optional<time64> m_rec_date; boost::optional<time64> m_rec_date;