bugfixes, code cleanup and docu

[u/mrichter/AliRoot.git] / SHUTTLE / test / TestShuttleLogbook.C

diff --git a/SHUTTLE/test/TestShuttleLogbook.C b/SHUTTLE/test/TestShuttleLogbook.C
index af32254925aa4b0e7f3c809309088cc025c6a7ff..3581fcd6cde58f28489f7bfa474a1510b5cc7fe0 100644 (file)
--- a/SHUTTLE/test/TestShuttleLogbook.C
+++ b/SHUTTLE/test/TestShuttleLogbook.C
@@ -8,7 +8,11 @@ Bool_t Connect(){
        // check connection: if already connected return
        if(fServer && fServer->IsConnected()) return kTRUE;
 
-       fServer = TSQLServer::Connect("mysql://pcald30.cern.ch","offline","alice");
+//     TString serverHost="mysql://pcald30.cern.ch";
+       TString serverHost="mysql://aldaqgw01-gpn.cern.ch:1434";
+       fServer = TSQLServer::Connect(serverHost.Data(),"shuttle","alice");
+       
+       printf("Connecting to mysql server on %s !!!!!!\n", serverHost.Data());
 
        if (!fServer || !fServer->IsConnected()) {
                printf("Can't establish connection to DAQ log book DB!\n");
@@ -18,7 +22,7 @@ Bool_t Connect(){
 
        // Get table
        TSQLResult* aResult=0;
-       aResult = fServer->GetTables("REFSYSLOG");
+       aResult = fServer->GetTables("SHUTTLE_TEST");
        delete aResult;
        return kTRUE;
 }
@@ -34,7 +38,7 @@ Bool_t QueryShuttleLogbook(AliShuttleLogbookEntry& entry, Int_t runNumber=-1)
        }
        if(!Connect()) return kFALSE;
        if(runNumber<=0) runNumber= entry.GetRun();
-       entry.SetRun(runNumber); 
+       //entry.SetRun(runNumber); 
 
        // check connection, in case connect
        if(!Connect()) return kFALSE;
@@ -49,11 +53,11 @@ Bool_t QueryShuttleLogbook(AliShuttleLogbookEntry& entry, Int_t runNumber=-1)
        }
 
        // TODO Check field count!
-       if (aResult->GetFieldCount() != 24) {
-               printf("Invalid SQL result field number!\n");
-               delete aResult;
-               return kFALSE;
-       }
+//     if (aResult->GetFieldCount() != 24) {
+//             printf("Invalid SQL result field number!\n");
+//             delete aResult;
+//             return kFALSE;
+//     }
 
        TSQLRow* aRow;
        while ((aRow = aResult->Next())) {
@@ -61,7 +65,7 @@ Bool_t QueryShuttleLogbook(AliShuttleLogbookEntry& entry, Int_t runNumber=-1)
                Int_t run = runString.Atoi();
 
                // loop on detectors
-               for(UInt_t ii = 0; ii < 24; ii++){
+               for(UInt_t ii = 0; ii < 22; ii++){
                        entry.SetDetectorStatus(aResult->GetFieldName(ii), aRow->GetField(ii));
                }
 
@@ -111,8 +115,8 @@ Bool_t QueryShuttleLogbook(AliShuttleLogbookEntry& entry, Int_t runNumber=-1)
                        return kFALSE;
                }
 
-               entry.SetStartTime(startTime);
-               entry.SetEndTime(endTime);
+//             entry.SetStartTime(startTime);
+//             entry.SetEndTime(endTime);
 
                delete aRow;
        }
@@ -279,15 +283,23 @@ Bool_t DeleteEntries(Int_t runNumber=-1)
 void TestShuttleLogbook(){
 
        gSystem->Load("libSHUTTLE.so");
+       
+       DeleteEntries();
 
-       AliShuttleLogbookEntry::Status y[17]={1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-       AliShuttleLogbookEntry lb(21242,0,0,y);
-       lb.SetDetectorStatus("HMP","Unprocessed"); // RICH
-       lb.SetDetectorStatus("ZDC","Done"); // ZDC
+       AliShuttleLogbookEntry::Status y[18]={1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+       AliShuttleLogbookEntry lb(21242, y);
+       lb.SetDetectorStatus("HMP","Unprocessed"); // HMPID
+       lb.SetDetectorStatus("ZDC","Unprocessed"); // ZDC
        lb.SetDetectorStatus("TPC","Unprocessed"); // TPC
+       lb.SetDetectorStatus("SPD","Unprocessed"); // SPD
+       lb.SetDetectorStatus("GRP","Unprocessed"); // GRP
        lb.Print();
 
        InsertNewRun(lb);
+       InsertNewRun(lb,21243);
        InsertNewRun(lb,21244);
+       InsertNewRun(lb,21245);
+//     InsertNewRun(lb,21246);
+//     InsertNewRun(lb,1000);
 
 }