Correzioni varie a config.cpp

git-svn-id: svn://10.65.10.50/trunk@973 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-02-06 13:38:34 +00:00
parent cd964a4d3e
commit c9691ad83b

View File

@ -23,27 +23,29 @@ bool TConfig::_read_paragraph()
{ {
itwas = TRUE; itwas = TRUE;
// populate array // populate array
TString l, key, val; TString key, val;
for (;;) for (;;)
{ {
l = scan.line(); const TString& l = scan.line();
if (l[0] == '#') continue; if (l == "" || l[0] == '[') break; // Fine paragrafo
if (l == "" || l[0] == '[') break; if (l[0] == '#' || l[0] == '/') continue; // Riga di commento
int ind = l.find('=');
const int ind = l.find('=');
if (ind == -1) if (ind == -1)
{ {
warning_box("Errore configurazione: file %s, vicino alla riga %ud", error_box("Errore configurazione: file %s, vicino alla riga %ud: %s",
(const char*)_file, scan.linenum()); (const char*)_file, scan.linenum(), (const char*)l);
continue; continue;
} }
key = l.left(ind); key.trim(); key = l.left(ind); key.trim();
val = l.mid(ind+1); val.trim(); val = l.mid(ind+1); val.trim();
if (val == "%yr%")
val.format("%04d", TDate(TODAY).year()); if (val[0] == '%')
else {
if (val == "%frm%") if (val == "%yr%") val.format("%04d", TDate(TODAY).year()); else
val.format("%05ld", main_app().get_firm()); if (val == "%frm%") val.format("%05ld", main_app().get_firm());
}
// sostituzione abilitata // sostituzione abilitata
_data.add(key,val,TRUE); _data.add(key,val,TRUE);
} }