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

Rif. mod 95/27. Rimosso parametro _lock dalle TBaseisamfile::remove()

Browse Source 
Aggiunta browse_null() prima di scrivere il record convertito in TSystmeisamfile::update().


git-svn-id: svn://10.65.10.50/trunk@1805 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
angelo 1995-09-11 13:12:13 +00:00
parent 4f5f83485f
commit 5f3225d8fd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/isam.cpp
View File

@ -874,7 +874,7 @@ int TBaseisamfile::remove(TDate& atdate)
if (memo != NULL) delete memo; if (memo != NULL) delete memo;
#endif #endif
if ((_lasterr=cisread(_isamfile, curr(), _isequal + _lock)) == NOERR) if ((_lasterr=cisread(_isamfile, curr(), _isequal + _nolock)) == NOERR)
{ {
_lasterr = DB_delete(_isamfile->fhnd); // Put only deletion flag on record, must remove keys too! _lasterr = DB_delete(_isamfile->fhnd); // Put only deletion flag on record, must remove keys too!
if (_lasterr != NOERR) if (_lasterr != NOERR)
@ -901,7 +901,7 @@ int TBaseisamfile::remove(const TRectype& rec, TDate& atdate)
NOT_OPEN(); NOT_OPEN();
memcpy(DB_getrecord(_isamfile->fhnd),rec.string(),DB_reclen(_isamfile->fhnd)); memcpy(DB_getrecord(_isamfile->fhnd),rec.string(),DB_reclen(_isamfile->fhnd));
if ((_lasterr=cisread(_isamfile, (TRectype&) rec, _isequal + _lock))==NOERR) if ((_lasterr=cisread(_isamfile, (TRectype&) rec, _isequal + _nolock))==NOERR)
{ {
_lasterr = DB_delete(_isamfile->fhnd); // Put only deletion flag on record, must remove keys too! _lasterr = DB_delete(_isamfile->fhnd); // Put only deletion flag on record, must remove keys too!
if (_lasterr != NOERR) if (_lasterr != NOERR)
@ -1602,6 +1602,7 @@ int TSystemisamfile::update(TTrec& newrec, bool vis)
nrec.put((const TString&) fld[j], get((const TString&) fld[j])); nrec.put((const TString&) fld[j], get((const TString&) fld[j]));
if (lcf) if (lcf)
makelc((TRectype &)nrec); makelc((TRectype &)nrec);
browse_null(nrec.string(),DB_reclen(i0->fhnd));
memcpy(DB_getrecord(i0->fhnd),nrec.string(),DB_reclen(i0->fhnd)); memcpy(DB_getrecord(i0->fhnd),nrec.string(),DB_reclen(i0->fhnd));
err=DB_add(i0->fhnd); err=DB_add(i0->fhnd);
if (err != NOERR) err=get_error(err); if (err != NOERR) err=get_error(err);