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

Timestamp:

Oct 21, 1999, 8:58:45 PM (26 years ago)

Author:

ercodmgr

Message:

Portage -> DPPlanck , Reza+cmv 21/10/99

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -684 +684 @@
 void NamedObjMgr::ReadObj(string const & flnm, string & nobj)
 {
-PPersist* obj=NULL;
+PPersist* ppobj=NULL;
 bool ok = true;
-
+#ifdef SANS_EVOLPLANCK
 TRY{
   PInPersist pis(flnm);
-  obj = PPersistMgr::ReadObject(pis);
-  if (obj == NULL) ok = false;
+  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);
+  ppobj = pis.ReadObject();
+  }
+catch (IOExc iox) {
+  cerr << "NamedObjMgr::ReadObj()/Error Exception - Msg= " << iox.Msg() << endl;
+  ok = false;
+  }
+#endif
 if (!ok)  return;
 if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
-AddObj(obj->DataObj(), nobj, true);
+AddObj(ppobj->DataObj(), nobj, true);
 return;
 }
@@ -713 +722 @@
 if ( (s.NbTags() < 1) || (num >= s.NbTags()) ) {
   if (num >= 0) { 
-    printf("NamedObjMgr::ReadObj(PInPersist, %d) Error! NbTags = %d \n", num, s.NbTags());
+    cerr << "NamedObjMgr::ReadObj(PInPersist, " << num << "  Error! NbTags =" 
+         << s.NbTags() << endl;
     return;
   }
+
+#ifdef SANS_EVOLPLANCK
   TRY {
     obj = PPersistMgr::ReadObject(s);
@@ -723 +735 @@
     ok = false; 
   } ENDTRY;
+#else
+try {
+  obj = s.ReadObject();
+  }
+catch (IOExc iox) {
+  cerr << "NamedObjMgr::ReadObj()/Error Exception - Msg= " << iox.Msg() << endl;
+  ok = false;
+  }
+#endif
+
   if (!ok)  return;
   nom = "";
@@ -732 +754 @@
 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 = "";
@@ -743 +766 @@
     ok = false; 
   } ENDTRY;
+#else
+  s.GotoTagNum(i);
+  try {
+    obj = s.ReadObject();
+    char buffnom[64];
+    sprintf(buffnom,"O%d",i);
+    nom = buffnom;
+  }
+  catch (IOExc iox) {
+    cerr << "NamedObjMgr::ReadObj()/Error Exception - Msg= " << iox.Msg() << endl;
+    ok = false;
+    }
+#endif
   if (ok)  { AddObj(obj->DataObj(), nom, true);  nread++; }
 }
@@ -756 +792 @@
 
 PInPersist* ppin;
+#ifdef SANS_EVOLPLANCK
 TRY{
   ppin = new PInPersist(flnm);
@@ -763 +800 @@
   { printf("NamedObjMgr::ReadAll()/Error Exception= %ld (%s) \n", 
     (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-
+#else
+try {
+  ppin = new PInPersist(flnm);
+  if (ppin->NbTags() < 1)  obj = ppin->ReadObject();
+  else   obj = NULL; 
+}
+catch (IOExc iox) {
+    cerr << "NamedObjMgr::ReadAll()/Error Exception - Msg= " << iox.Msg() << endl;
+    ok = false;
+}
+#endif
 if (!ok)  return;
 if (obj) {
@@ -784 +831 @@
 #endif
 
-TRY{
 //  obj = RzReadFits((char*)flnm.c_str(), ImgOffX, ImgOffY, ImgSizX, ImgSizY, ImgBitSgn);
 #ifdef SANS_EVOLPLANCK 
+TRY{
   obj = RzReadFits((char*)flnm.c_str());
-#else
-  printf("NamedObjMgr::ReadFITS( NON-Disponible EVOL-PLANCK) \n"); 
-  obj = NULL;
-#endif
   if (obj == NULL)   ok = false;
 }  CATCH(merr) { 
@@ -801 +844 @@
   AddObj((AnyDataObj*)obj, nobj);
 }
+#else
+  printf("NamedObjMgr::ReadFITS( NON-Disponible EVOL-PLANCK) \n"); 
+#endif
 return;
 }
@@ -834 +880 @@
 bool ok = true;
 POutPersist* pout;
+#ifdef SANS_EVOLPLANCK 
 TRY{
   pout = new POutPersist(flnm);
@@ -839 +886 @@
   { printf("NamedObjMgr::SaveObjects()/Error Exception= %ld (%s) \n", 
     (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
+#else
+try {
+ pout = new POutPersist(flnm);
+}
+catch (IOExc iox) {
+    cerr << "NamedObjMgr::SaveObjects()/Error Exception - Msg= " << iox.Msg() << endl;
+    ok = false;
+}
+#endif
 if (!ok)  return;
 NObjList::iterator it;
@@ -857 +913 @@
 
 POutPersist* pout;
+#ifdef SANS_EVOLPLANCK 
 TRY{
   pout = new POutPersist(flnm);
@@ -862 +919 @@
   { printf("NamedObjMgr::SaveAll()/Error Exception= %ld (%s) \n", 
     (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
+#else
+try {
+ pout = new POutPersist(flnm);
+}
+catch (IOExc iox) {
+    cerr << "NamedObjMgr::SaveAll()/Error Exception - Msg= " << iox.Msg() << endl;
+    ok = false;
+}
+#endif
 if (!ok)  return;
 NObjList::iterator it;