--- YodaProfiler/src/GLTables.cpp 2007/01/23 17:04:11 1.21 +++ YodaProfiler/src/GLTables.cpp 2007/11/13 09:35:37 1.35 @@ -17,17 +17,126 @@ #include #include // +ClassImp(GL_TABLES); ClassImp(GL_TRK_CALIB); ClassImp(GL_RUN); ClassImp(GL_ROOT); ClassImp(GL_PARAM); ClassImp(GL_S4_CALIB); ClassImp(GL_CALO_CALIB); +ClassImp(GL_CALOPULSE_CALIB); ClassImp(GL_TIMESYNC); ClassImp(GL_TLE); // using namespace std; +GL_TABLES::GL_TABLES(){ +}; + +GL_TABLES::GL_TABLES(TString host, TString user, TString psw){ + fHost = new TString(host.Data()); + fUser = new TString(user.Data()); + fPsw = new TString(psw.Data()); + fSet = true; + fNquery = 0; + mh = host.Data(); + mu = user.Data(); + mp = psw.Data(); +}; + + +void GL_TABLES::Set(TString host, TString user, TString psw){ + fHost = new TString(host.Data()); + fUser = new TString(user.Data()); + 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){ + // + // + // + if ( !fSet ){ + return true; + }; + // + // printf(" host is %s \n",fHost->Data()); + // + stringstream myquery; + myquery.str(""); + myquery << "show databases;"; + 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; + // }; + }; + }; + }; + // + if ( true ) { + // + printf(" WARNING: Lost connection to DB! try to recover... \n"); + // + TString host = fHost->Data(); + TString user = fUser->Data(); + TString psw = fPsw->Data(); + dbc->Close(); + delete dbc; + dbc = TSQLServer::Connect(host.Data(),user.Data(),psw.Data()); + // + myquery.str(""); + myquery << "show databases;"; + dbc->Query(myquery.str().c_str()); + fNquery++; + // if ( dbc->GetErrorCode() != 2013 && dbc->GetErrorCode() != 2006 ){ + if ( !(dbc->GetErrorCode()) ){ + // + printf(" ...connection recovered, I can continue! \n"); + // + myquery.str(""); + myquery << "SET time_zone='+0:00'"; + dbc->Query(myquery.str().c_str()); + fNquery++; + myquery.str(""); + myquery << "SET wait_timeout=173000;"; + dbc->Query(myquery.str().c_str()); + fNquery++; + return true; + }; + }; + // + printf(" GLTABLES: connection is gone away, query will fail\n"); + // + return false; + // +}; + +void GL_TABLES::ResetCounters(){ + fNquery = 0; +}; + +void GL_TABLES::AddQ(){ + if ( fSet ) fNquery++; +}; + +UInt_t GL_TABLES::GetNqueries(){ + UInt_t rn = 0; + rn += (UInt_t&)fNquery; + return(rn); +}; + GL_RUN::GL_RUN() { ID = 0; ID_RUN_FRAG = 0; @@ -138,6 +247,25 @@ FROM_TIME = 0; TO_TIME = 0; SECTION = 0; + OBT = 0; + PKT = 0; + BOOT_NUMBER = 0; + VALIDATION = 0; +} + +GL_CALOPULSE_CALIB::GL_CALOPULSE_CALIB(){ + ID = 0; + ID_ROOT_L0 = 0; + EV_ROOT = 0; + FROM_TIME = 0; + TO_TIME = 0; + SECTION = 0; + PULSED_STRIP = 0; + PULSE_AMPLITUDE = 0; + OBT = 0; + PKT = 0; + BOOT_NUMBER = 0; + VALIDATION = 0; } GL_S4_CALIB::GL_S4_CALIB(){ @@ -146,16 +274,17 @@ EV_ROOT = 0; FROM_TIME = 0; TO_TIME = 0; - PARAM_FIT0 = 0.; - PARAM_FIT1 = 0.; + OBT = 0; + PKT = 0; + BOOT_NUMBER = 0; } 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; @@ -425,12 +554,16 @@ // // printf("1myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // // retrieve this ID_TRASH // myquery.str(""); myquery << " SELECT ID_TRASH,ID_ROOT_L0,ID_ROOT_L2 FROM GL_RUN_TRASH ORDER BY ID_TRASH DESC LIMIT 1"; + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); // UInt_t idtrash = 0; @@ -452,6 +585,8 @@ // // printf("2myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); // Row = pResult->Next(); @@ -467,6 +602,8 @@ // // printf("3myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); // Row = pResult->Next(); @@ -483,6 +620,8 @@ // // printf("4myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // myquery.str(""); @@ -492,6 +631,8 @@ // // printf("4myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // myquery.str(""); @@ -502,6 +643,8 @@ // printf("4myquery is %s \n",myquery.str().c_str()); // // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // myquery.str(""); @@ -512,6 +655,8 @@ // printf("5myquery is %s \n",myquery.str().c_str()); // // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // return 0; @@ -543,6 +688,8 @@ // printf(" qui? myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); // Row = pResult->Next(); @@ -626,6 +773,8 @@ // // printf("5myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // // @@ -633,6 +782,8 @@ myquery << " DELETE FROM GL_RUN_TRASH where BELONGED_TO='GL_RUN_FRAGMENTS' AND ID="; myquery << IDRUN << ";"; // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // return 0; @@ -715,6 +866,8 @@ // // printf("myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // return 0; @@ -791,6 +944,8 @@ // // printf("myquery is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); dbc->Query(myquery.str().c_str()); // return 0; @@ -848,6 +1003,8 @@ myquery << " from GL_RUN where ID=" << run << ";"; // // printf(" myquery is %s \n",myquery.str().c_str()); + if ( !this->IsConnected(dbc) ) return -57; + this->AddQ(); pResult = dbc->Query(myquery.str().c_str()); // // printf(" getrowcount %i \n",pResult->GetRowCount()); @@ -946,6 +1103,8 @@ // // printf(" query is %s \n",myquery.str().c_str()); // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); if(!pResult->GetRowCount())return(-50); for( r=0; r < 1000; r++){ @@ -1011,6 +1170,8 @@ myquery << ",NAME"; myquery << " from GL_ROOT where ID=" << id << ";"; // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); if(!pResult->GetRowCount())return (-51); for( r=0; r < 1000; r++){ @@ -1020,7 +1181,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); }; }; @@ -1045,8 +1206,12 @@ // ---------------- 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(); pResult = dbc->Query(myquery.str().c_str()); if(!pResult->GetRowCount())return (-53); for( r=0; r < 1000; r++){ @@ -1104,6 +1269,8 @@ myquery << " ;"; //myquery << " and VALIDATION=1;"; // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); // printf(" mysquery is %s\n",myquery.str().c_str()); // @@ -1123,6 +1290,8 @@ 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; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); // printf(" mysquery is %s\n",myquery.str().c_str()); // @@ -1146,6 +1315,54 @@ pResult->Delete(); return 0; }; + + +// **************************************************** +/** + * Function to query the GL_CALOPULSE_CALIB table of the DB. + * + * \param run starting time + * \return struct of type GL_CALOPULSE_CALIB_data, which stores the query result + */ +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; + int t; + stringstream myquery; + // + // select the correct calibration i.e. the closest to our time + // + myquery.str(""); + myquery << "select ID_ROOT_L0, FROM_TIME, TO_TIME, EV_ROOT from GL_CALOPULSE_CALIB where SECTION=" << section; + myquery << " and PULSE_AMPLITUDE=" << pampli; + myquery << " and VALIDATION=1 and (PULSED_STRIP IS NULL OR PULSED_STRIP<100) ORDER BY ABS(" << time << "-FROM_TIME) asc limit 1;"; + // printf(" myq is %s \n",myquery.str().c_str()); + // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); + pResult = dbc->Query(myquery.str().c_str()); + // + if( !pResult ) return(-54); + // + Row = pResult->Next(); + // + if( !Row ) return (-54); + // + // store infos and exit + // + for( t = 0; t < pResult->GetFieldCount(); t++){ + // printf(" field %i is %s \n",t,Row->GetField(t)); + if (t==0) ID_ROOT_L0 = (UInt_t)atoll(Row->GetField(t)); + 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)); + }; + pResult->Delete(); + return 0; +}; + + // **************************************************** /** * Function to query the GL_S4_CALIB table of the DB. @@ -1162,9 +1379,11 @@ stringstream myquery; // ---------------- myquery.str(""); - myquery << "select * from GL_S4_CALIB where FROM_TIME <= "<< time; + myquery << "select ID,ID_ROOT_L0,EV_ROOT,FROM_TIME,TO_TIME from GL_S4_CALIB where FROM_TIME <= "<< time; 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(); pResult = dbc->Query(myquery.str().c_str()); if(!pResult->GetRowCount())return (-55);//throw -55; for( r=0; r < 1000; r++){ @@ -1172,12 +1391,10 @@ 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_ROOT_L0 = (UInt_t)atoll(Row->GetField(t)); - if (t==2) EV_ROOT = (UInt_t)atoll(Row->GetField(t)); - if (t==3) FROM_TIME = (UInt_t)atoll(Row->GetField(t)); - if (t==4) TO_TIME = (UInt_t)atoll(Row->GetField(t)); - if (t==5) PARAM_FIT0 = atof(Row->GetField(t)); - if (t==6) PARAM_FIT1 = atof(Row->GetField(t)); + if (t==1) ID_ROOT_L0 = (UInt_t)atoll(Row->GetField(t)); + if (t==2) EV_ROOT = (UInt_t)atoll(Row->GetField(t)); + if (t==3) FROM_TIME = (UInt_t)atoll(Row->GetField(t)); + if (t==4) TO_TIME = (UInt_t)atoll(Row->GetField(t)); }; }; delete pResult; @@ -1205,12 +1422,14 @@ // ---------------- 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 = '"<GetGLTABLES()->IsConnected(dbc) ) return -57; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); if(!pResult->GetRowCount())return (-52); for( r=0; r < 1000; r++){ @@ -1218,7 +1437,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)); @@ -1264,6 +1483,9 @@ TSQLRow *Row; stringstream myquery; stringstream rname; + // pcksList packetsNames; + // pcksList::iterator Iter; + // getPacketsNames(packetsNames); rname.str(""); // ---------------- myquery.str(""); @@ -1274,13 +1496,15 @@ myquery << type.Data(); myquery << "=" << id << ";"; // + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); if( pResult->GetRowCount() ){ Row = pResult->Next(); 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)); @@ -1297,6 +1521,27 @@ ph = eh->GetPscuHeader(); pktfirst = ph->GetCounter(); obtfirst = ph->GetOrbitalTime(); + // +// code = eh->GetCounter(); +// UInt_t en = 0; +// for(Iter = packetsNames.begin(); Iter != packetsNames.end(); Iter++){ +// en = code->Get(GetPacketType(*Iter)); +// if ( !strcmp("CalibCalPed",*Iter) || !strcmp("CalibTrk1",*Iter) || !strcmp("CalibTrk2",*Iter) || !strcmp("CalibS4",*Iter) ){ +// // +// TTree *TC = 0; +// TC = (TTree*)file->Get("CalibCalPed"); +// if ( !TC || TC->IsZombie() ) return; +// EventHeader *ehc = 0; +// PscuHeader *phc = 0; +// TC->SetBranchAddress("Header", &ehc); +// TC->GetEntry(0); +// phc = ehc->GetPscuHeader(); +// pktfirst = phc->GetCounter(); +// obtfirst = phc->GetOrbitalTime(); +// // +// }; +// }; + // }; // // look for Resurs offset @@ -1305,39 +1550,89 @@ // // 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()); Row = pResult->Next(); // 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(); - }; + // + // 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; + }; }; }; // @@ -1350,6 +1645,8 @@ myquery << " SELECT OBT0,TIMESYNC,TYPE FROM GL_TIMESYNC " << " WHERE ID_RAW = " << idraw << ";"; + if ( !this->GetGLTABLES()->IsConnected(dbc) ) return; + this->GetGLTABLES()->AddQ(); pResult = dbc->Query(myquery.str().c_str()); if ( pResult ){ Row = pResult->Next(); @@ -1632,9 +1929,11 @@ 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 + this->GetGLTABLES()->AddQ(); result = dbc->Query(myquery.Data()); if(! result->GetRowCount() ) { cerr << "GL_TLE: query failed: " << myquery.Data() << endl;