root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correzione MI3541.

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@4218 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
angelo 1997-03-18 11:50:35 +00:00
parent 4067e2329b
commit 0f86adfeae
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cg/cglib04.cpp
View File

@ -323,6 +323,7 @@ TTransfer_file::TTransfer_file(char scelta)
_tot_rec = 0L;
_numreg_p = 0L;
_numreg_piva = 0L;
_scelta = scelta;
_control_rec = new TFixed_string(__dep, LEN_REC_HEAD);
if (scelta == 'S')
_trc.leggi_modulo(tracciato_AS);
@ -4179,7 +4180,7 @@ void TTransfer_file::write_testata_movimenti(TString& record)
if (fname == MOV_DESCR)
{
field.trim();
if (field.empty())
if (field.empty() && _scelta == 'S')
field = descr;
}
@ -5017,22 +5018,23 @@ void TTransfer_file::write_pagsca(TString& record)
void TMappa_trc::leggi_modulo(const char* tracciato)
{
TScanner s(tracciato);
TString16 key;
TToken_string record;
TString16 key,sigla;
while (s.ok())
{
record = s.line();
if (record.mid(0,1) == "#") continue; //Perche' e' un commento
TString sigla = record.get(0);
long numrec = record.get_long(1);
const TString& line = s.line();
if (line[0] == '#') continue; //Perche' e' un commento
TToken_string* record = new TToken_string(line);
sigla = record->get(0);
long numrec = record->get_long(1);
key.format("%2s%d", (const char*)sigla,numrec);
add(key, record);
}
#ifdef DBG
long item = items();
#endif
}
int TMappa_trc::from(const char* key)

3
cg/cglib04.h
View File

@ -194,6 +194,7 @@ class TTransfer_file
TString _SCAnumpart,_SCAnumpart_p;
real _imp,_impval;
bool _esiste_pagsca;
char _scelta;
private:
// Inizializza l'indice leggendo il record di controllo
@ -287,7 +288,7 @@ public:
void close ();
bool exist() const { return _trasfer != NULL; }
void setta_sistema(char scelta);
void setta_sistema(char scelta) ;
long get_pos(const char* key);