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

Patch level : 10.0 patch 767

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :

Dalla versione 3.2


git-svn-id: svn://10.65.10.50/trunk@20587 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2010-06-21 13:52:59 +00:00
parent 4e63ea9604
commit 0cdc7b7bec
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/recarray.cpp
View File

@ -191,7 +191,7 @@ void TRecord_array::sort(COMPARE_FUNCTION sort_func)
int TRecord_array::rec2row(const TRectype& r) const int TRecord_array::rec2row(const TRectype& r) const
{ {
CHECK(r.num() == _file, "Incompatible record"); CHECK(r.num() == _file, "Incompatible record");
const int n = atoi(r.get(_num)) - _offset; // Non e' detto che sia un int! const int n = r.get_int(_num) - _offset; // Non e' detto che sia un int!
CHECKD(n >= 0 && n < 30000, "Bad line number in record ", n + _offset); CHECKD(n >= 0 && n < 30000, "Bad line number in record ", n + _offset);
return n; return n;
} }
@ -432,7 +432,7 @@ int TRecord_array::write(bool re) const
err = rec->read(f, _isgteq); err = rec->read(f, _isgteq);
if (err == NOERR && good(*rec)) // Cerca una riga >= pos sul file if (err == NOERR && good(*rec)) // Cerca una riga >= pos sul file
{ {
last_on_file = atoi(rec->get(_num)); last_on_file = rec->get_int(_num);
if (last_on_file == pos) // La riga c'era ma ora non piu' if (last_on_file == pos) // La riga c'era ma ora non piu'
{ {
err = (rec->remove(f)); // Cancello il record indesiderato err = (rec->remove(f)); // Cancello il record indesiderato

2
include/textset.h
View File

@ -112,7 +112,7 @@ protected:
TAS400_column_info* parse_field(const char* column, int& c, bool create); TAS400_column_info* parse_field(const char* column, int& c, bool create);
bool set_field(const TAS400_column_info& fi, const TVariant& var); bool set_field(const TAS400_column_info& fi, const TVariant& var);
const TVariant& get_field(const TAS400_column_info& fi) const; virtual const TVariant& get_field(const TAS400_column_info& fi) const;
public: public:
virtual TRecnotype new_rec(const char* buf = NULL); virtual TRecnotype new_rec(const char* buf = NULL);

12
include/varrec.cpp
View File

@ -147,17 +147,17 @@ void TVariable_rectype::unknown_field(const char* name) const
void TVariable_rectype::write_memo(TIsam_handle file, const TRecnotype recno) void TVariable_rectype::write_memo(TIsam_handle file, const TRecnotype recno)
{ {
if (_memo_fld.not_empty()) if (_memo_fld.full())
{ {
TToken_string t(256, '\n'); TToken_string t(256, '\n');
for (TVariable_field * vf = (TVariable_field *) _virtual_fields.first_item(); vf; FOR_EACH_ASSOC_OBJECT(_virtual_fields, h, key, o)
vf = (TVariable_field *) _virtual_fields.succ_item()) {
{ const TVariable_field* vf = (TVariable_field*)o;
const TString& val = vf->get(); const TString& val = vf->get();
if (val.full() && val != "0") if (val.full() && val != "0")
{ {
t.add(vf->name()); t.add(key);
t << "=" << val; t << '=' << val;
} }
} }
put(_memo_fld, t); put(_memo_fld, t);