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