sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #89 from kljohann/bugs.convert

Browse source 
fix several ledger convert bugs
This commit is contained in:
John Wiegley 2012-10-15 09:45:23 -07:00
commit 385cbd25b9
8 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/csv.cc
View file

@ -166,7 +166,7 @@ xact_t * csv_reader::read_xact(bool rich_data)
string total;
string field;
while (instr.good() && ! instr.eof()) {
while (instr.good() && ! instr.eof() && n < index.size()) {
field = read_field(instr);
switch (index[n]) {
@ -175,7 +175,8 @@ xact_t * csv_reader::read_xact(bool rich_data)
break;
case FIELD_DATE_AUX:
xact->_date_aux = parse_date(field);
if (! field.empty())
xact->_date_aux = parse_date(field);
break;
case FIELD_CODE:
@ -224,7 +225,8 @@ xact_t * csv_reader::read_xact(bool rich_data)
break;
case FIELD_NOTE:
xact->note = field;
if (! field.empty())
xact->note = field;
break;
case FIELD_UNKNOWN:

2
test/baseline/cmd-convert.test
View file

@ -4,7 +4,7 @@ test -f /dev/null --input-date-format "%m/%d/%Y" convert test/baseline/cmd-conve
Expenses:Unknown $10
Equity:Unknown $-10 = $20
2011/12/12=2011/12/12 * ;
2011/12/12=2011/12/12 *
Expenses:Unknown $10
Equity:Unknown
end test

3
test/regress/0DDDEBC0.dat Normal file
View file

@ -0,0 +1,3 @@
date,posted,amount,
12/12/2011,12/13/2011,$10,
12/12/2011,,$20,

9
test/regress/0DDDEBC0.test Normal file
View file

@ -0,0 +1,9 @@
test -f /dev/null --input-date-format '%m/%d/%Y' convert test/regress/0DDDEBC0.dat
2011/12/12=2011/12/13 *
Expenses:Unknown $10
Equity:Unknown
2011/12/12 *
Expenses:Unknown $20
Equity:Unknown
end test

2
test/regress/68917252.dat Normal file
View file

@ -0,0 +1,2 @@
date,amount,
12/12/2011,10,test,extra,fields

5
test/regress/68917252.test Normal file
View file

@ -0,0 +1,5 @@
test -f /dev/null --input-date-format "%m/%d/%Y" convert test/regress/68917252.dat
2011/12/12 *
Expenses:Unknown 10
Equity:Unknown
end test

3
test/regress/A3FA7601.dat Normal file
View file

@ -0,0 +1,3 @@
date,posted,code,payee,amount,total,note,
12/12/2011,12/13/2011,100,Test,$10,$20,test,
12/12/2011,12/12/2011,,,$10,$20,

9
test/regress/A3FA7601.test Normal file
View file

@ -0,0 +1,9 @@
test -f /dev/null --input-date-format '%m/%d/%Y' convert test/regress/A3FA7601.dat
2011/12/12=2011/12/13 * (100) Test ;test
Expenses:Unknown $10
Equity:Unknown $-10 = $20
2011/12/12=2011/12/12 *
Expenses:Unknown $10
Equity:Unknown $-10 = $20
end test