Changeset 11269


Ignore:
Timestamp:
07/06/11 17:19:53 (13 years ago)
Author:
tbretz
Message:
Moved calling of RemoveAllServices from RemoveAllServers and RemoveServer to DimServiceInfoList and changed FITS ValueType for bytes from 'S' to 'B'
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/datalogger.cc

    r11265 r11269  
    386386    void RemoveAllServices(const string&);
    387387    ///Remove a server and all of its services
    388     void RemoveServer(const std::string &s);
     388    //void RemoveServer(const std::string &s);
    389389    ///Remove all the servers and all subscriptions
    390     void RemoveAllServers();
     390    //void RemoveAllServers();
    391391}; //DataLogger
    392392
     
    536536    fNumSubAndFitsData.numSubscriptions -= fServiceSubscriptions[server].size();
    537537    fServiceSubscriptions[server].clear();
     538    fServiceSubscriptions.erase(server)
    538539    if (fDebugIsOn)
    539540    {
     
    541542    }
    542543}
    543 // --------------------------------------------------------------------------
     544/*
     545 // --------------------------------------------------------------------------
    544546//
    545547//! Remove a given server
     
    562564    fServiceSubscriptions.clear();
    563565    DimServiceInfoList::RemoveAllServers();
    564 }
     566    }*/
     567
    565568// --------------------------------------------------------------------------
    566569//
     
    21142117         switch (flist[i].first.first->name()[0])
    21152118         {
    2116          case 'c': dataQualifier << "S"; break;
    2117          case 's': dataQualifier << "I"; break;
    2118          case 'i': dataQualifier << "J"; break;
    2119          case 'l': dataQualifier << "J"; break;
    2120          case 'f': dataQualifier << "E"; break;
    2121          case 'd': dataQualifier << "D"; break;
    2122          case 'x': dataQualifier << "K"; break;
     2119         case 'c': dataQualifier << 'B'; break;
     2120         case 's': dataQualifier << 'I'; break;
     2121         case 'i': dataQualifier << 'J'; break;
     2122         case 'l': dataQualifier << 'J'; break;
     2123         case 'f': dataQualifier << 'E'; break;
     2124         case 'd': dataQualifier << 'D'; break;
     2125         case 'x': dataQualifier << 'K'; break;
    21232126         case 'S': //we skip the variable length strings
    21242127             continue;
Note: See TracChangeset for help on using the changeset viewer.