[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [6229] Don't overwrite input file
From: |
Greg Chicares |
Subject: |
[lmi-commits] [6229] Don't overwrite input file |
Date: |
Mon, 03 Aug 2015 17:04:50 +0000 |
Revision: 6229
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6229
Author: chicares
Date: 2015-08-03 17:04:49 +0000 (Mon, 03 Aug 2015)
Log Message:
-----------
Don't overwrite input file
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/emit_ledger.cpp
lmi/trunk/illustrator.cpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-08-03 16:26:17 UTC (rev 6228)
+++ lmi/trunk/ChangeLog 2015-08-03 17:04:49 UTC (rev 6229)
@@ -36458,3 +36458,15 @@
illustration_view.hpp
Refactor for concision.
+20150803T1626Z <address@hidden> [508]
+
+ illustration_document.cpp
+Improve documentation.
+
+20150803T1704Z <address@hidden> [508]
+
+ emit_ledger.cpp
+ illustrator.cpp
+Don't overwrite input file. See:
+ http://lists.nongnu.org/archive/html/lmi/2015-07/msg00030.html
+
Modified: lmi/trunk/emit_ledger.cpp
===================================================================
--- lmi/trunk/emit_ledger.cpp 2015-08-03 16:26:17 UTC (rev 6228)
+++ lmi/trunk/emit_ledger.cpp 2015-08-03 17:04:49 UTC (rev 6229)
@@ -160,11 +160,23 @@
}
if(emission & mce_emit_custom_0)
{
- custom_io_0_write(ledger, filepath.string());
+ configurable_settings const& c = configurable_settings::instance();
+ fs::path out_file =
+ filepath.string() == c.custom_input_0_filename()
+ ? c.custom_output_0_filename()
+ : fs::change_extension(filepath, ".test0")
+ ;
+ custom_io_0_write(ledger, out_file.string());
}
if(emission & mce_emit_custom_1)
{
- custom_io_1_write(ledger, filepath.string());
+ configurable_settings const& c = configurable_settings::instance();
+ fs::path out_file =
+ filepath.string() == c.custom_input_1_filename()
+ ? c.custom_output_1_filename()
+ : fs::change_extension(filepath, ".test1")
+ ;
+ custom_io_1_write(ledger, out_file.string());
}
done:
Modified: lmi/trunk/illustrator.cpp
===================================================================
--- lmi/trunk/illustrator.cpp 2015-08-03 16:26:17 UTC (rev 6228)
+++ lmi/trunk/illustrator.cpp 2015-08-03 17:04:49 UTC (rev 6229)
@@ -39,14 +39,14 @@
#include "input.hpp"
#include "ledgervalues.hpp"
#include "multiple_cell_document.hpp"
-#include "path_utility.hpp" // fs::path inserter
-#include "platform_dependent.hpp" // access()
+#include "path_utility.hpp" // fs::path inserter
+#include "platform_dependent.hpp" // access()
#include "single_cell_document.hpp"
#include "timer.hpp"
#include <boost/filesystem/convenience.hpp>
-#include <cstdio> // std::remove()
+#include <cstdio> // std::remove()
#include <iostream>
#include <string>
@@ -82,7 +82,6 @@
}
else if(".ini" == extension)
{
- configurable_settings const& c = configurable_settings::instance();
Timer timer;
Input input;
bool close_when_done = custom_io_0_read(input, file_path.string());
@@ -92,14 +91,9 @@
z.run(input);
principal_ledger_ = z.ledger();
seconds_for_calculations_ = timer.stop().elapsed_seconds();
- fs::path out_file =
- file_path.string() == c.custom_input_0_filename()
- ? c.custom_output_0_filename()
- : fs::change_extension(file_path, ".test0")
- ;
seconds_for_output_ = emit_ledger
- (out_file
- ,out_file
+ (file_path
+ ,file_path
,*z.ledger()
,emission_
);
@@ -108,7 +102,6 @@
}
else if(".inix" == extension)
{
- configurable_settings const& c = configurable_settings::instance();
Timer timer;
Input input;
bool emit_pdf_too = custom_io_1_read(input, file_path.string());
@@ -118,15 +111,10 @@
z.run(input);
principal_ledger_ = z.ledger();
seconds_for_calculations_ = timer.stop().elapsed_seconds();
- fs::path out_file =
- file_path.string() == c.custom_input_1_filename()
- ? c.custom_output_1_filename()
- : fs::change_extension(file_path, ".test1")
- ;
mcenum_emission x = emit_pdf_too ? mce_emit_pdf_file :
mce_emit_nothing;
seconds_for_output_ = emit_ledger
- (out_file
- ,out_file
+ (file_path
+ ,file_path
,*z.ledger()
,static_cast<mcenum_emission>(x | emission_)
);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [6229] Don't overwrite input file,
Greg Chicares <=