Changeset 2895 in Sophya for trunk/SophyaExt

Timestamp:

Jan 12, 2006, 8:46:40 AM (20 years ago)

Author:

ansari

Message:

Ajout priorite a l'enregistrement pour Fitshandlers - Reza 12/01/2006

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fiosinit.cc (modified) (1 diff)
• fitsmanager.cc (modified) (6 diffs)
• fitsmanager.h (modified) (1 diff)

trunk/SophyaExt/FitsIOServer/fiosinit.cc

@@ -27 +27 @@
 //  FitsManager::RegisterHandler(new FitsArrayHandler<int_2> , "TArray<int_2>");
   cout << " ---- FitsIOServerInitiator / DEBUG ---- debut RegisterHandler " << endl;
-  FitsManager::RegisterHandler(new FitsArrayHandler<int_4> , "TArray<int_4>");
-  FitsManager::RegisterHandler(new FitsArrayHandler<r_4> , "TArray<r_4>");
-  FitsManager::RegisterHandler(new FitsArrayHandler< r_8 > , "TArray<r_8>");
+  FitsManager::RegisterHandler(new FitsArrayHandler<int_4> , 1, "TArray<int_4> ");
+  FitsManager::RegisterHandler(new FitsArrayHandler<r_4> , 1, "TArray<r_4>");
+  FitsManager::RegisterHandler(new FitsArrayHandler< r_8 > , 1, "TArray<r_8>");
 
-  FitsManager::RegisterHandler(new FitsHandler<BaseDataTable>, "DataTable");
+  FitsManager::RegisterHandler(new FitsHandler<BaseDataTable>, 1, "DataTable");
 
   cout << " ---- FitsIOServerInitiator / DEBUG ---- ListHandlers() : " << endl;

trunk/SophyaExt/FitsIOServer/fitsmanager.cc

@@ -12 +12 @@
 struct hand_list_el {
   FitsHandlerInterface * fhi;
-  string clname;
+  int glev;
+  string desc;
 };
 
@@ -23 +24 @@
   if (hlistp == NULL) hlistp = new HandlerList;
 }
-
-int FitsManager::RegisterHandler(FitsHandlerInterface * fhi, string  clname)
+/*!
+  \param fhi : handler object pointer (created by new) which will be kept in the 
+  handler list
+  \param glev : global priority level associated with the handler. Used when different
+  handlers return the same value for CheckHandling() or CheckReadability().
+  \param desc : classe name description associated with the handler
+*/
+int FitsManager::RegisterHandler(FitsHandlerInterface * fhi, int glev, string desc)
 {
   ChkHLP(); 
@@ -36 +43 @@
   hand_list_el hle;
   hle.fhi = fhi;
-  hle.clname = clname;
+  hle.glev = glev;
+  hle.desc = desc;
   hlistp->push_back(hle);
   return hlistp->size();
@@ -50 +58 @@
   for(it = hlistp->begin(); it != hlistp->end(); it++) {
     kk++;
-    cout << kk << "- " << (*it).clname << " : " 
-         << typeid(*((*it).fhi)).name() << endl;
+    cout << kk << "- " << (*it).desc << " : " 
+         << typeid(*((*it).fhi)).name() << " glev= " <<(*it).glev << endl;
   }
   return hlistp->size();
@@ -63 +71 @@
   int hfg = 0;
   int bhfg = 0;
+  int clev = 0;
+  int blev = 0;
   for(it = hlistp->begin(); it != hlistp->end(); it++) {
     hfg = (*it).fhi->CheckHandling(o);
-    if ( hfg > bhfg ) {
-      fhi = (*it).fhi;  bhfg = hfg;
+    if ( ( hfg > bhfg ) || ( (hfg == bhfg) && ((*it).glev > blev) ) ) {
+      fhi = (*it).fhi;  bhfg = hfg;  blev = (*it).glev;
     }
   }
@@ -101 +111 @@
   int hfg = 0;
   int bhfg = 0;
+  int blev = 0;
   for(it = hlistp->begin(); it != hlistp->end(); it++) {
     hfg = (*it).fhi->CheckReadability(is);
-    if ( hfg > bhfg ) {
-      fhi = (*it).fhi;  bhfg = hfg;
+    if ( ( hfg > bhfg ) || ( (hfg == bhfg) && ((*it).glev > blev) ) ) {
+      fhi = (*it).fhi;  bhfg = hfg;  blev = (*it).glev;
     }
   }

trunk/SophyaExt/FitsIOServer/fitsmanager.h

@@ -17 +17 @@
  public:
   //! Called once for each handler during init phase.
-  static int  RegisterHandler(FitsHandlerInterface * fhi, string clname="");
+  static int  RegisterHandler(FitsHandlerInterface * fhi, int glev=0, string desc="");
   //! Print list of handlers on cout 
   static int  ListHandlers();