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

(parse): Corrected error reporting lines when it is a Ledger error.

Browse source
This commit is contained in:
John Wiegley 2005-02-03 05:08:14 +00:00
parent 8f63d2d172
commit 911c178394
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnucash.cc
View file

@ -317,7 +317,8 @@ unsigned int gnucash_parser_t::parse(std::istream& in,
usd = new commodity_t("$", 2, COMMODITY_STYLE_THOUSANDS);
commodity_t::add_commodity(usd, "USD");
XML_Parser parser = XML_ParserCreate(NULL);
unsigned int offset = 2;
XML_Parser parser = XML_ParserCreate(NULL);
current_parser = parser;
XML_SetElementHandler(parser, startElement, endElement);
@ -325,8 +326,9 @@ unsigned int gnucash_parser_t::parse(std::istream& in,
while (! in.eof()) {
in.getline(buf, BUFSIZ - 1);
std::strcat(buf, "\n");
if (! XML_Parse(parser, buf, std::strlen(buf), in.eof())) {
unsigned long line = XML_GetCurrentLineNumber(parser);
unsigned long line = XML_GetCurrentLineNumber(parser) - offset++;
const char * msg = XML_ErrorString(XML_GetErrorCode(parser));
XML_ParserFree(parser);
throw parse_error(original_file ? *original_file : "<gnucash>", line,
@ -334,7 +336,7 @@ unsigned int gnucash_parser_t::parse(std::istream& in,
}
if (! have_error.empty()) {
unsigned long line = XML_GetCurrentLineNumber(parser);
unsigned long line = XML_GetCurrentLineNumber(parser) - offset++;
parse_error err(original_file ? *original_file : "<gnucash>", line,
have_error);
std::cerr << "Error: " << err.what() << std::endl;