first implementation of --depth for register

2 files changed, 29 insertions, 29 deletions

diff --git a/src/filters.cc b/src/filters.cc
index 02f0e79b..f7321438 100644
--- a/src/filters.cc
+++ b/src/filters.cc
@@ -448,10 +448,10 @@ void collapse_posts::report_subtotal()
     DEBUG("filters.collapse", "Pseudo-xact date = " << *xact._date);
     DEBUG("filters.collapse", "earliest date    = " << earliest_date);
     DEBUG("filters.collapse", "latest date      = " << latest_date);
-
-    foreach (post_t * post, component_posts) {
-			handle_value(/* value=      */ subtotal,
-									 /* account=    */ find_totals_account(post->account),
+		
+		foreach (totals_map::value_type& pat, totals) {
+			handle_value(/* value=      */ pat.second,
+									 /* account=    */ &temps.create_account(pat.first),
 									 /* xact=       */ &xact,
 									 /* temps=      */ temps,
 									 /* handler=    */ handler,
@@ -461,6 +461,7 @@ void collapse_posts::report_subtotal()
 
   }
 
+	totals.clear();
   component_posts.clear();
 
   last_xact = NULL;
@@ -469,19 +470,14 @@ void collapse_posts::report_subtotal()
   count     = 0;
 }
 
-account_t* collapse_posts::find_totals_account(account_t* account)
+value_t& collapse_posts::find_totals(account_t* account)
 {
-  unsigned short depth=2;
+  unsigned short depth=3;
   if(account->depth==depth)
-  {
-    string name=account->fullname();
-    account_t*& acc = totals_accounts[name];
-    if(acc==NULL)
-      acc= &temps.create_account(name);
-    return acc;
-  }
-  //recurse
-  return find_totals_account(account->parent);
+    return totals[account->fullname()];
+	
+  //else recurse
+  return find_totals(account->parent);
 }
 
 void collapse_posts::operator()(post_t& post)
@@ -493,6 +489,7 @@ void collapse_posts::operator()(post_t& post)
     report_subtotal();
 
   post.add_to_value(subtotal, amount_expr);
+  post.add_to_value(find_totals(post.account), amount_expr);
 
   component_posts.push_back(&post);
 
diff --git a/src/filters.h b/src/filters.h
index f05ddaa1..d6e1b6fc 100644
--- a/src/filters.h
+++ b/src/filters.h
@@ -421,18 +421,21 @@ public:
 
 class collapse_posts : public item_handler<post_t>
 {
-  expr_t&                      amount_expr;
-  predicate_t                  display_predicate;
-  predicate_t                  only_predicate;
-  value_t                      subtotal;
-  std::size_t                  count;
-  xact_t *                     last_xact;
-  post_t *                     last_post;
-  temporaries_t                temps;
-  std::map<string,account_t *> totals_accounts;
-  bool                         only_collapse_if_zero;
-  std::list<post_t *>          component_posts;
-  report_t&                    report;
+
+  typedef std::map<string,value_t> totals_map;
+  
+  expr_t&             amount_expr;
+  predicate_t         display_predicate;
+  predicate_t         only_predicate;
+  value_t             subtotal;
+  std::size_t         count;
+  xact_t *            last_xact;
+  post_t *            last_post;
+  temporaries_t       temps;
+  totals_map          totals;
+  bool                only_collapse_if_zero;
+  std::list<post_t *> component_posts;
+  report_t&           report;
 
   collapse_posts();
 
@@ -454,7 +457,7 @@ public:
     TRACE_DTOR(collapse_posts);
     handler.reset();
   }
-  account_t* find_totals_account(account_t* account);
+  value_t& find_totals(account_t* account);
 
   virtual void flush() {
     report_subtotal();
@@ -476,7 +479,7 @@ public:
     last_post = NULL;
 
     temps.clear();
-    totals_accounts.clear();
+    totals.clear();
     component_posts.clear();
 
     item_handler<post_t>::clear();