Changeset 2962 in Sophya for trunk/SophyaLib/HiStats

Timestamp:

Jun 2, 2006, 1:23:46 PM (19 years ago)

Author:

ansari

Message:

Ajout methode BaseDataTable::CheckCorrectColName() pour correction des noms de colonnes (pour lecture FITS en particulier), Reza 2/6/2006

Location:

trunk/SophyaLib/HiStats

Files:

• basedtable.cc (modified) (2 diffs)
• basedtable.h (modified) (1 diff)

trunk/SophyaLib/HiStats/basedtable.cc

@@ -179 +179 @@
 }
 
+//! Check the validity of column name \b cnom - throw exception.
 bool BaseDataTable::CheckColName(string const & cnom)
 {
@@ -194 +195 @@
       throw ParmError("BaseDataTable::CheckColName() already existing name");
   return true;
+}
+
+/*! 
+  \brief Check  the validity of column name \b cnom and correct it if necessary
+  return true if \b cnom has been changed
+*/
+bool BaseDataTable::CheckCorrectColName(string& cnom)
+{
+  size_t l,k;
+  l = cnom.length();
+  string ssn;
+  MuTyV mvv = (NCols()+1);
+  mvv.Convert(ssn);
+  bool fgrc = false;
+  if (l < 1) { cnom = "C"+ssn;   fgrc = true; }
+  if (!isalpha(cnom[0]))  { cnom = "C"+cnom;  fgrc = true; }
+  for(k=1; k<l; k++) 
+    if ((!isalnum(cnom[k])) && (cnom[k] != '_'))  { 
+      cnom[k] = '_';  fgrc = true;
+    }
+  bool fgdouble = true;
+  while (fgdouble) {
+    fgdouble = false;
+    for(k=0; k<mNames.size(); k++)
+      if (cnom == mNames[k].nom) {
+        fgdouble = true;  break;
+      }
+    if (fgdouble) { cnom = cnom+ssn; fgrc = true; } 
+  }
+  return fgrc;
 }
 

trunk/SophyaLib/HiStats/basedtable.h

@@ -144 +144 @@
   // si nom en double ou non valide
   virtual bool      CheckColName(string const & cnom);
+  // Verifie et corrige si besoin un nom de colonne
+  virtual bool      CheckCorrectColName(string & cnom);
 
   // Acces to various counts and parameters