isam.cpp Implementazione del metodo virtual TRectype::renum_key()

isam.h       Dichiarazione del metodo suddetto
relation.cpp Correzione dei Trecord_array
relation.h   Aggiunto const al metodo Trecord_array::remove()


git-svn-id: svn://10.65.10.50/trunk@1851 c028cbd2-c16b-5b4b-a496-9718f37d4682

include/isam.cpp

@@ -2527,6 +2527,11 @@ int TRectype::remove(TBaseisamfile& f) const
   return f.remove(*this); 
 }
 
+void TRectype::renum_key(const char* field, const char* val)
+{
+  put(field, val);
+}
+
 // Certified 99%
 TRectype& TRectype::operator =(const char* rec)
 {

include/isam.h

@@ -78,6 +78,7 @@ public:     // TObject
   virtual int write(TBaseisamfile& f) const;
   virtual int rewrite(TBaseisamfile& f) const;
   virtual int remove(TBaseisamfile& f) const;
+  virtual void renum_key(const char* field, const char* val);
 
 public:
   // FPUB 

include/relation.cpp

@@ -1,4 +1,4 @@
-// $Id: relation.cpp,v 1.64 1995-09-14 13:12:18 alex Exp $
+// $Id: relation.cpp,v 1.65 1995-09-19 15:45:37 guy Exp $
 // relation.cpp
 // fv 12/8/93
 // relation class for isam files
@@ -1602,7 +1602,7 @@ TRecord_array::TRecord_array(const TRectype& r, const char* numfield, int first)
 TRecord_array::TRecord_array(int logicnum, const char* numfield, int first)
              : _file(logicnum), _num(numfield), _offset(first - 1)
 {
-  add(new TRectype(logicnum));
+  set_key(new TRectype(logicnum));
 } 
 
 TRecord_array::TRecord_array(const TRecord_array& a) 
@@ -1611,15 +1611,16 @@ TRecord_array::TRecord_array(const TRecord_array& a)
 
 void TRecord_array::set_key(TRectype* r)
 {                                                                     
+  CHECK(r != NULL, "TRecord_array can't have a null key");
   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
+    const KeyDes& kd = recd->Ky[0];       // Elenco dei campi della chiave 1
     // Copia tutti i campi chiave, tranne l'ultimo, in tutti i records
-    for (int i = recd->Ky[numkey].NkFields-1; i >= 0; i--)
+    for (int i = kd.NkFields-2; i >= 0; i--)
     {                        
       const int nf = kd.FieldSeq[i] % MaxFields;
       const RecFieldDes& rf = recd->Fd[nf];  
@@ -1652,7 +1653,8 @@ TRectype& TRecord_array::row(int n, bool create)
   {
     r = (TRectype*)key().dup();                 // Crea nuovo record copiando la chiave
     n = add(r, i) + _offset;                    // Riassegna n se era negativo!
-    r->put(_num, n);                            // Aggiorna campo numero riga
+    char str[8]; sprintf(str, "%d", n);
+    r->renum_key(_num, str);                    // Aggiorna campo numero riga
   }
   CHECKD(r && n > 0, "Bad record number ", n);  
   return *r;
@@ -1660,17 +1662,15 @@ TRectype& TRecord_array::row(int n, bool create)
 
 bool TRecord_array::renum_key(const char* field, const TString& num)
 {             
-  CHECKS(!num.blank(), "Blank key value for field: ", field);
   const TString& curr = key().get(field);
-  
   if (curr == num)
     return FALSE;
   
   for (int i = last(); i >= 0; i--)
   {
     TRectype* r = (TRectype*)objptr(i);
-    if (r == NULL)
+    if (r != NULL)
-      r->put(field, num);
+      r->renum_key(field, num);
   }  
   
   return TRUE; 
@@ -1734,12 +1734,12 @@ int TRecord_array::read(TRectype* filter)
   CHECKS(filter->get(_num).empty(), "You can't specify in the filter the field ", (const char*)_num);
 
   destroy();
-  set_key(filter);    // Store filter record for later use
-  
   int err = NOERR;
-  if (!filter->empty())
+  if (filter != NULL && !filter->empty())
   {
     TLocalisamfile f(_file);
+
+    set_key(filter);    
     TRectype* rec = (TRectype*)filter->dup();
     err = rec->read(f, _isgteq);
     for (int e = err; e == NOERR && *rec == *filter; e = rec->next(f))
@@ -1758,14 +1758,41 @@ int TRecord_array::read(const TRectype& filter)
   return read(f);  
 }
 
-int TRecord_array::write(bool re) const
+int TRecord_array::remove_from(int pos) const
 {                 
   int err = NOERR;
 
+  TRectype* rec = (TRectype*)key().dup();
+  CHECK(!rec->empty(), "Can't use empty key");
+
   TLocalisamfile f(_file);
+  rec->put(_num, pos);
+  for (int e = rec->read(f, _isgteq); e == NOERR && *rec == key(); e = rec->next(f))
+  {                               
+    const int found = rec->get_int(_num);
+    if (found >= pos)
+    {
+      err = rec->remove(f);             
+      if (err != NOERR)
+        break;
+      pos = found+1;  
+    }
+    else
+      break;    
+  } 
+  delete rec;
 
-  int last_on_file = 0;  
+  return err;
+}
 
+
+int TRecord_array::write(bool re) const
+{          
+  const int EOR = 32000;              // End of records on file
+  int last_on_file = 0;               // Last record found on file
+  int err = NOERR;
+    
+  TLocalisamfile f(_file);
   const int u = last();
   for (int i = 1; i <= u; i++)
   {
@@ -1785,7 +1812,10 @@ int TRecord_array::write(bool re) const
       {
         err = r->write(f);     
         if (err == _isreinsert)
+        {
           err = r->rewrite(f);           
+          re = TRUE;
+        }  
         if (err != NOERR) 
           break;
       }    
@@ -1796,9 +1826,10 @@ int TRecord_array::write(bool re) const
       if (pos > last_on_file)
       {
         TRectype* rec = (TRectype*)key().dup();
+        CHECK(!rec->empty(), "TRecord_array has an empty key");
         rec->put(_num, pos);
         err = rec->read(f, _isgteq);
-        if (err == NOERR)              // La riga c'era ma ora non piu'
+        if (err == NOERR && *rec == key())          // La riga c'era ma ora non piu'
         {               
           last_on_file = atoi(rec->get(_num));
           if (last_on_file == pos)
@@ -1812,34 +1843,22 @@ int TRecord_array::write(bool re) const
           }
         } 
         else
-          last_on_file = 30000; 
+          last_on_file = EOR; 
         delete rec;   
       }  
     }
   }
 
-  if (re && err == NOERR && last_on_file != 30000)
-  {
-    const int pos = i+_offset;
-    TRectype* rec = (TRectype*)key().dup();
   // Cancella eventuali residui successivi
-    rec->put(_num, pos);
+  if (err == NOERR && last_on_file != EOR)
-    for (int e = rec->read(f, _isgteq); e == NOERR && *rec == key(); e = rec->next(f))
+    remove_from(i + _offset);
-    {
-      err = rec->remove(f);             
-      if (err != NOERR)
-        break;
-    } 
-    delete rec;
-  }  
   
   return err;
 }
 
-int TRecord_array::remove()
+int TRecord_array::remove() const
 {
-  destroy_rows();
+  return remove_from(1 + _offset);
-  return rewrite();
 }
 
 ///////////////////////////////////////////////////////////

include/relation.h

@@ -1,4 +1,4 @@
-/*      $Id: relation.h,v 1.27 1995-08-28 07:51:30 guy Exp $      */
+/*      $Id: relation.h,v 1.28 1995-09-19 15:45:42 guy Exp $      */
 // join.h
 // fv 12/8/93
 // join class for isam files
@@ -138,6 +138,7 @@ class TRecord_array : private TArray
 protected:
   int rec2row(const TRectype& r) const;               // Estrae il numero riga di un record
   const TString& num_field() const { return _num; }
+  int remove_from(int i) const;
 
 public:         
   const TRectype& key() const;
@@ -160,6 +161,7 @@ public:
   virtual bool destroy_row(const TRectype& r, bool pack = FALSE) { return destroy_row(rec2row(r), pack); }
   void destroy_rows();                                // Cancella tutte le righe
   
+  int logic_num() const { return _file; } 
   void set_key(TRectype* r);                          // Cambia l'intera chiave (solo se vuoto!)
   bool renum_key(const char* field, const TString& num);
   bool renum_key(const char* field, long num);        // Rinumera campo chiave in seguito a reinsert
@@ -168,7 +170,7 @@ public:
   virtual int read(TRectype* r);                      // Leggi tutto l'array da file
   virtual int write(bool re = FALSE) const;           // Aggiorna il file
   virtual int rewrite() const { return write(TRUE); }
-  virtual int remove();                               // Cancella tutti i record dal file
+  virtual int remove() const;                         // Cancella tutti i record dal file
   
   TRecord_array(const TRectype& r, const char* numfield, int first = 1);
   TRecord_array(int logicnum, const char* numfield, int first = 1);