--- chewbacca/YodaProfiler/src/GLTables.cpp	2009/12/15 09:58:25	1.12
+++ chewbacca/YodaProfiler/src/GLTables.cpp	2012/02/12 11:41:00	1.16
@@ -33,10 +33,20 @@
 using namespace std;
 
 Q2TH::Q2TH(TString host, TString user, TString psw){
+  this->Open(host,user,psw);
+};
+
+void Q2TH::Open(TString host, TString user, TString psw){
   fh = gSystem->ExpandPathName(host.Data());
   fu = gSystem->ExpandPathName(user.Data());
   fp = gSystem->ExpandPathName(psw.Data());
+  printf(" Connecting to DB %s \n",fh.Data());
   dbc = TSQLServer::Connect(fh.Data(),fu.Data(),fp.Data());
+  if ( dbc && dbc->IsConnected() ){
+    printf(" connected! \n");
+  } else {
+    printf(" ERROR! not connected... :( \n");
+  };
 };
 
 TObject *Q2TH::Draw(TString query, Bool_t verbose, TString hname){
@@ -58,6 +68,8 @@
     return NULL;
   };
   //
+  if (Row)
+    delete Row;
   pResult = dbc->Query(query.Data());
   //
   Row = pResult->Next();      
@@ -87,6 +99,8 @@
       if ( f2 < minf2 ) minf2 = f2;
 
     };
+    if (Row)
+      delete Row;
     Row = pResult->Next();
   };
   pResult->Delete();
@@ -126,6 +140,8 @@
   //
   pResult = dbc->Query(query.Data());
   //
+  if (Row)
+    delete Row;
   Row = pResult->Next();      
   //
   Int_t r = 0;
@@ -141,6 +157,8 @@
       h2->Fill(f1,f2);
     };
     r++;
+    if (Row)
+      delete Row;
     Row = pResult->Next();
   };
   //
@@ -154,6 +172,8 @@
   if ( dim == 1 ) h1->Draw();
   if ( dim == 2 ) h2->Draw();
   //
+  if (Row)
+    delete Row;
   pResult->Delete();
   if ( dim == 1 ) return h1;
   if ( dim == 2 ) return h2;
