Patch level : 10.0

Files correlati     : ve4
Ricompilazione Demo : [ ]
Commento            :
Aggiornato uso RecDes


git-svn-id: svn://10.65.10.50/trunk@17862 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-12-10 17:06:07 +00:00
parent dcd148d3e5
commit 8634f78a43

View File

@ -301,7 +301,7 @@ protected:
TRelation_description& get_des() const; TRelation_description& get_des() const;
TRelation& get_rel() const; TRelation& get_rel() const;
const TRectype& get_rec() const; const TRectype& get_rec() const;
const RecDes* get_rec_des() const; const RecDes& get_rec_des() const;
TToken_string& get_key_expr(int k); TToken_string& get_key_expr(int k);
TRelation& create_relation(); TRelation& create_relation();
@ -358,7 +358,7 @@ const TRectype& TRicalcolo_mask::get_rec() const
return get_rel().lfile().curr(); return get_rel().lfile().curr();
} }
const RecDes* TRicalcolo_mask::get_rec_des() const const RecDes& TRicalcolo_mask::get_rec_des() const
{ {
return get_rec().rec_des(); return get_rec().rec_des();
} }
@ -368,12 +368,12 @@ TToken_string& TRicalcolo_mask::get_key_expr(int key)
_key_expr.cut(0); _key_expr.cut(0);
if (key > 0) if (key > 0)
{ {
const RecDes* rd = get_rec_des(); const RecDes& rd = get_rec_des();
const KeyDes& kd = rd->Ky[key-1]; const KeyDes& kd = rd.Ky[key-1];
for (int i = 0; i < kd.NkFields; i++) for (int i = 0; i < kd.NkFields; i++)
{ {
const int nf = kd.FieldSeq[i] % MaxFields; const int nf = kd.FieldSeq[i] % MaxFields;
const RecFieldDes& rf = rd->Fd[nf]; const RecFieldDes& rf = rd.Fd[nf];
_key_expr.add(rf.Name); _key_expr.add(rf.Name);
} }
} }
@ -604,8 +604,8 @@ bool TRicalcolo_mask::file_handler(TMask_field& f, KEY k)
if (n != m._cur_file) if (n != m._cur_file)
{ {
m._cur_file = n; m._cur_file = n;
const RecDes* rd = m.get_rec_des(); const RecDes& rd = m.get_rec_des();
const int keys = rd->NKeys; const int keys = rd.NKeys;
TToken_string codes(16); TToken_string codes(16);
TToken_string values(80); TToken_string values(80);
@ -619,7 +619,7 @@ bool TRicalcolo_mask::file_handler(TMask_field& f, KEY k)
values.add(tmp); values.add(tmp);
} }
TList_field& lk = (TList_field&)m.field(F_KEY); TList_field& lk = m.lfield(F_KEY);
lk.replace_items(codes, values); lk.replace_items(codes, values);
} }
} }