From b65823d1f794541686c39eb63aed556bbfd620f3 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 4 Mar 2003 12:23:04 +0000
Subject: [PATCH] Patch level         :2.0 aga Files correlati     :libs
 Ricompilazione Demo : [ ] Commento            :eliminati problemi conversione
 files

git-svn-id: svn://10.65.10.50/trunk@10876 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/isam.cpp | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/include/isam.cpp b/include/isam.cpp
index f43561812..eab05b03f 100755
--- a/include/isam.cpp
+++ b/include/isam.cpp
@@ -1360,7 +1360,7 @@ int TBaseisamfile::is_valid(bool exclusive)
 { // Ritorna NOERR se il file puo' essere aperto senza errori
   CHECKD(_isam_handle == 0, "Can't reopen file ", _logicnum);
   TFilename filename;
-  TIsam_handle isam_handle = prefix().open_isamfile(_logicnum, filename, FALSE, TRUE);
+  TIsam_handle isam_handle = prefix().open_isamfile(_logicnum, filename, exclusive, TRUE);
   TCodeb_handle fhnd = isam_handle > 0 ? prefix().get_handle(isam_handle,1) : -60;
 
   int err = NOERR;
@@ -1502,7 +1502,7 @@ TIsamfile::~TIsamfile()
 
 
 /*
-
+//A cosa cavolo serve?
 // @doc EXTERNAL
 
 // @mfunc Aggiorna i flags associati al file
@@ -2147,24 +2147,7 @@ int TSystemisamfile::update(
           if (err != NOERR) 
             err=get_error(err);
           setstatus(err);
-/* Obsoleto con le nuove barre
-          if (tick)
-          {
-            const clock_t elapsed_ticks = clock() - start_time;
-            const clock_t total_ticks = elapsed_ticks * nitems / ni;
-            const clock_t estimated_ticks = total_ticks - elapsed_ticks;
-            unsigned long secs = estimated_ticks / CLOCKS_PER_SEC;
-            CHECK(secs >= 0, "Bad time estimation");
-            const int hours = int(secs / 3600L);
-            secs %= 3600L;
-            const int mins = int(secs / 60L);
-            secs %= 60L;
-            const int append_pos = s.find("o: ")+3;
-            s.cut(append_pos);
-            s << format("%02d:%02d:%02ld", hours, mins, secs);
-            p.set_text(s);
-          }
-*/
+
         }
         close();
         prefix().close_isamfile(ishandle);
@@ -2381,7 +2364,7 @@ int TSystemisamfile::load(
   TString_array  fld(nflds);
   int    len[MaxFields];
   TString sfd(3);
-  TString s1(64);
+  TString s1(256);
   bool lcf = FALSE;
 
   if (f.paragraph("Header"))
@@ -2448,6 +2431,7 @@ int TSystemisamfile::load(
   
   s1.format("Imp. archivio %d\n%6ld records %6ld errori - %3d", _logicnum, r, e, last);
   TProgind p(nitems, s1, TRUE, TRUE, 70);
+  long pos = 16*nflds;
   for (s = f.line(); s.not_empty() && !p.iscancelled(); s = f.line())
   {
     if (extended)
@@ -2466,7 +2450,9 @@ int TSystemisamfile::load(
       s1.format("Imp. archivio %d\n%6ld records %6ld errori - %3d", _logicnum, r, e, last);
       p.set_text(s1);
     }
-    p.setstatus(f.tellg());
+
+    pos += s.len()+2;
+    p.setstatus(pos);
     zero();
     if (fixedlen)
     {