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

git-svn-id: svn://10.65.10.50/branches/R_10_00@23162 c028cbd2-c16b-5b4b-a496-9718f37d4682

Browse Source
This commit is contained in:
guy 2015-12-21 11:20:13 +00:00
parent 53022a1efe
commit d946db93d0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/db0500.cpp
View File

@ -216,7 +216,7 @@ class TDistinta_mask;
class TDistinta_app : public TRelation_application class TDistinta_app : public TRelation_application
{ {
TDistinta_tree _tree; TDistinta_tree* _tree;
TRelation* _therel; TRelation* _therel;
TQuery_mask* _querymask; TQuery_mask* _querymask;
TDistinta_mask* _themask; TDistinta_mask* _themask;
@ -1705,8 +1705,9 @@ TDistinta_mask::TDistinta_mask(TDistinta_tree& dt)
bool TDistinta_app::user_create() bool TDistinta_app::user_create()
{ {
_therel = new TRelation(LF_DIST); _therel = new TRelation(LF_DIST);
_querymask = new TQuery_mask(_tree); _tree = new TDistinta_tree;
_themask = new TDistinta_mask(_tree); _querymask = new TQuery_mask(*_tree);
_themask = new TDistinta_mask(*_tree);
return true; return true;
} }
@ -1716,6 +1717,7 @@ bool TDistinta_app::user_destroy()
delete _themask; delete _themask;
delete _querymask; delete _querymask;
delete _therel; delete _therel;
delete _tree;
return true; return true;
} }
@ -1762,7 +1764,7 @@ void TDistinta_app::load_memo(TMask& m, TToken_string& memo)
row[equal] = SAFE_PIPE_CHR; row[equal] = SAFE_PIPE_CHR;
row.insert(format(" %c",SAFE_PIPE_CHR),0); row.insert(format(" %c",SAFE_PIPE_CHR),0);
row.replace('.', ','); row.replace('.', ',');
if (_tree.is_global(row.get(1))) if (_tree->is_global(row.get(1)))
row[0]='G'; row[0]='G';
} }
} }
@ -1843,7 +1845,7 @@ bool TDistinta_app::parms2rel(const TMask& m)
if (!var.blank()) if (!var.blank())
{ {
expr = row->get(); expr.replace(',', '.'); expr = row->get(); expr.replace(',', '.');
if (typ == 'G' && !_tree.is_global(var)) if (typ == 'G' && !_tree->is_global(var))
error_box(FR("La variabile %s non e' una delle variabili globali. Consultare la documentazione del modulo Distinta Base"),(const char *)var); error_box(FR("La variabile %s non e' una delle variabili globali. Consultare la documentazione del modulo Distinta Base"),(const char *)var);
memo.add(var); memo.add(var);
memo << '='; memo << '=';