@@ -203,7 +223,7 @@
   myquery << "show databases;";
   if ( dbc ){
     if ( dbc->IsConnected() ){
-      dbc->Query(myquery.str().c_str());
+      delete dbc->Query(myquery.str().c_str());
       fNquery++;
       if ( !(dbc->GetErrorCode()) ){
 	//	printf("ok\n");
@@ -227,12 +247,13 @@
     if ( dbc ){
       dbc->Close();
       delete dbc;
+      dbc = 0;
     };
     dbc = TSQLServer::Connect(host.Data(),user.Data(),psw.Data());
     //
     myquery.str("");
     myquery << "show databases;";
-    dbc->Query(myquery.str().c_str());
+    delete dbc->Query(myquery.str().c_str());
     fNquery++;
     //    if ( dbc->GetErrorCode() != 2013 && dbc->GetErrorCode() != 2006 ){
     if ( !(dbc->GetErrorCode()) ){
@@ -241,11 +262,11 @@
       //
       myquery.str("");
       myquery << "SET time_zone='+0:00'";
-      dbc->Query(myquery.str().c_str());
+      delete dbc->Query(myquery.str().c_str());
       fNquery++;
       myquery.str("");
       myquery << "SET wait_timeout=173000;";
-      dbc->Query(myquery.str().c_str());      
+      delete dbc->Query(myquery.str().c_str());
       fNquery++;
       return true;
     };
@@ -664,7 +685,7 @@
 Int_t GL_RUN::DeleteRun(TSQLServer *dbc,UInt_t IDRUN,TString FromTable){
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   stringstream myquery;
   //
   if ( !IDRUN ) IDRUN = ID;
@@ -714,7 +735,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   // retrieve this ID_TRASH
   //
@@ -728,6 +749,8 @@
   UInt_t idl0 = 0;
   UInt_t idl2 = 0;
   //
+  if (Row)
+    delete Row;
   Row = pResult->Next();      
   if( Row != NULL ){
     idtrash = (UInt_t)atoll(Row->GetField(0));
@@ -743,10 +766,18 @@
   //
   //  printf("2myquery is %s \n",myquery.str().c_str());
   //
-  if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
+  if ( !this->GetGLTABLES()->IsConnected(dbc) ){
+    if (pResult)
+      delete pResult;
+    if (Row)
+      delete Row;
+    return -57;
+  }
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str());
   //
+  if (Row)
+    delete Row;
   Row = pResult->Next();      
   if( Row != NULL ){
     fileL0 = (TString)Row->GetField(0);
@@ -760,14 +791,28 @@
   //
   //  printf("3myquery is %s \n",myquery.str().c_str());
   //
-  if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
+  if ( !this->GetGLTABLES()->IsConnected(dbc) ){
+    if (pResult)
+      delete pResult;
+    if (Row)
+      delete Row;
+    return -57;
+  }
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str());
   //
+  if (Row)
+    delete Row;
   Row = pResult->Next();      
   if( Row != NULL ){
     fileL2 = (TString)Row->GetField(0);
-  };
+  }
+  delete pResult;
+  pResult = NULL;
+  if (Row){
+    delete Row;
+    Row = NULL; // This variable is not used below
+  }
   //
   //
   //
@@ -780,7 +825,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   myquery.str("");
   myquery << " UPDATE GL_RUN_TRASH SET FILENAMEL2='";
@@ -791,7 +836,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   myquery.str("");
   myquery << " UPDATE GL_RUN_TRASH SET BELONGED_TO='";
@@ -803,7 +848,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   myquery.str("");
   myquery << " DELETE FROM ";
@@ -815,7 +860,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   return 0;
 };
@@ -831,8 +876,8 @@
   // insert into GL_RUN_FRAGMENTS select * FROM GL_RUN where ID=11;
   //insert into GL_RUN_TRASH VALUES (ID , ID_RUN_FRAG , ID_ROOT_L0 , ID_ROOT_L2 , RUNHEADER_TIME , RUNTRAILER_TIME , RUNHEADER_OBT , RUNTRAILER_OBT , RUNHEADER_PKT , RUNTRAILER_PKT , BOOT_NUMBER , EV_FROM , EV_TO  , NEVENTS , PKT_COUNTER , PKT_READY_COUNTER , COMPILATIONTIMESTAMP , FAV_WRK_SCHEDULE , EFF_WRK_SCHEDULE , PRH_VAR_TRG_MODE_A , PRH_VAR_TRG_MODE_B , ACQ_BUILD_INFO , ACQ_VAR_INFO , RM_ACQ_AFTER_CALIB , RM_ACQ_SETTING_MODE, TRK_CALIB_USED,CAL_DSP_MASK, LAST_TIMESYNC, OBT_TIMESYNC, VALIDATION, INSERT_TIME) select * FROM GL_RUN where ID=11;
   // MySQL variables
-  TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLResult *pResult = NULL;
+  TSQLRow *Row = NULL;
   stringstream myquery;
   //
   if ( !IDRUN ) IDRUN = ID;
@@ -854,9 +899,15 @@
     if( Row != NULL ){
      ToTable = (TString)Row->GetField(0);
     } else {
+      delete pResult;
       return 1;
     };
   };
+
+  if (pResult)
+    delete pResult;
+  if (Row)
+    delete Row;
   // ----------------
   myquery.str("");
   myquery << " INSERT INTO ";
@@ -937,7 +988,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   //
   myquery.str("");
@@ -946,7 +997,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   return 0;
 };
@@ -1034,7 +1085,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   return 0;
 
@@ -1116,7 +1167,7 @@
   //
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
-  dbc->Query(myquery.str().c_str());
+  delete dbc->Query(myquery.str().c_str());
   //
   return 0;
 
