[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 8a68504 4/9: Call Reconcile() when reading al
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 8a68504 4/9: Call Reconcile() when reading all external input files |
Date: |
Thu, 12 Jul 2018 13:12:58 -0400 (EDT) |
branch: master
commit 8a68504efefee1959d74d5bd76402d06eeec43c2
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Call Reconcile() when reading all external input files
Previously, this was done only for '.cns' input; now, it's done for
'.ill' input as well. (Others like '.gpt' never come from external
sources.) This change may seem pointless per se, because loading an
'.ill' file immediately opens the tabbed dialog, thereby triggering
Reconcile() (and external files are not customarily used with CLI
builds that have no dialog to open). However, it isn't a bad idea to
handle both types of (external) files in the same way now, and soon
it will become a very good idea because an additional validation step
is about to be added.
---
single_cell_document.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/single_cell_document.cpp b/single_cell_document.cpp
index b34d426..5944617 100644
--- a/single_cell_document.cpp
+++ b/single_cell_document.cpp
@@ -124,6 +124,10 @@ void single_cell_document::parse(xml_lmi::dom_parser
const& parser)
// returning "*begin()" from front() actually results in a
// dangling reference'.
*elements.begin() >> input_data_;
+ if(data_source_is_external(parser.document()))
+ {
+ input_data_.Reconcile();
+ }
}
/// Ascertain whether input file comes from a system other than lmi.
- [lmi-commits] [lmi] master updated (f5c7c0b -> 34bd9e1), Greg Chicares, 2018/07/12
- [lmi-commits] [lmi] master 8c11196 1/9: Work around a compiler warning, Greg Chicares, 2018/07/12
- [lmi-commits] [lmi] master 899a163 3/9: Improve documentation, Greg Chicares, 2018/07/12
- [lmi-commits] [lmi] master 8a68504 4/9: Call Reconcile() when reading all external input files,
Greg Chicares <=
- [lmi-commits] [lmi] master c28ef2c 5/9: Demonstrate substitutability of alert streams, Greg Chicares, 2018/07/12
- [lmi-commits] [lmi] master 34bd9e1 9/9: Designate release candidate 20180712T1708Z, Greg Chicares, 2018/07/12
- [lmi-commits] [lmi] master ed63bee 2/9: Enable GUI test to preserve 'configurable_settings.xml', Greg Chicares, 2018/07/12
- [lmi-commits] [lmi] master 2a0823a 8/9: Throw an exception if schema validation fails, Greg Chicares, 2018/07/12
- [lmi-commits] [lmi] master d28f769 7/9: Improve certain error messages, Greg Chicares, 2018/07/12
- [lmi-commits] [lmi] master 7aaa73e 6/9: Validate external input more stringently, Greg Chicares, 2018/07/12