Moved chain_xact_handlers into its own file, chain.h and chain.cc.

1 files changed, 6 insertions, 189 deletions

diff --git a/src/report.cc b/src/report.cc
index f33ece1f..d0760a03 100644
--- a/src/report.cc
+++ b/src/report.cc
@@ -30,200 +30,17 @@
  */
 
 #include "report.h"
+#include "iterators.h"
+#include "filters.h"
+#include "chain.h"
 #include "output.h"
-#include "reconcile.h"
 
 namespace ledger {
 
-xact_handler_ptr
-report_t::chain_xact_handlers(xact_handler_ptr base_handler,
-			      const bool handle_individual_xacts)
-{
-  bool remember_components = false;
-
-  xact_handler_ptr handler(base_handler);
-
-  // format_xacts write each xact received to the
-  // output stream.
-  if (handle_individual_xacts) {
-    // truncate_entries cuts off a certain number of _entries_ from
-    // being displayed.  It does not affect calculation.
-    if (head_entries || tail_entries)
-      handler.reset(new truncate_entries(handler, head_entries, tail_entries));
-
-    // filter_xacts will only pass through xacts matching the
-    // `display_predicate'.
-    if (! display_predicate.empty())
-      handler.reset(new filter_xacts(handler, display_predicate));
-
-    // calc_xacts computes the running total.  When this
-    // appears will determine, for example, whether filtered
-    // xacts are included or excluded from the running total.
-    handler.reset(new calc_xacts(handler));
-
-    // component_xacts looks for reported xact that
-    // match the given `descend_expr', and then reports the
-    // xacts which made up the total for that reported
-    // xact.
-    if (! descend_expr.empty()) {
-      std::list<std::string> descend_exprs;
-
-      std::string::size_type beg = 0;
-      for (std::string::size_type pos = descend_expr.find(';');
-	   pos != std::string::npos;
-	   beg = pos + 1, pos = descend_expr.find(';', beg))
-	descend_exprs.push_back(std::string(descend_expr, beg, pos - beg));
-      descend_exprs.push_back(std::string(descend_expr, beg));
-
-      for (std::list<std::string>::reverse_iterator i =
-	     descend_exprs.rbegin();
-	   i != descend_exprs.rend();
-	   i++)
-	handler.reset(new component_xacts(handler, *i));
-
-      remember_components = true;
-    }
-
-    // reconcile_xacts will pass through only those
-    // xacts which can be reconciled to a given balance
-    // (calculated against the xacts which it receives).
-    if (! reconcile_balance.empty()) {
-      date_t cutoff = current_date;
-      if (! reconcile_date.empty())
-	cutoff = parse_date(reconcile_date);
-      handler.reset(new reconcile_xacts
-		    (handler, value_t(reconcile_balance), cutoff));
-    }
-
-    // filter_xacts will only pass through xacts
-    // matching the `secondary_predicate'.
-    if (! secondary_predicate.empty())
-      handler.reset(new filter_xacts(handler, secondary_predicate));
-
-    // sort_xacts will sort all the xacts it sees, based
-    // on the `sort_order' value expression.
-    if (! sort_string.empty()) {
-      if (entry_sort)
-	handler.reset(new sort_entries(handler, sort_string));
-      else
-	handler.reset(new sort_xacts(handler, sort_string));
-    }
-
-    // changed_value_xacts adds virtual xacts to the
-    // list to account for changes in market value of commodities,
-    // which otherwise would affect the running total unpredictably.
-    if (show_revalued)
-      handler.reset(new changed_value_xacts(handler, total_expr,
-					    show_revalued_only));
-
-    // collapse_xacts causes entries with multiple xacts
-    // to appear as entries with a subtotaled xact for each
-    // commodity used.
-    if (show_collapsed)
-      handler.reset(new collapse_xacts(handler, session));
-
-    // subtotal_xacts combines all the xacts it receives
-    // into one subtotal entry, which has one xact for each
-    // commodity in each account.
-    //
-    // period_xacts is like subtotal_xacts, but it
-    // subtotals according to time periods rather than totalling
-    // everything.
-    //
-    // dow_xacts is like period_xacts, except that it
-    // reports all the xacts that fall on each subsequent day
-    // of the week.
-    if (show_subtotal)
-      handler.reset(new subtotal_xacts(handler, remember_components));
-
-    if (days_of_the_week)
-      handler.reset(new dow_xacts(handler, remember_components));
-    else if (by_payee)
-      handler.reset(new by_payee_xacts(handler, remember_components));
-
-    // interval_xacts groups xacts together based on a
-    // time period, such as weekly or monthly.
-    if (! report_period.empty()) {
-      handler.reset(new interval_xacts(handler, report_period,
-					      remember_components));
-      handler.reset(new sort_xacts(handler, "d"));
-    }
-  }
-
-  // invert_xacts inverts the value of the xacts it
-  // receives.
-  if (show_inverted)
-    handler.reset(new invert_xacts(handler));
-
-  // related_xacts will pass along all xacts related
-  // to the xact received.  If `show_all_related' is true,
-  // then all the entry's xacts are passed; meaning that if
-  // one xact of an entry is to be printed, all the
-  // xact for that entry will be printed.
-  if (show_related)
-    handler.reset(new related_xacts(handler, show_all_related));
-
-  // anonymize_xacts removes all meaningful information from entry
-  // payee's and account names, for the sake of creating useful bug
-  // reports.
-  if (anonymize)
-    handler.reset(new anonymize_xacts(handler));
-
-  // This filter_xacts will only pass through xacts
-  // matching the `predicate'.
-  if (! predicate.empty()) {
-    DEBUG("report.predicate",
-	  "Report predicate expression = " << predicate);
-    handler.reset(new filter_xacts(handler, predicate));
-  }
-
-#if 0
-  // budget_xacts takes a set of xacts from a data
-  // file and uses them to generate "budget xacts" which
-  // balance against the reported xacts.
-  //
-  // forecast_xacts is a lot like budget_xacts, except
-  // that it adds entries only for the future, and does not balance
-  // them against anything but the future balance.
-
-  if (budget_flags) {
-    budget_xacts * budget_handler
-      = new budget_xacts(handler, budget_flags);
-    budget_handler->add_period_entries(journal->period_entries);
-    handler.reset(budget_handler);
-
-    // Apply this before the budget handler, so that only matching
-    // xacts are calculated toward the budget.  The use of
-    // filter_xacts above will further clean the results so
-    // that no automated xacts that don't match the filter get
-    // reported.
-    if (! predicate.empty())
-      handler.reset(new filter_xacts(handler, predicate));
-  }
-  else if (! forecast_limit.empty()) {
-    forecast_xacts * forecast_handler
-      = new forecast_xacts(handler, forecast_limit);
-    forecast_handler->add_period_entries(journal->period_entries);
-    handler.reset(forecast_handler);
-
-    // See above, under budget_xacts.
-    if (! predicate.empty())
-      handler.reset(new filter_xacts(handler, predicate));
-  }
-#endif
-
-  if (comm_as_payee)
-    handler.reset(new set_comm_as_payee(handler));
-  else if (code_as_payee)
-    handler.reset(new set_code_as_payee(handler));
-
-  return handler;
-}
-
 void report_t::xacts_report(xact_handler_ptr handler)
 {
   session_xacts_iterator walker(session);
-  pass_down_xacts(chain_xact_handlers(handler), walker);
+  pass_down_xacts(chain_xact_handlers(*this, handler), walker);
 
   if (DO_VERIFY())
     session.clean_xacts();
@@ -232,7 +49,7 @@ void report_t::xacts_report(xact_handler_ptr handler)
 void report_t::entry_report(xact_handler_ptr handler, entry_t& entry)
 {
   entry_xacts_iterator walker(entry);
-  pass_down_xacts(chain_xact_handlers(handler), walker);
+  pass_down_xacts(chain_xact_handlers(*this, handler), walker);
 
   if (DO_VERIFY())
     session.clean_xacts(entry);
@@ -242,7 +59,7 @@ void report_t::sum_all_accounts()
 {
   session_xacts_iterator walker(session);
   pass_down_xacts
-    (chain_xact_handlers(xact_handler_ptr(new set_account_value), false),
+    (chain_xact_handlers(*this, xact_handler_ptr(new set_account_value), false),
      walker);
   session.master->calculate_sums();
 }