@@ -1133,8 +1184,7 @@
 Int_t GL_RUN::Query_GL_RUN(UInt_t run, TSQLServer *dbc){
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
-  int t;
+  TSQLRow *Row = NULL;
   int r;
   stringstream myquery;
   // ----------------
@@ -1181,13 +1231,20 @@
   //
   //  printf(" getrowcount %i \n",pResult->GetRowCount());
   //
-  if( !pResult->GetRowCount() ) return(-50);
+  if( !pResult->GetRowCount() ){
+    delete pResult;
+    if (Row)
+      delete Row;
+    return(-50);
+  }
   //
-  for( r=0; r < 1000; r++){ 
+  for( r=0; r < 1000; r++){
+	  if (Row)
+	    delete Row;
       Row = pResult->Next();      
       if( Row == NULL ) break;
 //	  Set_GL_RUN(Row);
-      for( t = 0; t < pResult->GetFieldCount(); t++){ 
+      for( int t = 0; t < pResult->GetFieldCount(); t++){ 
 	if (t== 0) ID                = (UInt_t)atoll(Row->GetField(t));
 	if (t== 1) ID_RUN_FRAG       = (UInt_t)atoll(Row->GetField(t));
 	if (t== 2) ID_ROOT_L0        = (UInt_t)atoll(Row->GetField(t));
@@ -1221,8 +1278,11 @@
 	if (t==30) PHYSENDRUN_MASK_S11CRC = (UInt_t)atoll(Row->GetField(t));
 	if (t==31) VALIDATION        = (UInt_t)atoll(Row->GetField(t));
       };
-  };
-  //  delete pResult;
+  }
+
+  if (Row)
+    delete Row;
+  delete pResult;
   return(0);
 };
 
@@ -1236,7 +1296,7 @@
 Int_t GL_RUN::Query_GL_RUN_FRAGMENTS(TString where, TSQLServer *dbc){
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   int t;
   int r;
   stringstream myquery;
@@ -1282,8 +1342,15 @@
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str());
-  if(!pResult->GetRowCount())return(-50);
+  if(!pResult->GetRowCount()){
+    delete pResult;
+    if (Row)
+      delete Row;
+    return(-50);
+  }
   for( r=0; r < 1000; r++){ 
+	if (Row)
+	  delete Row;
     Row = pResult->Next();      
     if( Row == NULL ) break;
     for( t = 0; t < pResult->GetFieldCount(); t++){ 
@@ -1320,8 +1387,11 @@
       if (t==30) PHYSENDRUN_MASK_S11CRC = (UInt_t)atoll(Row->GetField(t));
       if (t==31) VALIDATION        = (UInt_t)atoll(Row->GetField(t));
     };
-  };
-  //  delete pResult;
+  }
+
+  if (Row)
+    delete Row;
+  delete pResult;
   return(0);
 };// ****************************************************
 
@@ -1334,7 +1404,7 @@
 Int_t GL_ROOT::Query_GL_ROOT(UInt_t id, TSQLServer *dbc){
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   int t;
   int r;
   stringstream myquery;
@@ -1351,18 +1421,30 @@
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str());
-  if(!pResult->GetRowCount())return (-51);
+  if(!pResult->GetRowCount()){
+    delete pResult;
+    if (Row)
+      delete Row;
+    return (-51);
+  }
   for( r=0; r < 1000; r++){ 
+	  if (Row)
+	    delete Row;
       Row = pResult->Next();      
       if( Row == NULL ) break;
       for( t = 0; t < pResult->GetFieldCount(); t++){ 
 	  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   = (TString)gSystem->ExpandPathName(Row->GetField(t))+'/';
+	  if(t==3){
+        PATH   = TString(Row->GetField(t)) + '/';
+        gSystem->ExpandPathName(PATH);
+      }
 	  if(t==4) NAME   = Row->GetField(t);
-      };
-  };
+      }
+  }
+  if (Row)
+    delete Row;
   delete pResult;   
   return 0;
 };
@@ -1377,7 +1459,7 @@
 Int_t GL_TRK_CALIB::Query_GL_TRK_CALIB(UInt_t time, TSQLServer *dbc){
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   int t;
   int r;
   stringstream myquery;
@@ -1391,8 +1473,13 @@
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str()); 
-  if(!pResult->GetRowCount())return (-53);
+  if(!pResult->GetRowCount()){
+    delete pResult;
+    return (-53);
+  }
   for( r=0; r < 1000; r++){ 
+	  if (Row)
+	    delete Row;
       Row = pResult->Next();     
       if( Row == NULL ) break;
       for( t = 0; t < pResult->GetFieldCount(); t++){ 
@@ -1413,7 +1500,9 @@
 	  if (t==10) BOOT_NUMBER      = (UInt_t)atoll(Row->GetField(t));
 	  if (t==11) VALIDATION       = (UInt_t)atoll(Row->GetField(t));
 	  };
-  };
+  }
+  if (Row)
+    delete Row;
   delete pResult;
   //
 //  if ( TO_TIME < time ) return(51);
