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

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -20 +20 @@
 #include "dvlist.h"
 
-// EVOL-PLANCK
-#ifdef SANS_EVOLPLANCK
-#include "fitsimage.h"  
-#else
 #include "tvector.h"
 #include "pitvmaad.h"
 #include "piyfxdrw.h"
-#endif
 
 #include "pisurfdr.h"
@@ -259 +254 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  bool fg = true;
-#else
   bool fg = myVars->HasKey(key);
-#endif
   myVars->SetS(key, val);
   //  cout << " DEBUG::SetVar " << *myVars << endl;
@@ -277 +268 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  DVList::ValList::const_iterator it;
-  for(it=myVars->Begin(); it!= myVars->End(); it++)
-    if ((*it).first == key)  return true;
-  return(false);
-#else
   return(myVars->HasKey(key));
-#endif
 }
 
@@ -295 +279 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  return(false);
-#else
   return(myVars->DeleteKey(key));
-#endif
 }
 
@@ -945 +925 @@
 PPersist* ppobj=NULL;
 bool ok = true;
-#ifdef SANS_EVOLPLANCK
-TRY{
-  PInPersist pis(flnm);
-  ppobj = PPersistMgr::ReadObject(pis);
-  if (ppobj == NULL) ok = false;
-}  CATCH(merr) 
-  { printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
   PInPersist pis(flnm);
@@ -962 +933 @@
   ok = false;
   }
-#endif
 if (!ok)  return;
 if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
@@ -1011 +981 @@
 {
 int_4 i; // $CHECK$ int -> int_4 a cause de TagKey
-#ifdef SANS_EVOLPLANCK
-int_4 cid, key, ln; // $CHECK$ int -> int_4 a cause de TagKey
-#endif
 int n0, n1;
 bool ok = true;
@@ -1021 +988 @@
 int nread = 0;
 int nbtags = 0;
-#ifdef SANS_EVOLPLANCK
-nbtags = s.NbTags();
-#else 
 nbtags = s.NbNameTags();
-#endif
 if ( (nbtags < 1) || (num >= nbtags) ) {
   if (num >= 0) { 
@@ -1033 +996 @@
   }
 
-#ifdef SANS_EVOLPLANCK
-  TRY {
-    obj = PPersistMgr::ReadObject(s);
-    if (obj == NULL)  ok = false;
-  }  CATCH(merr) { 
-    printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-    ok = false; 
-  } ENDTRY;
-#else
 try {
   obj = s.ReadObject();
@@ -1049 +1003 @@
   ok = false;
   }
-#endif
 
   if (!ok)  return;
@@ -1060 +1013 @@
 else { n0 = num; n1 = num+1; }
 for(i=n0; i<n1; i++) {
-#ifdef SANS_EVOLPLANCK
-  key = s.TagKey(i, cid, ln); 
-  if (ln <= 0)  nom = "";
-  else nom = s.TagName(i);
-  s.GotoTag(i);
-  TRY {
-    obj = PPersistMgr::ReadObject(s);
-    if (obj == NULL)  ok = false;
-  }  CATCH(merr) { 
-    printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-    ok = false; 
-  } ENDTRY;
-#else
   s.GotoNameTagNum(i);
   nom = s.GetTagName(i);
@@ -1082 +1022 @@
     ok = false;
     }
-#endif
   if (ok)  { AddObj_P(obj->DataObj(), nom, true);  nread++; }
 }
@@ -1095 +1034 @@
   //    sinon, tous les objets sequentiellement
 {
-#ifdef SANS_EVOLPLANCK
-bool ok = true;
-PPersist* obj=NULL;
-
-PInPersist* ppin=NULL;
-TRY{
-  ppin = new PInPersist(flnm);
-  if (ppin->NbTags() < 1)  obj = PPersistMgr::ReadObject((*ppin));
-  else obj = NULL;
-}  CATCH(merr) 
-  { printf("NamedObjMgr::ReadAll()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } 
-ENDTRY;
-if (!ok)  return;
-if (obj) {
-  string nom = servnobjm->FileName2Name(flnm);
-  AddObj(obj->DataObj(), nom, false);
-  }
-else ReadObj((*ppin), -1);
-delete ppin;
-#else
 try {
   PInPersist pis(flnm);
@@ -1151 +1069 @@
   cerr << "NamedObjMgr::ReadAll()/Error Exception - Msg= " << iox.Msg() << endl;
 }
-#endif
 return;
 }
@@ -1193 +1110 @@
 bool ok = true;
 POutPersist* pout=NULL;
-#ifdef SANS_EVOLPLANCK 
-TRY{
-  pout = new POutPersist(flnm);
-}  CATCH(merr) 
-  { printf("NamedObjMgr::SaveObjects()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
  pout = new POutPersist(flnm);
@@ -1207 +1117 @@
     ok = false;
 }
-#endif
 if (!ok)  return;
 NObjList::iterator it;
@@ -1262 +1171 @@
 
 POutPersist* pout=NULL;
-#ifdef SANS_EVOLPLANCK 
-TRY{
-  pout = new POutPersist(flnm);
-}  CATCH(merr) 
-  { printf("NamedObjMgr::SaveAll()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
  pout = new POutPersist(flnm);
@@ -1276 +1178 @@
     ok = false;
 }
-#endif
 if (!ok)  return;
 NObjList::iterator it;
@@ -1583 +1484 @@
 NObjMgrSync zs(0); zs.NOp(); 
 
-#ifdef SANS_EVOLPLANCK
-  cerr << " NamedObjMgr::DisplayVector() Error: Not implemented with PEIDA " << endl;
-#else
-
 if(!myImgApp) return; 
 
@@ -1651 +1548 @@
 return;
 
-#endif
 }