Changeset 2901 in Sophya

Timestamp:

Jan 16, 2006, 10:01:10 AM (20 years ago)

Author:

ansari

Message:

Petites modifs + commentaires doc ds fitsmanager.cc - Reza 16/01/2006

File:

• trunk/SophyaExt/FitsIOServer/fitsmanager.cc (modified) (5 diffs)

trunk/SophyaExt/FitsIOServer/fitsmanager.cc

@@ -64 +64 @@
 }
 
+/*!
+  Return a NULL pointer if no handler is registered for object \b o .
+  The returned pointer should not be used directly and should NOT
+  be deleted. For read/write operations, the Clone() method should
+  be called on the returned object.
+*/
 FitsHandlerInterface* FitsManager::FindHandler(AnyDataObj & o)
 {
@@ -80 +86 @@
     }
   }
+  return fhi ;
+}
+
+/*!
+  Throws an exception ( NotFoundExc ) if the write operation can not be performed. 
+*/
+void FitsManager::Write(FitsInOutFile& os, AnyDataObj & o)
+{
+  FitsHandlerInterface * fhi = FindHandler(o);
   if (fhi == NULL) {
-    string msg = "FitsManager::FindHandler() Handler not found for ";
+    string msg = "FitsManager::Write()/FindHandler() Handler not found for ";
     msg += typeid(o).name();
     throw NotFoundExc(msg);
   }
-  else return fhi;
-}
-
-void FitsManager::Write(FitsInOutFile& os, AnyDataObj & o)
-{
-  FitsHandlerInterface * fhi2 = FindHandler(o)->Clone();
+  FitsHandlerInterface * fhi2 = fhi->Clone();
   fhi2->SetDataObj(o);
   fhi2->Write(os);
+  delete fhi2 ;
   return;
 }
 
+/*!
+  Throws an exception ( NotFoundExc ) if the read operation can not be performed. 
+*/
 void FitsManager::Read(FitsInOutFile& is, AnyDataObj & o)
 {
-  FitsHandlerInterface * fhi2 = FindHandler(o)->Clone();
+  FitsHandlerInterface * fhi = FindHandler(o);
+  if (fhi == NULL) {
+    string msg = "FitsManager::Read()/FindHandler() Handler not found for ";
+    msg += typeid(o).name();
+    throw NotFoundExc(msg);
+  }
+  FitsHandlerInterface * fhi2 = fhi->Clone();
   fhi2->SetDataObj(o);
   fhi2->Read(is);
@@ -105 +125 @@
 }
 
+/*!
+  Return a NULL pointer if no handler is found capable of reading
+  the current HDU.
+  The returned pointer should not be used directly and should NOT
+  be deleted. For read/write operations, the Clone() method should
+  be called on the returned object.
+*/
 FitsHandlerInterface * FitsManager::FindReader(FitsInOutFile& is)
 {
@@ -120 +147 @@
     }
   }
+  return fhi;
+}
+
+/*!
+  Throws an exception ( NotFoundExc ) if the read operation can not be performed. 
+  In case of success, the calling function is responsible for deleting 
+  the returned FitsHandlerInterface object, when the correspondind data object
+  is not needed any more.
+*/
+FitsHandlerInterface * FitsManager::Read(FitsInOutFile& is)
+{
+  FitsHandlerInterface * fhi = FindReader(is);
   if (fhi == NULL) {
-    string msg = "FitsManager::FindReader() Reader/Handler not found  ";
+    string msg = "FitsManager::Read()/FindReader() Reader/Handler not found  ";
     msg += is.FileName();
     char buff[64];
@@ -129 +168 @@
     throw NotFoundExc(msg);
   }
-  else return fhi;
-}
-
-FitsHandlerInterface * FitsManager::Read(FitsInOutFile& is)
-{
   FitsHandlerInterface * fhi2 = FindReader(is)->Clone();
   fhi2->Read(is);