@@ -1433,7 +1522,7 @@
 Int_t GL_CALO_CALIB::Query_GL_CALO_CALIB(UInt_t time, UInt_t &uptime,  UInt_t section, TSQLServer *dbc){
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   int t;
   stringstream myquery;
   uptime = 0;
@@ -1452,9 +1541,17 @@
   pResult = dbc->Query(myquery.str().c_str());
   // printf(" mysquery is %s\n",myquery.str().c_str());
   //
-  if( !pResult->GetRowCount() ) return(-54);
+  if (Row)
+    delete Row;
+  if( !pResult->GetRowCount() ){
+    delete pResult;
+    return(-54);
+  }
   Row = pResult->Next();
-  if( Row == NULL ) return (-54);
+  if( Row == NULL ){
+    delete pResult;
+    return (-54);
+  }
   //
   uptime = (UInt_t)atoll(Row->GetField(2));
   //
@@ -1471,15 +1568,28 @@
     myquery << "select ID_ROOT_L0, FROM_TIME, TO_TIME, EV_ROOT,VALIDATION from GL_CALO_CALIB where SECTION=" << section;
     myquery << " and FROM_TIME <= " << time;
     myquery << " and VALIDATION=1 ORDER BY FROM_TIME DESC LIMIT 1;";
-    if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
+    if ( !this->GetGLTABLES()->IsConnected(dbc) ){
+      if(pResult)
+        delete pResult;
+      if(Row)
+        delete Row;
+      return -57;
+    }
     this->GetGLTABLES()->AddQ();
     pResult = dbc->Query(myquery.str().c_str());
     //    printf(" mysquery is %s\n",myquery.str().c_str());
     //
     // if no results yet quit with error
     //
-    if( !pResult->GetRowCount() ) return (-54);
+    if( !pResult->GetRowCount() ){
+      delete pResult;
+      if(Row)
+        delete Row;
+      return (-54);
+    }
     //
+    if (Row)
+      delete Row;
     Row = pResult->Next();
     //
     myfromtime = (UInt_t)atoll(Row->GetField(1));
@@ -1493,29 +1603,47 @@
     myquery.str("");
     myquery << "select ID_ROOT_L0, FROM_TIME, TO_TIME, EV_ROOT from GL_CALO_CALIB where SECTION=" << section;
     myquery << " and VALIDATION=1 ORDER BY ABS(" << time << "-FROM_TIME) asc limit 1;";
-    if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;
+    if ( !this->GetGLTABLES()->IsConnected(dbc) ){
+      if(pResult)
+        delete pResult;
+      if(Row)
+        delete Row;
+      return -57;
+    }
     this->GetGLTABLES()->AddQ();
     pResult = dbc->Query(myquery.str().c_str());
     //    printf(" mysquery is %s\n",myquery.str().c_str());
     //
     // if no results yet quit with error
     //
-    if( !pResult->GetRowCount() ) return (-54);
+    if( !pResult->GetRowCount() ){
+      if (Row)
+        delete Row;
+      delete pResult;
+      return (-54);
+    }
     //
+    if (Row)
+      delete Row;
     Row = pResult->Next();
     //
   };
   //
   // store infos and exit
   //
-  if( Row == NULL ) return (-54);
+  if( Row == NULL ){
+    delete pResult;
+    return (-54);
+  }
   for( t = 0; t < pResult->GetFieldCount(); t++){
     if (t==0) ID_ROOT_L0  = (UInt_t)atoll(Row->GetField(t));
     if (t==1) FROM_TIME = myfromtime;
     if (t==2) TO_TIME   = mytotime;	      
     if (t==3) EV_ROOT = (UInt_t)atoll(Row->GetField(t));
-  };
-  pResult->Delete();
+  }
+  if (Row)
+    delete Row;
+  delete pResult;
   return 0;
 };
 
@@ -1530,7 +1658,7 @@
 Int_t GL_CALOPULSE_CALIB::Query_GL_CALOPULSE_CALIB(UInt_t time, UInt_t section, UInt_t pampli, TSQLServer *dbc){
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   int t;
   stringstream myquery;
   //
@@ -1548,9 +1676,14 @@
   //
   if( !pResult ) return(-54);
   //
+  if (Row)
+    delete Row;
   Row = pResult->Next();
   //
-  if( !Row ) return (-54);
+  if( !Row ){
+    delete pResult;
+    return (-54);
+  }
   //
   // store infos and exit
   //
@@ -1560,7 +1693,9 @@
     if (t==1) FROM_TIME = (UInt_t)atoll(Row->GetField(t));
     if (t==2) TO_TIME   = (UInt_t)atoll(Row->GetField(t));	      
     if (t==3) EV_ROOT = (UInt_t)atoll(Row->GetField(t));
-  };
+  }
+  if (Row)
+    delete Row;
   pResult->Delete();
   return 0;
 };
