--- chewbacca/YodaProfiler/src/GLTables.cpp	2009/12/15 09:58:25	1.12
+++ chewbacca/YodaProfiler/src/GLTables.cpp	2011/11/29 13:18:37	1.14
@@ -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){
@@ -664,7 +674,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;
@@ -728,6 +738,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));
@@ -747,6 +759,8 @@
   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);
@@ -764,10 +778,16 @@
   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);
-  };
+  }
+  if (Row){
+    delete Row;
+    Row = NULL; // This variable is not used below
+  }
   //
   //
   //
@@ -832,7 +852,7 @@
   //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;
+  TSQLRow *Row = NULL;
   stringstream myquery;
   //
   if ( !IDRUN ) IDRUN = ID;
@@ -1133,8 +1153,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;
   // ----------------
@@ -1183,11 +1202,13 @@
   //
   if( !pResult->GetRowCount() ) 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 +1242,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 +1260,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;
@@ -1284,6 +1308,8 @@
   pResult = dbc->Query(myquery.str().c_str());
   if(!pResult->GetRowCount())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 +1346,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 +1363,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;
@@ -1353,6 +1382,8 @@
   pResult = dbc->Query(myquery.str().c_str());
   if(!pResult->GetRowCount())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++){ 
@@ -1361,8 +1392,10 @@
 	  if(t==2) ID_TIMESYNC = (UInt_t)atoll(Row->GetField(t));
 	  if(t==3) PATH   = (TString)gSystem->ExpandPathName(Row->GetField(t))+'/';
 	  if(t==4) NAME   = Row->GetField(t);
-      };
-  };
+      }
+  }
+  if (Row)
+    delete Row;
   delete pResult;   
   return 0;
 };
@@ -1377,7 +1410,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;
@@ -1393,6 +1426,8 @@
   pResult = dbc->Query(myquery.str().c_str()); 
   if(!pResult->GetRowCount())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 +1448,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 +1470,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;
@@ -1453,6 +1490,8 @@
   // printf(" mysquery is %s\n",myquery.str().c_str());
   //
   if( !pResult->GetRowCount() ) return(-54);
+  if (Row)
+    delete Row;
   Row = pResult->Next();
   if( Row == NULL ) return (-54);
   //
@@ -1480,6 +1519,8 @@
     //
     if( !pResult->GetRowCount() ) return (-54);
     //
+    if (Row)
+      delete Row;
     Row = pResult->Next();
     //
     myfromtime = (UInt_t)atoll(Row->GetField(1));
@@ -1514,7 +1555,9 @@
     if (t==1) FROM_TIME = myfromtime;
     if (t==2) TO_TIME   = mytotime;	      
     if (t==3) EV_ROOT = (UInt_t)atoll(Row->GetField(t));
-  };
+  }
+  if (Row)
+    delete Row;
   pResult->Delete();
   return 0;
 };
@@ -1530,7 +1573,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,6 +1591,8 @@
   //
   if( !pResult ) return(-54);
   //
+  if (Row)
+    delete Row;
   Row = pResult->Next();
   //
   if( !Row ) return (-54);
@@ -1560,7 +1605,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 +1623,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;
@@ -1590,6 +1637,8 @@
   pResult = dbc->Query(myquery.str().c_str()); 
   if(!pResult->GetRowCount())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 +1648,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 +1669,7 @@
   //    Bool_t debug = 1;
   // MySQL variables
   TSQLResult *pResult;
-  TSQLRow *Row;
+  TSQLRow *Row = NULL;
   int t;
   int r;
   stringstream myquery;
@@ -1636,6 +1687,8 @@
   pResult = dbc->Query(myquery.str().c_str()); 
   if(!pResult->GetRowCount())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++){ 
@@ -1647,7 +1700,9 @@
 	  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 +1738,7 @@
   UInt_t idtsy = 0;
   //
   TSQLResult *pResult;
-  TSQLRow *Row = 0;
+  TSQLRow *Row = NULL;
   stringstream myquery;
   stringstream rname;
   //  pcksList packetsNames;
@@ -1703,6 +1758,8 @@
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str());
   if( pResult->GetRowCount() ){
+	if (Row)
+	  delete Row;
     Row = pResult->Next();      
     if( Row ){
       stringstream fname;
@@ -1747,6 +1804,8 @@
   pResult = dbc->Query(oss.str().c_str());
   Bool_t fndit = false;
   if ( pResult ){
+	if (Row)
+	  delete Row;
     Row = pResult->Next();
     if ( Row ){
       //
@@ -1762,13 +1821,15 @@
       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 +1848,8 @@
   //  printf(" T0 %u toffset is %u \n",T0,toffset);
   //
   if ( file ) file->Close();
+  if (Row)
+    delete Row;
   delete pResult;       
 };
 
@@ -1796,7 +1859,7 @@
   UInt_t idtsy = 0;
   //
   TSQLResult *pResult;
-  TSQLRow *Row = 0;
+  TSQLRow *Row = NULL;
   stringstream myquery;
   stringstream rname;
   //  pcksList packetsNames;
@@ -1816,6 +1879,8 @@
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(myquery.str().c_str());
   if( pResult->GetRowCount() ){
+	if (Row)
+	  delete Row;
     Row = pResult->Next();      
     if( Row ){
       stringstream fname;
@@ -1861,6 +1926,8 @@
   pResult = dbc->Query(oss.str().c_str());
   Bool_t fndit = false;
   if ( pResult ){
+	if (Row)
+	  delete Row;
     Row = pResult->Next();
     if ( Row ){
       //
@@ -1876,13 +1943,15 @@
       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 +1970,8 @@
   //  printf(" T0 %u toffset is %u \n",T0,toffset);
   //
   if ( file ) file->Close();
+  if (Row)
+    delete Row;
   delete pResult;       
 };
 
@@ -2171,7 +2242,7 @@
 //
 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;  
@@ -2190,7 +2261,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 +2271,8 @@
     tleToTime = UINT_MAX;
   }
 
-  delete row;
+  if (row)
+    delete row;
   delete result;
 
   return 0;