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

Reorganized a bit of the reporting code

Browse source
This commit is contained in:
John Wiegley 2009-11-12 05:09:39 -05:00
parent 48dc654eda
commit 9858b4957f
2 changed files with 55 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/report.cc
View file

@ -218,6 +218,31 @@ void report_t::normalize_options(const string& verb)
} }
} }
void report_t::parse_query_args(const value_t& args, const string& whence)
{
query_t query(args, what_to_keep());
if (! query)
throw_(std::runtime_error,
_("Invalid query predicate: %1") << query.text());
HANDLER(limit_).on(whence, query.text());
DEBUG("report.predicate",
"Predicate = " << HANDLER(limit_).str());
if (query.tokens_remaining()) {
query.parse_again();
if (! query)
throw_(std::runtime_error,
_("Invalid display predicate: %1") << query.text());
HANDLER(display_).on(whence, query.text());
DEBUG("report.predicate",
"Display predicate = " << HANDLER(display_).str());
}
}
void report_t::posts_report(post_handler_ptr handler) void report_t::posts_report(post_handler_ptr handler)
{ {
journal_posts_iterator walker(*session.journal.get()); journal_posts_iterator walker(*session.journal.get());
@ -627,54 +652,6 @@ namespace {
value_t fn_null(call_scope_t&) { value_t fn_null(call_scope_t&) {
return NULL_VALUE; return NULL_VALUE;
} }
template <class Type = post_t,
class handler_ptr = post_handler_ptr,
void (report_t::*report_method)(handler_ptr) =
&report_t::posts_report>
class reporter
{
shared_ptr<item_handler<Type> > handler;
report_t& report;
string whence;
public:
reporter(item_handler<Type> * _handler, report_t& _report,
const string& _whence)
: handler(_handler), report(_report), whence(_whence) {}
value_t operator()(call_scope_t& args)
{
if (args.size() > 0) {
query_t query(args.value(), report.what_to_keep());
if (! query)
throw_(std::runtime_error,
_("Invalid query predicate: %1") << query.text());
report.HANDLER(limit_).on(whence, query.text());
DEBUG("report.predicate",
"Predicate = " << report.HANDLER(limit_).str());
if (query.tokens_remaining()) {
query.parse_again();
if (! query)
throw_(std::runtime_error,
_("Invalid display predicate: %1") << query.text());
report.HANDLER(display_).on(whence, query.text());
DEBUG("report.predicate",
"Display predicate = " << report.HANDLER(display_).str());
}
}
(report.*report_method)(handler_ptr(handler));
return true;
}
};
} }
value_t report_t::reload_command(call_scope_t&) value_t report_t::reload_command(call_scope_t&)

30
src/report.h
View file

@ -44,6 +44,7 @@
#include "interactive.h" #include "interactive.h"
#include "expr.h" #include "expr.h"
#include "query.h"
#include "chain.h" #include "chain.h"
#include "stream.h" #include "stream.h"
#include "option.h" #include "option.h"
@ -125,6 +126,7 @@ public:
} }
void normalize_options(const string& verb); void normalize_options(const string& verb);
void parse_query_args(const value_t& args, const string& whence);
void posts_report(post_handler_ptr handler); void posts_report(post_handler_ptr handler);
void generate_report(post_handler_ptr handler); void generate_report(post_handler_ptr handler);
@ -909,6 +911,34 @@ public:
DO_(args) { value = args[1].to_long(); specified = true; }); DO_(args) { value = args[1].to_long(); specified = true; });
}; };
template <class Type = post_t,
class handler_ptr = post_handler_ptr,
void (report_t::*report_method)(handler_ptr) =
&report_t::posts_report>
class reporter
{
shared_ptr<item_handler<Type> > handler;
report_t& report;
string whence;
public:
reporter(item_handler<Type> * _handler,
report_t& _report, const string& _whence)
: handler(_handler), report(_report), whence(_whence) {}
value_t operator()(call_scope_t& args)
{
if (args.size() > 0)
report.parse_query_args(args.value(), whence);
(report.*report_method)(handler_ptr(handler));
return true;
}
};
} // namespace ledger } // namespace ledger
#endif // _REPORT_H #endif // _REPORT_H