@@ -1576,7 +1711,7 @@
 Int_t GL_S4_CALIB::Query_GL_S4_CALIB(UInt_t time, TSQLServer *dbc){
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   int t;
   int r;
   stringstream myquery;
@@ -1588,8 +1723,13 @@
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str()); 
-  if(!pResult->GetRowCount())return (-55);//throw -55;
+  if(!pResult->GetRowCount()){
+    delete pResult;
+    return (-55);//throw -55;
+  }
   for( r=0; r < 1000; r++){ 
+	  if (Row)
+	    delete Row;
       Row = pResult->Next();     
       if( Row == NULL ) break;
       for( t = 0; t < pResult->GetFieldCount(); t++){ 
@@ -1599,7 +1739,9 @@
 	if (t==3) FROM_TIME = (UInt_t)atoll(Row->GetField(t));
 	if (t==4) TO_TIME   = (UInt_t)atoll(Row->GetField(t));
       };
-  };
+  }
+  if (Row)
+    delete Row;
   delete pResult;     
   //
   if(TO_TIME < time)return(51);
@@ -1618,7 +1760,7 @@
   //    Bool_t debug = 1;
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   int t;
   int r;
   stringstream myquery;
@@ -1634,20 +1776,30 @@
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str()); 
-  if(!pResult->GetRowCount())return (-52);
+  if(!pResult->GetRowCount()){
+    delete pResult;
+    return (-52);
+  }
   for( r=0; r < 1000; r++){ 
+	  if (Row)
+	    delete Row;
       Row = pResult->Next();     
       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      = (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));
-	  if (t==5) TO_TIME   = (UInt_t)atoll(Row->GetField(t));	      
-	  if (t==6) TYPE     = (UInt_t)atoll(Row->GetField(t));
+        if (t==0) ID        = (UInt_t)atoll(Row->GetField(t));
+        if (t==1) {
+          PATH = TString(Row->GetField(t)) + "/";// put in fpath the path to that file
+          gSystem->ExpandPathName(PATH);
+        }
+        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));
+        if (t==5) TO_TIME   = (UInt_t)atoll(Row->GetField(t));
+        if (t==6) TYPE     = (UInt_t)atoll(Row->GetField(t));
       };
-  };
+  }
+  if (Row)
+    delete Row;
   delete pResult; 
   //
   if(TO_TIME==0) TO_TIME = numeric_limits<UInt_t>::max();
@@ -1683,7 +1835,7 @@
   UInt_t idtsy = 0;
   //
   TSQLResult *pResult;
-  TSQLRow *Row = 0;
+  TSQLRow *Row = NULL;
   stringstream myquery;
   stringstream rname;
   //  pcksList packetsNames;
