diff --git a/src/cg01/cglib.h b/src/cg01/cglib.h index e0ca3fb49..609a80606 100644 --- a/src/cg01/cglib.h +++ b/src/cg01/cglib.h @@ -1624,9 +1624,9 @@ public: virtual int read(word op = _isequal, word lockop = _nolock) override; virtual int remove(TBaseisamfile& f) const override; - virtual int remove() const { TBaseisamfile f(num()); return remove(f); } - virtual int write() const { TBaseisamfile f(num()); return write_rewrite(f); } - virtual int rewrite() const { TBaseisamfile f(num()); return write_rewrite(f, true); } + virtual int remove() const { TLocalisamfile f(num()); return remove(f); } + virtual int write() const { TLocalisamfile f(num()); return write_rewrite(f); } + virtual int rewrite() const { TLocalisamfile f(num()); return write_rewrite(f, true); } // Funzioni per costruttore di copia diff --git a/src/cg01/cglib07.cpp b/src/cg01/cglib07.cpp index 5043f63f1..090eedbf9 100644 --- a/src/cg01/cglib07.cpp +++ b/src/cg01/cglib07.cpp @@ -403,32 +403,12 @@ bool TAnagrafica::init(const TRectype& rec) break; case LF_NDITTE: { - const bool variata = rec.get_bool(NDT_RAGSOCVAR) && _data_mov >= rec.get_date(NDT_DATAVAR); char tipoa = rec.get_char(NDT_TIPOA); long codana = rec.get_long(NDT_CODANAGR); - - if (variata) - { - const char ntipoa = rec.get_char(NDT_NTIPOA); - - if (ntipoa > ' ') - { - tipoa = ntipoa; - codana = rec.get_long(NDT_NCODANAGR); - } - } - const bool good = init(LF_ANAG, tipoa, codana); _sociounico = rec.get_char(NDT_SOCIOUNICO); _ragsoc = rec.get(NDT_RAGSOC); - if (variata) - { - TString work = rec.get(NDT_NRAGSOC); - - if (work.full()) - _ragsoc = work; - } if (_tipo == 'G') _capitale = cache().get(LF_ANAGGIU, codana).get_real(ANG_CAPSOC); split_ragsoc(); @@ -438,19 +418,6 @@ bool TAnagrafica::init(const TRectype& rec) _regfisc = rec.get(NDT_REGFISC); _pec = rec.get(NDT_PEC); _titolo = rec.get(NDT_TITOLO); - if (variata) - { - TString work = rec.get(NDT_NCODEORI); - - if (work.full()) - _cod_EORI = work; - work = rec.get(NDT_NPADESTIN); - if (work.full()) - _coddest = work; - work = rec.get(NDT_NREGFISC); - if (work.full()) - _regfisc = work; - } TToken_string key;