Changeset 3423 in Sophya

Timestamp:

Dec 8, 2007, 11:21:02 PM (18 years ago)

Author:

ansari

Message:

ajout possibilite lecture ppf sequentielle (sans nametag) avec openppf et amelioration texte de help piapp, Reza 08/12/2007

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (3 diffs)
• nobjmgr.cc (modified) (3 diffs)
• nobjmgr.h (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -129 +129 @@
 
 else if (kw == "openppf" ) {
-  if (tokens.size()<1) {cout<<"Usage: openppf file [objname1 objname2 ...]"<<endl; return(0); }
-  else if (tokens.size()==1) mObjMgr->ReadAll(tokens[0]);  
-  else mObjMgr->ReadObj(tokens); 
+  if (tokens.size()<1) { 
+    cout<<"Usage: openppf [-s] file [objname1 objname2 ...]"<<endl; 
+    return(0); 
+  }
+  else if (tokens.size()==1)   // read all objects at nametags
+    mObjMgr->ReadAll(tokens[0],true);  
+  else { 
+    if (tokens[0] == "-s")  // Read all objects sequentially
+      mObjMgr->ReadAll(tokens[1],false);  
+    else mObjMgr->ReadObj(tokens);   // read specified objects
+  }
 }
 else if ((kw == "saveobjs") || (kw == "saveppf"))  {
@@ -925 +933 @@
 
 kw = "openppf";
-usage = "Reads all or some objects from a PPF file \n Usage: openppf filename [objname1 objname2 ...]";
-usage += "\n  Related commands: saveall ";  
+usage = "Reads all or some objects from a PPF file";
+usage += "\n  Usage: (1) openppf filename ";
+usage += "\n     Or  (2) openppf -s filename (2)";
+usage += "\n     Or  (3) openppf filename objname1 [ objname2 ...]";
+usage += "\n  The first form reads all objects at NameTags,";
+usage += "\n    or all objects if the file has no NameTags.";     
+usage += "\n  The third reads only the objects with the specified nametags";
+usage += "\n  Related commands: saveppf saveall savelist";  
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
 kw = "saveppf";
@@ -1007 +1021 @@
 kw = "listobjs";
 usage = "Prints the list of objects (Alias: ls)";
- usage += "\n Usage: listobjs [patt=*] \n patt : /*/x?y* ... ";
+usage += "\n Usage: listobjs [patt=*]  ";
+usage += "\n    Or  listobjs patt VarName ";
+ usage += "\n   Obj. name pattern patt in the form abc?x* or /*/x?y ... ";
 mpiac->RegisterCommand(kw, usage, this, "Object Management");
 kw = "rename";

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -1090 +1090 @@
 }
 /* --Methode-- */
-void NamedObjMgr::ReadAll(string const & flnm)
+void NamedObjMgr::ReadAll(string const & flnm, bool atnametags)
+  // Lit tous les objets d'un fichier PPF
+  // si atnametags == true -> objets avec nametags seulement
+  //    sinon, tous les objets sequentiellement
 {
 #ifdef SANS_EVOLPLANCK
@@ -1115 +1118 @@
 try {
   PInPersist pis(flnm);
-  if (pis.NbNameTags() >= 1)  { 
+  if (atnametags && (pis.NbNameTags() >= 1))  { 
     if (pis.NbNameTags() < pis.NbTopLevelObjects()) { 
       cout << "NamedObjMgr::ReadAll()/Warning File " << flnm << " NbNameTags="
@@ -1126 +1129 @@
   }
 
+  // On lit tous les objets sequentiellement ...
   string nom = servnobjm->FileName2Name(flnm);  
   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;

trunk/SophyaPI/PIext/nobjmgr.h

@@ -71 +71 @@
   virtual void          ReadObj(string const & nomppf, string & nobj);
   virtual void          ReadObj(vector<string> & flnm_objname);
-  virtual void          ReadAll(string const & nomppf);
+  virtual void          ReadAll(string const & nomppf, bool atnametags=true);
   virtual void          SaveObj(string & nom, POutPersist& s, bool keeppath=false);
   virtual void          SaveObjects(string & patt, string const& nomppf);