--- YodaProfiler/src/GLTables.cpp	2007/02/14 10:54:59	1.23
+++ YodaProfiler/src/GLTables.cpp	2007/09/09 18:59:41	1.31
@@ -38,6 +38,9 @@
   fPsw = new TString(psw.Data());
   fSet = true;
   fNquery = 0;
+  mh = host.Data();
+  mu = user.Data();
+  mp = psw.Data();
 };
 
 
@@ -47,9 +50,12 @@
   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){
+Bool_t GL_TABLES::IsConnected(TSQLServer *&dbc){
   //
   // 
   //
@@ -59,18 +65,28 @@
   //
   //
   //
-  //  printf(" host is %s \n",fHost->Data());
+  //    printf(" host is %s \n",fHost->Data());
   //
   stringstream myquery;  
   myquery.str("");
   myquery << "show databases;";
-  dbc->Query(myquery.str().c_str());
-  fNquery++;
-  //
-  if ( dbc->GetErrorCode() != 2013 && dbc->GetErrorCode() != 2006 ){
-    // is connected
-    return true;
-  } else {
+  if ( dbc ){
+    if ( dbc->IsConnected() ){
+      dbc->Query(myquery.str().c_str());
+      fNquery++;
+      if ( !(dbc->GetErrorCode()) ){
+	//	printf("ok\n");
+	//
+	//  if ( (dbc->GetErrorCode() != 2013 && dbc->GetErrorCode() != 2006) ){
+	//    if ( !(dbc->GetErrorCode()) ){
+	// is connected
+	return true;
+	//    };
+      };
+    };
+  };
+  //  printf("porca di quella \n");
+  if ( true ) {
     //
     printf(" WARNING: Lost connection to DB! try to recover... \n");
     //
@@ -84,8 +100,10 @@
     myquery << "show databases;";
     dbc->Query(myquery.str().c_str());
     fNquery++;
+    //    printf(" e riporca di quella \n");
     //
-    if ( dbc->GetErrorCode() != 2013 && dbc->GetErrorCode() != 2006 ){
+    //    if ( dbc->GetErrorCode() != 2013 && dbc->GetErrorCode() != 2006 ){
+    if ( !(dbc->GetErrorCode()) ){
       //
       printf(" ...connection recovered, I can continue! \n");
       //
@@ -1145,7 +1163,7 @@
 	  if(t==0) ID     = (UInt_t)atoll(Row->GetField(t));
 	  if(t==1) ID_RAW = (UInt_t)atoll(Row->GetField(t));
 	  if(t==2) ID_TIMESYNC = (UInt_t)atoll(Row->GetField(t));
-	  if(t==3) PATH   = Row->GetField(t);
+	  if(t==3) PATH   = (TString)gSystem->ExpandPathName(Row->GetField(t))+'/';
 	  if(t==4) NAME   = Row->GetField(t);
       };
   };
@@ -1170,7 +1188,9 @@
   // ----------------
   myquery.str("");
   myquery << "select ID,ID_ROOT_L0,EV_ROOT_CALIBTRK1,EV_ROOT_CALIBTRK2,FROM_TIME,TO_TIME,OBT1,OBT2,PKT1,PKT2,BOOT_NUMBER,VALIDATION from GL_TRK_CALIB where FROM_TIME <= "<< time;
-  myquery << " AND VALIDATION=1 ORDER BY FROM_TIME DESC LIMIT 1;";      
+//  myquery << " AND VALIDATION=1 ORDER BY FROM_TIME DESC LIMIT 1;";      // RIVEDERE LA VALIDAZIONE!!!
+  myquery << " and EV_ROOT_CALIBTRK1>=0 and EV_ROOT_CALIBTRK2>=0 "; // EM! SE MANCA UN PACCHETTO DEI DUE IL PROCESSAMENTO CRASHA... DA RIVEDERE LA VALIDAZIONE      
+  myquery << " ORDER BY FROM_TIME DESC LIMIT 1;";      
   //  myquery << " ORDER BY FROM_TIME DESC LIMIT 1;";      
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
@@ -1338,7 +1358,7 @@
   // ----------------    
   myquery.str("");
   myquery << " select ";
-  myquery << " ID, PATH, NAME, DESCR, TYPE, FROM_TIME,TO_TIME ";
+  myquery << " ID, PATH, NAME, DESCR, FROM_TIME,TO_TIME, TYPE ";
   myquery << " from GL_PARAM ";
   myquery << " where TYPE = '"<<type<<"' ";
   myquery << " and FROM_TIME <= " << time; 
@@ -1353,7 +1373,7 @@
       if( Row == NULL ) break;
       for( t = 0; t < pResult->GetFieldCount(); t++){ 
 	if (t==0) ID        = (UInt_t)atoll(Row->GetField(t));
-	  if (t==1) PATH      = Row->GetField(t);// put in fpath the path to that file
+	if (t==1) PATH      = (TString)gSystem->ExpandPathName(Row->GetField(t))+'/';// put in fpath the path to that file
 	  if (t==2) NAME      = Row->GetField(t);
 	  if (t==3) DESCR     = Row->GetField(t);
 	  if (t==4) FROM_TIME = (UInt_t)atoll(Row->GetField(t));
@@ -1420,7 +1440,7 @@
     if( Row ){
       stringstream fname;
       fname.str("");
-      fname << Row->GetField(0) << "/" << Row->GetField(1);
+      fname << gSystem->ExpandPathName(Row->GetField(0)) << "/" << Row->GetField(1);
       rname << Row->GetField(1);
       file = new TFile(fname.str().c_str(),"READ");
       idraw = (UInt_t)atoll(Row->GetField(2));
@@ -1466,9 +1486,11 @@
   //
   //
   stringstream oss;
+  TString frn = rname.str().c_str();
+  frn = frn.ReplaceAll(".root",5,".pam",4);
   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 SPECIAL_FILE='" 
-      << rname.str().c_str() << "';";
+      << frn.Data() << "';";
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return;  
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(oss.str().c_str());
@@ -1804,10 +1826,10 @@
   TSQLRow *row;
 
   // Set the right time_zone (otherwise horrible things will occur! :)
+  if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   dbc->Query("SET time_zone = '+0:00'");
 
   // Do the query
-  if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
   result = dbc->Query(myquery.Data());
   if(! result->GetRowCount() ) {