diff --git a/include/codeb.c b/include/codeb.c index caf498c13..44883a91a 100755 --- a/include/codeb.c +++ b/include/codeb.c @@ -580,7 +580,7 @@ HIDDEN void do_key(char *fname, RecDes *r, TAG4INFO *tag_info, int n_keys) tag_info[i].unique=0; else tag_info[i].unique= i == 0 ? e4unique : r4unique_continue; -// tag_info[i].unique=e4unique; +/* tag_info[i].unique=e4unique; */ strcpy(tag_info[i].filter,".NOT. DELETED()"); /* Not available for DBIII and CLIPPER */ strcpy(tag_info[i].name,tiname) ; if (strlen(tiname) < 8) @@ -819,7 +819,7 @@ int DB_clean_file(int handle, char * filename, char * ff, RecDes * r, short vis) /*------------------------------------------------------------------------- Compatta gli indici --------------------------------------------------------------------------*/ -int DB_packindex(short vis, const char * filename, RecDes *r, long *peod) +int DB_packindex(short vis, const char * filename, RecDes *r, long *peod, bool ask) { int rt=0,handle; TAG4INFO tags[MaxKeys+1]; @@ -857,7 +857,7 @@ int DB_packindex(short vis, const char * filename, RecDes *r, long *peod) if (rt == e4unique || rt == r4unique) { rt = 0; - if (yesno_box("Sono stati rilevati alcuni record duplicati devo eliminarli ?")) + if (!ask || yesno_box("Sono stati rilevati alcuni record duplicati devo eliminarli ?")) rt = DB_clean_file(handle, (char*) filename, ff, r, vis); else tags[0].unique = r4unique_continue; diff --git a/include/codeb.h b/include/codeb.h index c99ec10e4..e87cd07ba 100755 --- a/include/codeb.h +++ b/include/codeb.h @@ -53,7 +53,7 @@ extern "C" { int DB_lockfile(int handle); /* Per sbloccare il record basta la DB_unlock()*/ int DB_packfile(short vis, const char * filename, long eod); int DB_packmemo(short vis, const char * filename); - int DB_packindex(short vis, const char * filename, RecDes *r, long *peod ); + int DB_packindex(short vis, const char * filename, RecDes *r, long *peod, bool ask ); int DB_build(const char * filename, RecDes *r); int DB_get_error(void); void DB_zero_error(void); diff --git a/include/isam.cpp b/include/isam.cpp index 3a08e9ecf..7ce91b2dc 100755 --- a/include/isam.cpp +++ b/include/isam.cpp @@ -1321,14 +1321,14 @@ int TBaseisamfile::is_valid() TLocalisamfile::TLocalisamfile( int logicnum, // @parm Numero del logico del file bool linkrecinst) // @parm Puo assumere i valori: - // - // @flag 0 | Istanzio un nuovo file fisico (default) - // @flag 1 | Utilizza, se possibile, un file gia' esistente - // @flag 2 | Crea un file temporaneo + // + // @flag 0 | Istanzio un nuovo file fisico (default) + // @flag 1 | Utilizza, se possibile, un file gia' esistente + // @flag 2 | Crea un file temporaneo : TBaseisamfile(logicnum, linkrecinst == TRUE) // @comm ATTENZIONE:
puo' valere 0, 1, 2.
-// Se vale 2 significa che si sta costruendo un file temporaneo
+// Se vale 2 significa che si sta costruendo un file temporaneo
// per cui linkrecinst va' considerato FALSE
{
@@ -2023,7 +2023,8 @@ int TSystemisamfile::packfile(
// @rdesc Ritorna NOERR se l'operazione di compattamento e' riuscita, altrimenti il codice di
// di errore generato (vedi