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

Richiesta 95/16.

Browse Source 
Correzione a TSorted_cursor::filtercursor(). Non effettuava bene la
formattazione di stringhe numeriche, sbagliando di conseguenza il sort.


git-svn-id: svn://10.65.10.50/trunk@1745 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
marcello 1995-08-29 10:18:10 +00:00
parent 7380ec8c03
commit a2ed4db50a
1 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
include/relation.cpp
View File

@ -1,4 +1,4 @@
// $Id: relation.cpp,v 1.60 1995-08-28 07:51:24 guy Exp $ // $Id: relation.cpp,v 1.61 1995-08-29 10:18:10 marcello Exp $
// relation.cpp // relation.cpp
// fv 12/8/93 // fv 12/8/93
// relation class for isam files // relation class for isam files
@ -1290,7 +1290,7 @@ TRecnotype TSorted_cursor::buildcursor(TRecnotype rp)
ap += pagecnt; ap += pagecnt;
pagecnt = 0; pagecnt = 0;
} }
page[pagecnt++] = recno; page[pagecnt++] = recno; // lasciare cosi' altrimenti la readat legge due volte lo stesso record
DB_index_next(file().filehnd()->fhnd); DB_index_next(file().filehnd()->fhnd);
int rt=get_error(-1); int rt=get_error(-1);
if (rt != NOERR) if (rt != NOERR)
@ -1357,15 +1357,18 @@ int TSorted_cursor::filtercursor(int pagecnt, TRecnotype* page)
s.cut(s.len()-1); s.cut(s.len()-1);
TFieldref f(s,0); TFieldref f(s,0);
TString sf=f.read(relation()); TString sf=f.read(relation());
bool is_date = file(f.file()).curr().type(s) ==_datefld; TFieldtypes fld_type = file(f.file()).curr().type(s);
if (is_date) // Se il campo e' di tipo data, la converte in ANSI! if (fld_type == _datefld) // Se il campo e' di tipo data, la converte in ANSI!
{ {
TDate d(sf); TDate d(sf);
sf=d.string(ANSI); sf=d.string(ANSI);
} }
if (is_up) sf.upper(); if (is_up) sf.upper();
TString fmt; TString fmt;
fmt.format("%%-%ds",f.len(rec)); if (fld_type == _alfafld || fld_type == _datefld)
fmt.format("%%-%ds",f.len(rec));
else
fmt.format("%%%ds",f.len(rec));
strcat(Element.f,(const char*)sf.format((const char *)fmt,(const char *)sf)); strcat(Element.f,(const char*)sf.format((const char *)fmt,(const char *)sf));
} }
Element.p=page[i]; Element.p=page[i];
@ -1604,7 +1607,7 @@ TRecord_array::TRecord_array(int logicnum, const char* numfield, int first)
TRecord_array::TRecord_array(const TRecord_array& a) TRecord_array::TRecord_array(const TRecord_array& a)
: TArray(a), _file(a._file), _offset(a._offset), _num(a._num) : TArray(a), _file(a._file), _offset(a._offset), _num(a._num)
{} {}
const TRectype& TRecord_array::key() const const TRectype& TRecord_array::key() const
{ {
@ -1660,32 +1663,10 @@ bool TRecord_array::renum_key(const char* field, long num)
return renum_key(field, n); return renum_key(field, n);
} }
void TRecord_array::set_key(TRectype* r)
{
CHECK(r->num() == _file, "Bad key record");
add(r, 0); // Setta il nuovo campo chiave
if (rows() > 0)
{
const int numkey = 0; // Memento! Gli indici delle chiavi partono da zero!
const RecDes* recd = r->rec_des(); // Descrizione del record della testata
const KeyDes& kd = recd->Ky[numkey]; // Elenco dei campi chaive
// Copia tutti i campi chiave, tranne l'ultimo, in tutti i records
for (int i = recd->Ky[numkey].NkFields-1; i >= 0; i--)
{
const int nf = kd.FieldSeq[i] % MaxFields;
const RecFieldDes& rf = recd->Fd[nf];
const TString& val = r->get(rf.Name);
renum_key(rf.Name, val);
}
}
}
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() == key().num(), "Incompatible record");
const int n = atoi(r.get(_num)) - _offset; // Non e' detto che sia un int! const int n = atoi(r.get(_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;
@ -1723,7 +1704,7 @@ bool TRecord_array::destroy_row(int r, bool pack)
void TRecord_array::destroy_rows() void TRecord_array::destroy_rows()
{ {
for (int i = last(); i > 0; i = pred(i)) for (int i = last(); i > 0; i--)
destroy(i); destroy(i);
} }
@ -1733,7 +1714,7 @@ int TRecord_array::read(TRectype* filter)
CHECKS(filter->get(_num).empty(), "You can't specify in the filter the field ", (const char*)_num); CHECKS(filter->get(_num).empty(), "You can't specify in the filter the field ", (const char*)_num);
destroy(); destroy();
set_key(filter); add(filter, 0); // Store filter record for later use
int err = NOERR; int err = NOERR;
if (!filter->empty()) if (!filter->empty())
@ -1742,10 +1723,7 @@ int TRecord_array::read(TRectype* filter)
TRectype* rec = (TRectype*)filter->dup(); TRectype* rec = (TRectype*)filter->dup();
err = rec->read(f, _isgteq); err = rec->read(f, _isgteq);
for (int e = err; e == NOERR && *rec == key(); e = rec->next(f)) for (int e = err; e == NOERR && *rec == key(); e = rec->next(f))
{ add_row(*rec);
add_row(rec);
rec = (TRectype*)filter->dup();
}
delete rec; delete rec;
} }
return err; return err;