Changeset 3428 in Sophya for trunk/SophyaPI/PIext/nobjmgr.cc

Timestamp:

Dec 9, 2007, 12:15:41 AM (18 years ago)

Author:

ansari

Message:

Correction ds NamedObjMgr::ReadAll() + ajout commande ls comme alias de listobjs , Reza 08/12/2007

File:

• trunk/SophyaPI/PIext/nobjmgr.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -601 +601 @@
   sprintf(buff,"O%d", myNObj);
   cout << "NamedObjMgr::AddObj() Name changed: " << nom << " -> " << buff << endl;
-  nom = buff;
+  nobj = buff;
 }
 
@@ -1130 +1130 @@
 
   // On lit tous les objets sequentiellement ...
-  string nom = servnobjm->FileName2Name(flnm);  
+  string nomr = servnobjm->FileName2Name(flnm);  
+  string nom = nomr;
+  string nums;
   int kn = 1;
-  for(int ii=0; ii<pis.NbTopLevelObjects(); ii++) {
-    cout << " --- DBG-ReadAll() ii=" << ii << " nom= " << nom <<endl;
-    PPersist* obj = pis.ReadObject();
-    if (!obj) continue;
-    AddObj(obj->DataObj(), nom, false);
-    kn++;
-    nom += (string)MuTyV(kn);
-  }
+  bool fgrdok = true;
+  while (fgrdok) {
+    try {
+      PPersist* obj = pis.ReadObject();
+      if (!obj) continue;
+      AddObj(obj->DataObj(), nom, false);
+      kn++;  nom = nomr + MuTyV(kn).Convert(nums);
+    }
+    catch (IOExc& iox) {
+      fgrdok = false;  
+    }
+  }
+  cout<<"NamedObjMgr::ReadAll(" << flnm << " ,seq) "<< kn-1 << " objects read from File" << endl;
 }
 catch (IOExc& iox) {