[lmi-commits] [lmi] master a3865d5 4/4: Rename a variable for clarity

[Greg Chicares]

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

    Rename a variable for clarity
    
    "Glastonbury" is a "city"; "Glastonbury CT 06033" is not.
    
    Incidentally improved formatting, so that if the agent city is empty,
    it's not followed by ", ", i.e.:
    - ,CT 06033
    +CT 06033
---
 cover.mst                 |  2 +-
 ill_reg_header.mst        |  2 +-
 ledger_invariant.cpp      |  4 ++--
 ledger_invariant.hpp      |  2 +-
 ledger_invariant_init.cpp | 18 +++++++++++-------
 ledger_text_formats.cpp   |  4 ++--
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/cover.mst b/cover.mst
index 4e753d4..cd6d335 100644
--- a/cover.mst
+++ b/cover.mst
@@ -102,7 +102,7 @@
     <tr>
         <td align="center">
             <font size="+2">
-                {{ProducerCity}}
+                {{ProducerCityEtc}}
             </font>
         </td>
     </tr>
diff --git a/ill_reg_header.mst b/ill_reg_header.mst
index 951db5a..051c8e5 100644
--- a/ill_reg_header.mst
+++ b/ill_reg_header.mst
@@ -33,7 +33,7 @@
     <br>{{InsCoName}}
     <br>Presented by: {{ProducerName}}
     <br>{{ProducerStreet}}
-    <br>{{ProducerCity}}
+    <br>{{ProducerCityEtc}}
 </p>
 <p>
 </p>
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index 6d112b7..d223b73 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -306,7 +306,7 @@ void LedgerInvariant::Alloc(int len)
     Strings["ProductName"                   ] = &ProductName                   
;
     Strings["ProducerName"                  ] = &ProducerName                  
;
     Strings["ProducerStreet"                ] = &ProducerStreet                
;
-    Strings["ProducerCity"                  ] = &ProducerCity                  
;
+    Strings["ProducerCityEtc"               ] = &ProducerCityEtc               
;
     Strings["CorpName"                      ] = &CorpName                      
;
     Strings["MasterContractNumber"          ] = &MasterContractNumber          
;
     Strings["ContractNumber"                ] = &ContractNumber                
;
@@ -524,7 +524,7 @@ LedgerInvariant& LedgerInvariant::PlusEq(LedgerInvariant 
const& a_Addend)
     ProductName                   = a_Addend.ProductName;
     ProducerName                  = a_Addend.ProducerName;
     ProducerStreet                = a_Addend.ProducerStreet;
-    ProducerCity                  = a_Addend.ProducerCity;
+    ProducerCityEtc               = a_Addend.ProducerCityEtc;
     // This would necessarily vary by life:
 //  ContractNumber                = "";
 
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index 35986e2..d3cfaa3 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -344,7 +344,7 @@ class LMI_SO LedgerInvariant
     std::string     ProductName;
     std::string     ProducerName;
     std::string     ProducerStreet;
-    std::string     ProducerCity;
+    std::string     ProducerCityEtc;
     std::string     CorpName;
     std::string     MasterContractNumber;
     std::string     ContractNumber;
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index 5d1eb02..8bc2d24 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -411,18 +411,22 @@ void LedgerInvariant::Init(BasicValues const* b)
     ProductName             = b->yare_input_.ProductName;
     ProducerName            = b->yare_input_.AgentName;
 
-    std::string agent_city     = b->yare_input_.AgentCity;
-    std::string agent_state    = mc_str(b->yare_input_.AgentState);
-    std::string agent_zip_code = b->yare_input_.AgentZipCode;
-    std::string agent_city_etc(agent_city + ", " + agent_state);
+    std::string const agent_city     = b->yare_input_.AgentCity;
+    std::string const agent_state    = mc_str(b->yare_input_.AgentState);
+    std::string const agent_zip_code = b->yare_input_.AgentZipCode;
+    // This is a two-letter USPS abbreviation, so it's never empty.
+    std::string agent_city_etc(agent_state);
+    if(!agent_city.empty())
+        {
+        agent_city_etc = agent_city + ", " + agent_state;
+        }
     if(!agent_zip_code.empty())
         {
-        agent_city_etc += " ";
+        agent_city_etc += " " + agent_zip_code;
         }
-    agent_city_etc += agent_zip_code;
 
     ProducerStreet          = b->yare_input_.AgentAddress;
-    ProducerCity            = agent_city_etc;
+    ProducerCityEtc         = agent_city_etc;
     CorpName                = b->yare_input_.CorporationName;
 
     MasterContractNumber    = b->yare_input_.MasterContractNumber;
diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index 0b1bcd0..1ce1292 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -459,7 +459,7 @@ void PrintCellTabDelimited
     os << "ContractNumber\t\t"    << Invar.value_str("ContractNumber" ) << 
'\n';
     os << "ProducerName\t\t"      << Invar.value_str("ProducerName"   ) << 
'\n';
     os << "ProducerStreet\t\t"    << Invar.value_str("ProducerStreet" ) << 
'\n';
-    os << "ProducerCity\t\t"      << Invar.value_str("ProducerCity"   ) << 
'\n';
+    os << "ProducerCityEtc\t\t"   << Invar.value_str("ProducerCityEtc") << 
'\n';
     os << "CorpName\t\t"          << Invar.value_str("CorpName"       ) << 
'\n';
     os << "Insured1\t\t"          << Invar.value_str("Insured1"       ) << 
'\n';
     os << "Gender\t\t"            << Invar.value_str("Gender"         ) << 
'\n';
@@ -916,7 +916,7 @@ void FlatTextLedgerPrinter::PrintHeader() const
     os_ << center("Prepared on " + iso_8601_datestamp_terse() + " by") << 
endrow;
     os_ << center(invar().ProducerName) << endrow;
     os_ << center(invar().ProducerStreet) << endrow;
-    os_ << center(invar().ProducerCity) << endrow;
+    os_ << center(invar().ProducerCityEtc) << endrow;
     if(ledger_.is_composite())
         {
         os_ << "Composite" << endrow;