Added new --set-acount and --set-payee options

These fully generalize the previous --payee-as-account and such options,
which, for example, is now implemented to be the same as saying,
"--set-account payee".

1 files changed, 26 insertions, 6 deletions

diff --git a/src/chain.cc b/src/chain.cc
index 64881c6f..1d24aafb 100644
--- a/src/chain.cc
+++ b/src/chain.cc
@@ -195,16 +195,36 @@ xact_handler_ptr chain_xact_handlers(report_t&	      report,
 		     report));
   }
 
-  if (report.HANDLED(comm_as_payee))
-    handler.reset(new set_comm_as_payee(handler));
+  if (report.HANDLED(set_account_))
+    handler.reset(new transfer_details(handler, transfer_details::SET_ACCOUNT,
+				       report.session.master.get(),
+				       report.HANDLER(set_account_).str(),
+				       report));
+  else if (report.HANDLED(set_payee_))
+    handler.reset(new transfer_details(handler, transfer_details::SET_PAYEE,
+				       report.session.master.get(),
+				       report.HANDLER(set_payee_).str(),
+				       report));
+  else if (report.HANDLED(comm_as_payee))
+    handler.reset(new transfer_details(handler, transfer_details::SET_PAYEE,
+				       report.session.master.get(),
+				       expr_t("commodity"), report));
   else if (report.HANDLED(code_as_payee))
-    handler.reset(new set_code_as_payee(handler));
+    handler.reset(new transfer_details(handler, transfer_details::SET_PAYEE,
+				       report.session.master.get(),
+				       expr_t("code"), report));
   else if (report.HANDLED(payee_as_account))
-    handler.reset(new set_payee_as_account(handler, report.session.master.get()));
+    handler.reset(new transfer_details(handler, transfer_details::SET_ACCOUNT,
+				       report.session.master.get(),
+				       expr_t("payee"), report));
   else if (report.HANDLED(comm_as_account))
-    handler.reset(new set_comm_as_account(handler, report.session.master.get()));
+    handler.reset(new transfer_details(handler, transfer_details::SET_ACCOUNT,
+				       report.session.master.get(),
+				       expr_t("commodity"), report));
   else if (report.HANDLED(code_as_account))
-    handler.reset(new set_code_as_account(handler, report.session.master.get()));
+    handler.reset(new transfer_details(handler, transfer_details::SET_ACCOUNT,
+				       report.session.master.get(),
+				       expr_t("code"), report));
 
   return handler;
 }