Changeset 2864 in Sophya for trunk/SophyaExt/FitsIOServer/fitsmanager.cc

Timestamp:

Jan 2, 2006, 2:47:44 PM (20 years ago)

Author:

ansari

Message:

1/ Ajout methode CheckReadability() , retour int pour CheckHandling() ds l'interface FitsHandler et propagation vers handler TArray et DataTable
2/ Correction dans FitsManager et ajout initialiseur de module FitsIOServer (fiosinit.h .cc)
3/ FitsSwapper complete - corrige - full template (suppression de fitsswapper.cc)
4/ MAJ Makefile et objlist.list suite ajout fiosinit.cc et swfitsdtable

Reza , 2 Jan 2006

File:

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

trunk/SophyaExt/FitsIOServer/fitsmanager.cc

@@ -24 +24 @@
 }
 
-int FitsManager::RegisterHandler(FitsHandlerInterface * fhi, string & clname)
+int FitsManager::RegisterHandler(FitsHandlerInterface * fhi, string  clname)
 {
+  ChkHLP(); 
   if (fhi == NULL)
     throw NullPtrError("FitsManager::RegisterHandler() fhi=NULL ");
@@ -42 +43 @@
 int FitsManager::ListHandlers()
 {
+  ChkHLP(); 
   int kk=0;
   cout << "---- FitsManager::ListHandlers()  NbHandlers= " << hlistp->size()
@@ -56 +58 @@
 FitsHandlerInterface* FitsManager::FindHandler(AnyDataObj & o)
 {
+  ChkHLP(); 
   FitsHandlerInterface * fhi = NULL;
   HandlerList::iterator it;
-  for(it = hlistp->begin(); it != hlistp->end(); it++) 
-    if ( (*it).fhi->CheckHandling(o) ) {
-      fhi = (*it).fhi; break;
+  int hfg = 0;
+  int bhfg = 0;
+  for(it = hlistp->begin(); it != hlistp->end(); it++) {
+    hfg = (*it).fhi->CheckHandling(o);
+    if ( hfg > bhfg ) {
+      fhi = (*it).fhi;  bhfg = hfg;
     }
+  }
   if (fhi == NULL) {
     string msg = "FitsManager::FindHandler() Handler not found for ";
@@ -78 +85 @@
 }
 
-void FitsManager::Read(FitsInOutFile& os, AnyDataObj & o)
+void FitsManager::Read(FitsInOutFile& is, AnyDataObj & o)
 {
   FitsHandlerInterface * fhi2 = FindHandler(o)->Clone();
   fhi2->SetDataObj(o);
-  fhi2->Read(os);
+  fhi2->Read(is);
+  delete fhi2;
   return;
 }
+
+FitsHandlerInterface * FitsManager::FindReader(FitsInOutFile& is)
+{
+  ChkHLP(); 
+  FitsHandlerInterface * fhi = NULL;
+  HandlerList::iterator it;
+  int hfg = 0;
+  int bhfg = 0;
+  for(it = hlistp->begin(); it != hlistp->end(); it++) {
+    hfg = (*it).fhi->CheckReadability(is);
+    if ( hfg > bhfg ) {
+      fhi = (*it).fhi;  bhfg = hfg;
+    }
+  }
+  if (fhi == NULL) {
+    string msg = "FitsManager::FindReader() Reader/Handler not found  ";
+    msg += is.FileName();
+    char buff[64];
+    sprintf(buff, " HDU= %d Type= %d", (int)(is.CurrentHDU()), 
+            (int)(is.CurrentHDUType()) );
+    msg += buff;
+    throw NotFoundExc(msg);
+  }
+  else return fhi;
+}
+
+FitsHandlerInterface * FitsManager::Read(FitsInOutFile& is)
+{
+  FitsHandlerInterface * fhi2 = FindReader(is)->Clone();
+  fhi2->Read(is);
+  return fhi2;
+}