--- YodaProfiler/src/GLTables.cpp	2007/09/07 21:10:57	1.30
+++ YodaProfiler/src/GLTables.cpp	2007/10/19 07:47:52	1.32
@@ -38,6 +38,9 @@
   fPsw = new TString(psw.Data());
   fSet = true;
   fNquery = 0;
+  mh = host.Data();
+  mu = user.Data();
+  mp = psw.Data();
 };
 
 
@@ -47,6 +50,9 @@
   fPsw = new TString(psw.Data());
   fSet = true;
   fNquery = 0;
+  mh = host.Data();
+  mu = user.Data();
+  mp = psw.Data();
 };
 
 Bool_t GL_TABLES::IsConnected(TSQLServer *&dbc){
@@ -258,9 +264,9 @@
 GL_TIMESYNC::GL_TIMESYNC(){
   obtfirst = 0;
   pktfirst = 0;
-  toffset  = 0;
-  //  ID       = 0;
-  //  ID_RAW   = 0;
+  ID_RESURS_OFFSET  = 0;
+  ID       = 0;
+  ID_RAW   = 0;
   OBT0     = 0;
   TIMESYNC = 0;
   TYPE     = 0;
@@ -1493,37 +1499,76 @@
   TString name=rname.str().c_str();
   UInt_t dworbit = 0;
   Int_t nlength = name.Length();
-  if ( nlength < 5 ) return;
-  TString dwo = 0;
-  for (Int_t i = 0; i<5; i++){
-    dwo.Append(name[i],1);
-  };
-  if ( dwo.IsDigit() ){
-    dworbit = (UInt_t)dwo.Atoi();
-  } else {
-    dwo="";
-    for (Int_t i = 8; i<13; i++){
-      dwo.Append(name[i],1);
-    };     
-    if ( dwo.IsDigit() ){
-      dworbit = (UInt_t)dwo.Atoi();
-    } else {
-      dworbit = 1;
-    };
-  };
   //
+  // Is not a special file
   //
   if ( !Row ){
+    delete pResult;       
+    //
+    // New code, we have one more column on GL_TIMESYNC so we can trust that one for the Resurs offset
+    //
     oss.str("");
-    oss << "SELECT YEAR(OFFSET_DATE),MONTH(OFFSET_DATE),DAY(OFFSET_DATE),HOUR(OFFSET_DATE),MINUTE(OFFSET_DATE),SECOND(OFFSET_DATE) FROM GL_RESURS_OFFSET WHERE FROM_ORBIT< " 
-	<< dworbit << " order by FROM_ORBIT desc limit 1;";
+    oss << "SELECT ID_RESURS_OFFSET from GL_TIMESYNC where ID_RAW=" << idraw <<";";
     if ( !this->GetGLTABLES()->IsConnected(dbc) ) return;  
     this->GetGLTABLES()->AddQ();
     pResult = dbc->Query(oss.str().c_str());
-    Row = pResult->Next();
-    if ( !Row ){
-      printf(" ERROR FROM GLTables! cannot determine Resurs offset \n");
-      return;
+    Bool_t fndit = false;
+    if ( pResult ){
+      Row = pResult->Next();
+      if ( Row ){
+	oss.str("");
+	oss << "SELECT YEAR(OFFSET_DATE),MONTH(OFFSET_DATE),DAY(OFFSET_DATE),HOUR(OFFSET_DATE),MINUTE(OFFSET_DATE),SECOND(OFFSET_DATE) FROM GL_RESURS_OFFSET WHERE ID=" 
+	    << Row->GetField(0) << ";";
+	if ( !this->GetGLTABLES()->IsConnected(dbc) ) return;  
+	this->GetGLTABLES()->AddQ();
+	pResult = dbc->Query(oss.str().c_str());
+	if ( pResult ){
+	  Row = pResult->Next();
+	  if ( Row ){
+	    printf(" GREAT! the DB structure is the new one! \n");
+	    fndit = true;
+	    dworbit = 1;
+	  };
+	};
+      };
+    };
+    if ( !fndit ){
+      delete pResult;       
+      //
+      printf(" OK, you got an error because this is the old database\n Using backward compability code, hence you can continue safetly \n");
+      //
+      // Old code, we must trust the filename
+      //
+      if ( nlength < 5 ) return;
+      TString dwo = 0;
+      for (Int_t i = 0; i<5; i++){
+	dwo.Append(name[i],1);
+      };
+      if ( dwo.IsDigit() ){
+	dworbit = (UInt_t)dwo.Atoi();
+      } else {
+	dwo="";
+	for (Int_t i = 8; i<13; i++){
+	  dwo.Append(name[i],1);
+	};     
+	if ( dwo.IsDigit() ){
+	  dworbit = (UInt_t)dwo.Atoi();
+	} else {
+	  dworbit = 1;
+	};
+      };    
+      //
+      oss.str("");
+      oss << "SELECT YEAR(OFFSET_DATE),MONTH(OFFSET_DATE),DAY(OFFSET_DATE),HOUR(OFFSET_DATE),MINUTE(OFFSET_DATE),SECOND(OFFSET_DATE) FROM GL_RESURS_OFFSET WHERE FROM_ORBIT< " 
+	  << dworbit << " order by FROM_ORBIT desc limit 1;";
+      if ( !this->GetGLTABLES()->IsConnected(dbc) ) return;  
+      this->GetGLTABLES()->AddQ();
+      pResult = dbc->Query(oss.str().c_str());
+      Row = pResult->Next();
+      if ( !Row ){
+	printf(" ERROR FROM GLTables! cannot determine Resurs offset \n");
+	return;
+      };
     };
   };
   //