diff options
Diffstat (limited to 'parser.cc')
| -rw-r--r-- | parser.cc | 106 |
1 files changed, 54 insertions, 52 deletions
@@ -57,6 +57,7 @@ bool unregister_parser(parser_t * parser) } unsigned int parse_journal(std::istream& in, + config_t& config, journal_t * journal, account_t * master, const std::string * original_file) @@ -68,12 +69,13 @@ unsigned int parse_journal(std::istream& in, i != parsers->end(); i++) if ((*i)->test(in)) - return (*i)->parse(in, journal, master, original_file); + return (*i)->parse(in, config, journal, master, original_file); return 0; } unsigned int parse_journal_file(const std::string& path, + config_t& config, journal_t * journal, account_t * master, const std::string * original_file) @@ -87,48 +89,58 @@ unsigned int parse_journal_file(const std::string& path, original_file = &path; std::ifstream stream(path.c_str()); - return parse_journal(stream, journal, master, original_file); + return parse_journal(stream, config, journal, master, original_file); } -unsigned int parse_ledger_data(journal_t * journal, - const std::string& data_file, - const std::string& init_file, - const std::string& price_db, - bool use_cache, - const std::string& cache_file, - bool * cache_dirty, - parser_t * cache_parser, - parser_t * xml_parser, - parser_t * stdin_parser, - const std::string& default_account) +extern parser_t * binary_parser_ptr; +extern parser_t * xml_parser_ptr; +extern parser_t * textual_parser_ptr; + +unsigned int parse_ledger_data(config_t& config, + journal_t * journal, + parser_t * cache_parser, + parser_t * xml_parser, + parser_t * stdin_parser) { unsigned int entry_count = 0; - DEBUG_PRINT("ledger.config.cache", "3. use_cache = " << use_cache); + if (! cache_parser) + cache_parser = binary_parser_ptr; + if (! xml_parser) + xml_parser = xml_parser_ptr; + if (! stdin_parser) + stdin_parser = textual_parser_ptr; - if (! init_file.empty() && access(init_file.c_str(), R_OK) != -1) { - if (parse_journal_file(init_file, journal) || + DEBUG_PRINT("ledger.config.cache", + "3. use_cache = " << config.use_cache); + + if (! config.init_file.empty() && + access(config.init_file.c_str(), R_OK) != -1) { + if (parse_journal_file(config.init_file, config, journal) || journal->auto_entries.size() > 0 || journal->period_entries.size() > 0) throw error(std::string("Entries found in initialization file '") + - init_file + "'"); + config.init_file + "'"); journal->sources.pop_front(); // remove init file } - if (use_cache && ! cache_file.empty() && ! data_file.empty()) { - DEBUG_PRINT("ledger.config.cache", "using_cache " << cache_file); - if (cache_dirty) - *cache_dirty = true; - if (access(cache_file.c_str(), R_OK) != -1) { - std::ifstream stream(cache_file.c_str()); + if (config.use_cache && ! config.cache_file.empty() && + ! config.data_file.empty()) { + DEBUG_PRINT("ledger.config.cache", + "using_cache " << config.cache_file); + if (config.cache_dirty) + config.cache_dirty = true; + if (access(config.cache_file.c_str(), R_OK) != -1) { + std::ifstream stream(config.cache_file.c_str()); if (cache_parser && cache_parser->test(stream)) { std::string price_db_orig = journal->price_db; - journal->price_db = price_db; - entry_count += cache_parser->parse(stream, journal, NULL, &data_file); + journal->price_db = config.price_db; + entry_count += cache_parser->parse(stream, config, journal, + NULL, &config.data_file); if (entry_count > 0) { - if (cache_dirty) - *cache_dirty = false; + if (config.cache_dirty) + config.cache_dirty = false; } else { journal->price_db = price_db_orig; } @@ -136,15 +148,15 @@ unsigned int parse_ledger_data(journal_t * journal, } } - if (entry_count == 0 && ! data_file.empty()) { + if (entry_count == 0 && ! config.data_file.empty()) { account_t * acct = NULL; - if (! default_account.empty()) - acct = journal->find_account(default_account); + if (! config.account.empty()) + acct = journal->find_account(config.account); - journal->price_db = price_db; + journal->price_db = config.price_db; if (! journal->price_db.empty() && access(journal->price_db.c_str(), R_OK) != -1) { - if (parse_journal_file(journal->price_db, journal)) { + if (parse_journal_file(journal->price_db, config, journal)) { throw error("Entries not allowed in price history file"); } else { DEBUG_PRINT("ledger.config.cache", @@ -154,19 +166,22 @@ unsigned int parse_ledger_data(journal_t * journal, } DEBUG_PRINT("ledger.config.cache", - "rejected cache, parsing " << data_file); - if (data_file == "-") { - use_cache = false; + "rejected cache, parsing " << config.data_file); + if (config.data_file == "-") { + config.use_cache = false; journal->sources.push_back("<stdin>"); #if 0 if (xml_parser && std::cin.peek() == '<') - entry_count += xml_parser->parse(std::cin, journal, acct); + entry_count += xml_parser->parse(std::cin, config, journal, + acct); else if (stdin_parser) #endif - entry_count += stdin_parser->parse(std::cin, journal, acct); + entry_count += stdin_parser->parse(std::cin, config, + journal, acct); } - else if (access(data_file.c_str(), R_OK) != -1) { - entry_count += parse_journal_file(data_file, journal, acct); + else if (access(config.data_file.c_str(), R_OK) != -1) { + entry_count += parse_journal_file(config.data_file, config, + journal, acct); if (! journal->price_db.empty()) journal->sources.push_back(journal->price_db); } @@ -177,17 +192,4 @@ unsigned int parse_ledger_data(journal_t * journal, return entry_count; } -extern parser_t * binary_parser_ptr; -extern parser_t * xml_parser_ptr; -extern parser_t * textual_parser_ptr; - -unsigned int parse_ledger_data(journal_t * journal, config_t& config) -{ - return parse_ledger_data(journal, config.data_file, config.init_file, - config.price_db, config.use_cache, - config.cache_file, &config.cache_dirty, - binary_parser_ptr, xml_parser_ptr, - textual_parser_ptr, config.account); -} - } // namespace ledger |