IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-27 03:10:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2356 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2000-05-19 10:27:33 +00:00
parent 297b5c0e53
commit 00b82a2b87
2 changed files with 62 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/engine/Query.c
View File

@ -1494,7 +1494,7 @@ xaccAccountMatchPredicate(Split * s, PredicateData * pd) {
assert(s && pd);
assert(pd->type == PD_ACCOUNT);
parent = xaccSplitGetParent(s);
parent = xaccSplitGetParent(s);
assert(parent);
switch(pd->acct.how) {
@ -1668,14 +1668,15 @@ xaccAmountMatchPredicate(Split * s, PredicateData * pd) {
switch(pd->amount.amt_sgn) {
case AMT_SGN_MATCH_CREDIT:
if(splitamt < 0.0) return 0;
if(splitamt > 0.0) return 0;
break;
case AMT_SGN_MATCH_DEBIT:
if(splitamt > 0.0) return 0;
if(splitamt < 0.0) return 0;
break;
default:
break;
}
}
return value_match_predicate(splitamt, pd);
}

71
src/engine/util.c
View File

@ -675,15 +675,17 @@ xaccPrintAmountArgs (double val, gncBoolean print_currency_symbol,
double xaccParseAmount (const char * instr, gncBoolean monetary)
{
struct lconv *lc = gnc_localeconv();
gncBoolean isneg = GNC_F;
char *mstr, *str, *tok;
double amount = 0.0;
char negative_sign;
char thousands_sep;
char decimal_point;
int len;
int isneg = 0;
if (!instr) return 0.0;
if (*instr == '\0') return 0.0;
mstr = strdup (instr);
str = mstr;
@ -699,23 +701,64 @@ double xaccParseAmount (const char * instr, gncBoolean monetary)
decimal_point = lc->decimal_point[0];
}
/* strip off garbage at end of the line */
tok = strchr (str, '\r');
if (tok) *tok = 0x0;
tok = strchr (str, '\n');
if (tok) *tok = 0x0;
/* strip off garbage at the beginning of the line */
while (*str != '\0')
{
switch (*str)
{
case '\r':
case '\n':
case ' ':
case '\t':
str++;
continue;
break;
}
/* search for a negative sign */
tok = strchr (str, negative_sign);
if (tok) {
isneg = 1;
str = tok + sizeof(char);
break;
}
/* look for a negative sign */
if (*str == negative_sign) {
isneg = GNC_T;
str++;
}
if (*str == '\0') return 0.0;
/* go to end of string */
for (tok = str; *tok != '\0'; tok++)
;
/* strip off garbage at end of the line */
while (--tok != str)
{
switch (*tok)
{
case '\r':
case '\n':
case ' ':
case '\t':
continue;
break;
}
break;
}
/* look for a negative sign at the end, some locales allow it,
* we'll just allow it everywhere. */
if (*tok == negative_sign) {
isneg = GNC_T;
*tok = '\0';
}
if (*str == '\0') return 0.0;
/* remove thousands separator */
tok = strchr (str, thousands_sep);
while (tok) {
*tok = 0x0;
*tok = '\0';
amount *= 1000.0;
amount += ((double) (1000 * atoi (str)));
str = tok + sizeof(char);
@ -725,7 +768,7 @@ double xaccParseAmount (const char * instr, gncBoolean monetary)
/* search for a decimal point */
tok = strchr (str, decimal_point);
if (tok) {
*tok = 0x0;
*tok = '\0';
amount += ((double) (atoi (str)));
str = tok + sizeof(char);
@ -735,7 +778,7 @@ double xaccParseAmount (const char * instr, gncBoolean monetary)
/* strip off garbage at end of the line */
tok = strchr (str, ' ');
if (tok) *tok = 0x0;
if (tok) *tok = '\0';
/* adjust for number of decimal places */
len = strlen(str);