Patch level : 12.0 nopatch

Files correlati     :

Commento:
Modificata get_mask in _get_mask
This commit is contained in:
Alessandro Bonazzi 2022-10-02 00:28:57 +02:00
parent 2eb0e331a1
commit d3f9c4846f
12 changed files with 19 additions and 22 deletions

View File

@ -16,7 +16,7 @@ class TPianoconti_app : public TRelation_application
bool user_create(); bool user_create();
bool user_destroy(); bool user_destroy();
virtual TMask* get_mask(int mode) {return _msk;} virtual TMask* _get_mask(int mode) {return _msk;}
virtual bool changing_mask(int mode) {return FALSE;} virtual bool changing_mask(int mode) {return FALSE;}
virtual bool protected_record(TRectype &rec); virtual bool protected_record(TRectype &rec);
virtual void init_query_mode(TMask& m); virtual void init_query_mode(TMask& m);

View File

@ -35,7 +35,7 @@ class TClifo_application : public TRelation_application
protected: protected:
bool user_create(); bool user_create();
bool user_destroy(); bool user_destroy();
virtual TMask* get_mask(int mode) { return _msk; } virtual TMask* _get_mask(int mode) { return _msk; }
virtual bool changing_mask(int mode) { return false; } virtual bool changing_mask(int mode) { return false; }
virtual bool save_and_new() const { return _savenew; } virtual bool save_and_new() const { return _savenew; }
virtual bool protected_record(TRectype &rec); virtual bool protected_record(TRectype &rec);

View File

@ -11,7 +11,7 @@ class CG0300_application : public TRelation_application
bool user_create(); bool user_create();
bool user_destroy(); bool user_destroy();
virtual TMask* get_mask(int mode) {return _msk;} virtual TMask* _get_mask(int mode) { return _msk; }
virtual bool changing_mask(int mode) {return FALSE;} virtual bool changing_mask(int mode) {return FALSE;}
virtual TRelation* get_relation() const {return _rel;} virtual TRelation* get_relation() const {return _rel;}
virtual void init_query_mode(TMask& m); virtual void init_query_mode(TMask& m);

View File

@ -68,7 +68,7 @@ protected:
virtual bool user_destroy(); virtual bool user_destroy();
virtual TRelation* get_relation() const { return _rel; } virtual TRelation* get_relation() const { return _rel; }
virtual TMask* get_mask(int mode) { return _msk; } virtual TMask* _get_mask(int mode) { return _msk; }
virtual bool changing_mask(int mode) {return false; } virtual bool changing_mask(int mode) {return false; }
virtual bool remove(); virtual bool remove();

View File

