[lmi-commits] [lmi] master e503910 2/2: Write most output files to print directory

[Greg Chicares]

branch: master
commit e503910198ee1a00b7c518d2d8ed4c3402fe8073
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Write most output files to print directory
---
 emit_ledger.cpp             | 10 ++++++----
 wx_test_validate_output.cpp |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/emit_ledger.cpp b/emit_ledger.cpp
index b9feef7..407a695 100644
--- a/emit_ledger.cpp
+++ b/emit_ledger.cpp
@@ -57,19 +57,21 @@ ledger_emitter::ledger_emitter
     LMI_ASSERT(!case_filepath_.empty());
 
     configurable_settings const& c = configurable_settings::instance();
-    std::string const& tsv_ext = c.spreadsheet_file_extension();
+    std::string const& tsv_ext   = c.spreadsheet_file_extension();
+    std::string const& print_dir = c.print_directory();
+    fs::path const f(modify_directory(case_filepath_, print_dir));
 
     if(emission_ & mce_emit_spreadsheet)
         {
-        case_filepath_spreadsheet_  = unique_filepath(case_filepath,           
  tsv_ext);
+        case_filepath_spreadsheet_  = unique_filepath(f,             tsv_ext);
         }
     if(emission_ & mce_emit_group_roster)
         {
-        case_filepath_group_roster_ = unique_filepath(case_filepath, ".roster" 
+ tsv_ext);
+        case_filepath_group_roster_ = unique_filepath(f, ".roster" + tsv_ext);
         }
     if(emission_ & mce_emit_group_quote)
         {
-        case_filepath_group_quote_  = unique_filepath(case_filepath, 
".quote.pdf"       );
+        case_filepath_group_quote_  = unique_filepath(f, ".quote.pdf"       );
         }
 }
 
diff --git a/wx_test_validate_output.cpp b/wx_test_validate_output.cpp
index ca679d0..a431dc8 100644
--- a/wx_test_validate_output.cpp
+++ b/wx_test_validate_output.cpp
@@ -264,7 +264,8 @@ void validate_print_case_output
         ,std::string const& insured_name
         )
 {
-    std::string const census_file(corp_name + tsv_ext());
+    fs::path p(configurable_settings::instance().print_directory());
+    std::string const census_file((p / (corp_name + tsv_ext())).string());
     output_file_existence_checker output_census(census_file);
 
     struct print_case
@@ -296,7 +297,8 @@ void validate_print_roster_output
         ,std::string const& insured_name
         )
 {
-    std::string const roster_file(corp_name + ".roster" + tsv_ext());
+    fs::path p(configurable_settings::instance().print_directory());
+    std::string const roster_file((p / (corp_name + ".roster" + 
tsv_ext())).string());
     output_file_existence_checker output_roster(roster_file);
 
     struct print_roster