Tweak output messages and filenames.

JGCRI · Sep 20, 2017 · 3d4d599 · 3d4d599
1 parent 2f4f492
commit 3d4d599
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/R/mcl.R b/R/mcl.R
@@ -137,8 +137,8 @@ generate <- function(scenctl,
                      tabs = getOption('iamrpt.tabs', TRUE),
                      outputdir = getwd())
 {
-    scenctl <- readr::read_csv(scenctl)
-    varctl <- readr::read_csv(varctl)
+    suppressMessages({scenctl <- readr::read_csv(scenctl)})
+    suppressMessages({varctl <- readr::read_csv(varctl)})
 
     validatectl(scenctl, varctl)
 
@@ -164,15 +164,15 @@ generate <- function(scenctl,
 
 
     if(fileformat == 'XLSX') {
-        output_xlsx(rslts, tabs, dbloc)
+        output_xlsx(rslts, tabs, outputdir)
     }
     else if(fileformat == 'CSV') {
-        output_csv(rslts, tabs, dbloc)
+        output_csv(rslts, tabs, outputdir)
     }
     else {
         warning('Unknown file format ', fileformat, ' requested. ',
                 'Writing as CSV.')
-        output_csv(rslts, tabs, dbloc)
+        output_csv(rslts, tabs, outputdir)
     }
 
     message('FIN.')

diff --git a/R/output.R b/R/output.R
@@ -33,13 +33,16 @@ output_csv <- function(rslts, tabs, dirname)
     if(tabs) {
         ## One file for each table
         for(tblname in names(rslts)) {
-            filename <- alternate_filename(file.path(dirname, paste0(tblname, '.csv')))
+            filename <- alternate_filename(file.path(dirname, paste0(tblname,
+                                                                     '.csv')))
+            message('Writing file ', filename)
             readr::write_csv(rslts[[tblname]], filename)
         }
     }
     else {
         ## Single file in PITA format.
         filename <- alternate_filename(file.path(dirname, 'iamrpt.csv'))
+        message('Writing file ', filename)
         fcon <- file(filename, 'w')
         line1 <- TRUE
         for(tblname in names(rslts)) {