@ -140,13 +140,13 @@ bool CGTTable_application::user_create()
{ {
if (get_tabname() == "ESC") if (get_tabname() == "ESC")
{ {
get_mask()->set_handler(F_DATAINI, dataini_handler); get_mask(MODE_QUERY)->set_handler(F_DATAINI, dataini_handler);
get_mask()->set_handler(BUT_CHECK, checkbut_handler); get_mask(MODE_QUERY)->set_handler(BUT_CHECK, checkbut_handler);
} }
if (get_tabname() == TAB_NOTECLI) if (get_tabname() == TAB_NOTECLI)
get_mask()->set_handler(F_NOT_DESC, desnot_handler); get_mask(MODE_QUERY)->set_handler(F_NOT_DESC, desnot_handler);
if (get_tabname() == "BNP") if (get_tabname() == "BNP")
get_mask()->set_handler(F_IBAN, iban_handler); get_mask(MODE_QUERY)->set_handler(F_IBAN, iban_handler);
} }
return ok; return ok;
@ -211,11 +211,12 @@ int CGTTable_application::rewrite(const TMask& m)
//stringa delle tabelle (per ora solo tabella %NOT) //stringa delle tabelle (per ora solo tabella %NOT)
void CGTTable_application::fragment_string() void CGTTable_application::fragment_string()
{ {
TMask& mask = *get_mask(); TMask& mask = *get_mask(MODE_QUERY);
TString stringone = mask.get(F_NOT_DESC); TString stringone = mask.get(F_NOT_DESC);
TRectype& rec = get_relation()->curr(); TRectype& rec = get_relation()->curr();
TString4 fieldname; TString4 fieldname;
int tot_length = 0; int tot_length = 0;
stringone.replace('\n', (char)0xB6); stringone.replace('\n', (char)0xB6);
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
@ -229,10 +230,11 @@ void CGTTable_application::fragment_string()
void CGTTable_application::glue_string() void CGTTable_application::glue_string()
{ {
TMask& mask = *get_mask(); TMask& mask = *get_mask(MODE_QUERY);
TString stringone; TString stringone;
TRectype& rec = get_relation()->curr(); TRectype& rec = get_relation()->curr();
TString4 fieldname; TString4 fieldname;
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
fieldname.format("S%d", i); fieldname.format("S%d", i);

View File

@ -68,7 +68,7 @@ class TOccasionali_app : public TRelation_application
bool user_create(); bool user_create();
bool user_destroy(); bool user_destroy();
virtual TMask* get_mask(int mode) {return _msk;} virtual TMask* _get_mask(int mode) {return _msk;}
virtual bool changing_mask(int mode) {return FALSE;} virtual bool changing_mask(int mode) {return FALSE;}
public: public:

View File

@ -304,7 +304,7 @@ protected: // TRelation_application
virtual bool user_destroy(); virtual bool user_destroy();
bool iva_mask(const TMask & m) const { return m.source_file() == "cg2100c.msk"; } bool iva_mask(const TMask & m) const { return m.source_file() == "cg2100c.msk"; }
virtual bool changing_mask(int mode); virtual bool changing_mask(int mode);
virtual TMask* get_mask(int mode); virtual TMask* _get_mask(int mode);
virtual TRelation* get_relation() const { return _rel; } virtual TRelation* get_relation() const { return _rel; }
virtual void init_query_mode(TMask& m); virtual void init_query_mode(TMask& m);
virtual void init_insert_mode(TMask& m); virtual void init_insert_mode(TMask& m);

View File

@ -25,7 +25,7 @@ class GesAcc_app : public TRelation_application
virtual bool user_create(); virtual bool user_create();
virtual bool user_destroy(); virtual bool user_destroy();
virtual TRelation* get_relation() const { return _rel; } virtual TRelation* get_relation() const { return _rel; }
virtual TMask* get_mask(int mode); virtual TMask* _get_mask(int mode) { return _mask; }
virtual bool changing_mask(int mode) {return FALSE; } virtual bool changing_mask(int mode) {return FALSE; }
}; };
@ -126,11 +126,6 @@ bool GesAcc_app::msk_acconto(TMask_field& f, KEY k)
return TRUE; return TRUE;
} }
TMask* GesAcc_app::get_mask(int /* mode */)
{
return _mask;
}
int cg4700(int argc, char* argv[]) int cg4700(int argc, char* argv[])
{ {
GesAcc_app app; GesAcc_app app;

View File

@ -120,7 +120,7 @@ protected:
virtual bool user_create(); virtual bool user_create();
virtual bool user_destroy(); virtual bool user_destroy();
virtual TRelation* get_relation() const { return _rel; } virtual TRelation* get_relation() const { return _rel; }
virtual TMask* get_mask(int mode) { return _msk; } virtual TMask* _get_mask(int mode) { return _msk; }
virtual bool changing_mask(int mode) {return false; } virtual bool changing_mask(int mode) {return false; }
virtual int read(TMask& m); virtual int read(TMask& m);
virtual void init_query_mode(TMask&); virtual void init_query_mode(TMask&);

View File

@ -38,7 +38,7 @@ protected: // Relapp
virtual bool user_destroy(); virtual bool user_destroy();
virtual TRelation* get_relation() const { return _rel; } virtual TRelation* get_relation() const { return _rel; }
virtual TMask* get_mask(int mode) { return _msk; } virtual TMask* _get_mask(int mode) { return _msk; }
virtual bool changing_mask(int mode) { return false; } virtual bool changing_mask(int mode) { return false; }
// file intertface // file intertface

View File

@ -84,7 +84,7 @@ bool Tabtra_application::user_create()
Tab_application::user_create(); Tab_application::user_create();
open_files(LF_TABCOM, LF_TAB, 0); open_files(LF_TABCOM, LF_TAB, 0);
_msk = get_mask(); _msk = get_mask(MODE_QUERY);
_tabname = get_tabname(); _tabname = get_tabname();
if (_tabname == "%TRA") if (_tabname == "%TRA")

View File

@ -723,7 +723,7 @@ bool Tabinv_application::user_create()
{ {
Tab_application::user_create(); Tab_application::user_create();
_msk = get_mask(); _msk = get_mask(MODE_QUERY);
_tabname = get_tabname(); _tabname = get_tabname();
_ditta_orig = -1; _ditta_orig = -1;
if (_tabname == "%IND") if (_tabname == "%IND")