assoc.h Aggiunti due const key() r obj()

codeb.c   Corretta fatal_box
isam.cpp  Aggiunto NOT_OPEN al metodo TBaseisamfile::items()


git-svn-id: svn://10.65.10.50/trunk@2233 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-12-04 11:06:12 +00:00
parent 0aeeb04dad
commit e029749e8b
3 changed files with 1068 additions and 1067 deletions

View File

@ -26,10 +26,10 @@ class THash_object : public TObject
public: public:
// @cmember Ritorna la chiave di ordinamento // @cmember Ritorna la chiave di ordinamento
TString& key() const TString& key() const
{ return _key; } { return _key; }
// @cmember Ritorna l'oggetto // @cmember Ritorna l'oggetto
TObject& obj() TObject& obj() const
{ return *_obj; } { return *_obj; }
// @cmember Costruttore (inizializza la chiave) // @cmember Costruttore (inizializza la chiave)

View File

@ -467,7 +467,7 @@ int DB_rewrite(int handle)
if (rt == e4unique) if (rt == e4unique)
{ {
DB_get_error(); DB_get_error();
fatal_box("Errore in DB_rewrite(): chiave duplicata nell' indice %d, file %s", fatal_box("Errore in DB_rewrite(): chiav duplicata nell' indice %ld, file %s",
dbdata[handle]->rec_num + 1, dbdata[handle]->file.name); dbdata[handle]->rec_num + 1, dbdata[handle]->file.name);
} }
rt=DB_unlock(handle); rt=DB_unlock(handle);
@ -514,7 +514,7 @@ int DB_add(int handle)
{ {
DB_get_error(); DB_get_error();
if (data->rec_num > 0) if (data->rec_num > 0)
fatal_box("Errore in DB_add(): chiave duplicata nell' indice %d, file %s", fatal_box("Errore in DB_add(): chiave duplicata nell' indice %ld, file %s",
data->rec_num + 1, data->file.name); data->rec_num + 1, data->file.name);
else else
rt = _isreinsert; rt = _isreinsert;

View File

@ -601,6 +601,7 @@ int TBaseisamfile::delhr(const TRectype& rec, TDate& atdate)
long TBaseisamfile::items() const long TBaseisamfile::items() const
{ {
NOT_OPEN();
return(DB_reccount(filehnd()->fhnd)); return(DB_reccount(filehnd()->fhnd));
} }