@@ -1703,11 +1855,15 @@
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str());
   if( pResult->GetRowCount() ){
+	if (Row)
+	  delete Row;
     Row = pResult->Next();      
     if( Row ){
       stringstream fname;
       fname.str("");
-      fname << gSystem->ExpandPathName(Row->GetField(0)) << "/" << Row->GetField(1);
+      TString auxStr(Row->GetField(0));
+      gSystem->ExpandPathName(auxStr);
+      fname << auxStr << "/" << Row->GetField(1);
       rname << Row->GetField(1);
       file = new TFile(fname.str().c_str(),"READ");
       idtsy = (UInt_t)atoll(Row->GetField(2));
@@ -1736,7 +1892,11 @@
   TString name=rname.str().c_str();
   UInt_t dworbit = 0;
   //  Int_t nlength = name.Length();
-  delete pResult;       
+  delete pResult;
+  if (Row){
+    delete Row;
+    Row = NULL;
+  }
   //
   // New code, we have one more column on GL_TIMESYNC so we can trust that one for the Resurs offset
   //
@@ -1747,6 +1907,8 @@
   pResult = dbc->Query(oss.str().c_str());
   Bool_t fndit = false;
   if ( pResult ){
+	if (Row)
+	  delete Row;
     Row = pResult->Next();
     if ( Row ){
       //
@@ -1758,17 +1920,23 @@
       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(3) << ";";
-      if ( !this->GetGLTABLES()->IsConnected(dbc) ) return;  
+      if ( !this->GetGLTABLES()->IsConnected(dbc) ){
+        delete pResult;
+        delete Row;
+        return;
+      }
       this->GetGLTABLES()->AddQ();
       delete pResult;
       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 (pResult){
+    	if (Row)
+    	  delete Row;
+	    Row = pResult->Next();
+	    if ( Row ){
+	      //	    printf(" GREAT! the DB structure is the new one! \n");
+	    fndit = true;
+	    dworbit = 1;
+	    };
       };
     };
   };
@@ -1787,6 +1955,8 @@
   //  printf(" T0 %u toffset is %u \n",T0,toffset);
   //
   if ( file ) file->Close();
+  if (Row)
+    delete Row;
   delete pResult;       
 };
 
@@ -1796,7 +1966,7 @@
   UInt_t idtsy = 0;
   //
   TSQLResult *pResult;
-  TSQLRow *Row = 0;
+  TSQLRow *Row = NULL;
   stringstream myquery;
   stringstream rname;
   //  pcksList packetsNames;
@@ -1816,11 +1986,15 @@
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str());
   if( pResult->GetRowCount() ){
+	if (Row)
+	  delete Row;
     Row = pResult->Next();      
     if( Row ){
       stringstream fname;
       fname.str("");
-      fname << gSystem->ExpandPathName(Row->GetField(0)) << "/" << Row->GetField(1);
+      TString auxString(Row->GetField(0));
+      gSystem->ExpandPathName(auxString);
+      fname << auxString << "/" << Row->GetField(1);
       rname << Row->GetField(1);
       if ( usel0file ) file = new TFile(fname.str().c_str(),"READ");
       idtsy = (UInt_t)atoll(Row->GetField(2));
@@ -1850,7 +2024,11 @@
   TString name=rname.str().c_str();
   UInt_t dworbit = 0;
   //  Int_t nlength = name.Length();
-  delete pResult;       
+  delete pResult;
+  if (Row){
+    delete Row;
+    Row = NULL;
+  }
   //
   // New code, we have one more column on GL_TIMESYNC so we can trust that one for the Resurs offset
   //
@@ -1861,6 +2039,8 @@
   pResult = dbc->Query(oss.str().c_str());
   Bool_t fndit = false;
   if ( pResult ){
+	if (Row)
+	  delete Row;
     Row = pResult->Next();
     if ( Row ){
       //
@@ -1872,17 +2052,23 @@
       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(3) << ";";
-      if ( !this->GetGLTABLES()->IsConnected(dbc) ) return;  
+      if ( !this->GetGLTABLES()->IsConnected(dbc) ){
+        delete pResult;
+        delete Row;
+        return;
+      }
       this->GetGLTABLES()->AddQ();
       delete pResult;
       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 (pResult){
+    	if (Row)
+    	  delete Row;
+    	Row = pResult->Next();
+	    if (Row){
+	      //	    printf(" GREAT! the DB structure is the new one! \n");
+	    fndit = true;
+	    dworbit = 1;
+	    };
       };
     };
   };
@@ -1901,6 +2087,8 @@
   //  printf(" T0 %u toffset is %u \n",T0,toffset);
   //
   if ( file ) file->Close();
+  if (Row)
+    delete Row;
   delete pResult;       
 };
 
@@ -2171,17 +2359,18 @@
 //
 Int_t GL_TLE::DoQuery(TString myquery, TSQLServer *dbc){
   TSQLResult *result;
-  TSQLRow *row;
+  TSQLRow *row = NULL;
 
   // Set the right time_zone (otherwise horrible things will occur! :)
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
-  dbc->Query("SET time_zone = '+0:00'");
+  delete dbc->Query("SET time_zone = '+0:00'");
 
   // Do the query
   this->GetGLTABLES()->AddQ();
   result = dbc->Query(myquery.Data());
   if(! result->GetRowCount() ) {
     cerr << "GL_TLE: query failed: " << myquery.Data() << endl;
+    delete result;
     return 1;
   }
 
@@ -2190,7 +2379,8 @@
   tle = GiveTle(row);
 
   tleFromTime = strtol(row->GetField(4), NULL, 10);
-
+  if (row)
+    delete row;
   row = result->Next(); // second tle row
   if(row)
     tleToTime = strtol(row->GetField(4), NULL, 10);
@@ -2199,7 +2389,8 @@
     tleToTime = UINT_MAX;
   }
 
-  delete row;
+  if (row)
+    delete row;
   delete result;
 
   return 0;