Commit 2cf8f985 authored by Thomas Braun's avatar Thomas Braun
Browse files

DataBase.cpp: Remove tmp prefix from event variables

parent 87a8397d

DataBase.cpp

+23 −23
Original line number Diff line number Diff line
@@ -1926,7 +1926,7 @@ void DataBase::db_export_event(const Tango::DevVarStringArray *argin) 
    const Tango::DevVarStringArray *export_info = argin;

    TangoSys_MemStream sql_query_stream;

    const char *tmp_ior, *host, *tmp_pid, *tmp_version;

    std::string tmp_event, server;

    std::string event, server;



    TimeVal before, after;

    GetTime(before);
@@ -1941,12 +1941,12 @@ void DataBase::db_export_event(const Tango::DevVarStringArray *argin) 
    INFO_STREAM << "DataBase::db_export_event(): put " << export_info->length() - 1 << " export info for event "

                << (*export_info)[0] << std::endl;



    tmp_event = (*export_info)[0];

    for(unsigned int i = 0; i < tmp_event.length(); i++)

    event = (*export_info)[0];

    for(unsigned int i = 0; i < event.length(); i++)

    {

        tmp_event[i] = tolower(tmp_event[i]);

        event[i] = tolower(event[i]);

    }

    tmp_event = replace_wildcard(tmp_event.c_str());

    event = replace_wildcard(event.c_str());

    tmp_ior = (*export_info)[1];

    host = (*export_info)[2];

    tmp_pid = (*export_info)[3];
@@ -1957,16 +1957,16 @@ void DataBase::db_export_event(const Tango::DevVarStringArray *argin) 
    {

        AutoLock al(this);



        sql_query_stream << "DELETE FROM event WHERE name=\"" << tmp_event << "\"";

        sql_query_stream << "DELETE FROM event WHERE name=\"" << event << "\"";

        DEBUG_STREAM << "DataBase::db_export_event(): sql_query " << sql_query_stream.str() << std::endl;

        simple_query(sql_query_stream.str(), "db_export_event()", al.get_dch());



        // update the new value for this tuple



        sql_query_stream.str("");

        sql_query_stream << "INSERT event set name=\'" << tmp_event << "\',exported=1,ior=\'" << tmp_ior << "\',host=\'"

                         << host << "\',server=\'" << tmp_event << "\',pid=\'" << tmp_pid << "\',version=\'"

                         << tmp_version << "\',started=NOW();";

        sql_query_stream << "INSERT event set name=\'" << event << "\',exported=1,ior=\'" << tmp_ior << "\',host=\'"

                         << host << "\',server=\'" << event << "\',pid=\'" << tmp_pid << "\',version=\'" << tmp_version

                         << "\',started=NOW();";

        DEBUG_STREAM << "DataBase::export_event(): sql_query " << sql_query_stream.str() << std::endl;

        simple_query(sql_query_stream.str(), "db_export_event()", al.get_dch());

    }
@@ -5671,21 +5671,21 @@ Tango::DevVarLongStringArray *DataBase::db_import_event(Tango::DevString argin) 
    MYSQL_ROW row;

    int n_rows = 0;

    int dev_exported, pid;

    std::string tmp_event;

    std::string event;



    TimeVal before, after;

    GetTime(before);



    INFO_STREAM << "DataBase::db_import_event(): get import info for " << event_name << std::endl;



    tmp_event = event_name;

    for(unsigned int i = 0; i < tmp_event.size(); i++)

    event = event_name;

    for(unsigned int i = 0; i < event.size(); i++)

    {

        tmp_event[i] = tolower(tmp_event[i]);

        event[i] = tolower(event[i]);

    }

    tmp_event = replace_wildcard(tmp_event.c_str());

    event = replace_wildcard(event.c_str());



    sql_query_stream << "SELECT exported,ior,version,pid,host FROM event WHERE name = '" << tmp_event << "';";

    sql_query_stream << "SELECT exported,ior,version,pid,host FROM event WHERE name = '" << event << "';";

    DEBUG_STREAM << "DataBase::db_import_event(): sql_query " << sql_query_stream.str() << std::endl;



    DatabaseConnectionHandle dch(dcp);
@@ -5704,7 +5704,7 @@ Tango::DevVarLongStringArray *DataBase::db_import_event(Tango::DevString argin) 
                         << " version " << row[2] << std::endl;

            n_svalues = n_svalues + 4;

            (argout->svalue).length(n_svalues);

            (argout->svalue)[n_svalues - 4] = CORBA::string_dup(tmp_event.c_str());

            (argout->svalue)[n_svalues - 4] = CORBA::string_dup(event.c_str());

            (argout->svalue)[n_svalues - 3] = CORBA::string_dup(row[1]);

            (argout->svalue)[n_svalues - 2] = CORBA::string_dup(row[2]);

            (argout->svalue)[n_svalues - 1] = CORBA::string_dup(row[4]);
@@ -5730,7 +5730,7 @@ Tango::DevVarLongStringArray *DataBase::db_import_event(Tango::DevString argin) 
    {

        INFO_STREAM << "DataBase::db_import_event(): event not defined !" << std::endl;

        TangoSys_OMemStream o;

        o << "event " << tmp_event << " not defined in the database !";

        o << "event " << event << " not defined in the database !";

        mysql_free_result(result);

        delete argout;

        Tango::Except::throw_exception(DB_DeviceNotDefined, o.str(), "DataBase::db_import_event()");
@@ -6988,21 +6988,21 @@ void DataBase::db_un_export_event(Tango::DevString argin) 


    Tango::DevString event_name = argin;

    TangoSys_MemStream sql_query_stream;

    std::string tmp_event;

    std::string event;



    INFO_STREAM << "DataBase::un_export_event(): un-export " << event_name << " device " << std::endl;



    tmp_event = event_name;

    for(unsigned int i = 0; i < tmp_event.size(); i++)

    event = event_name;

    for(unsigned int i = 0; i < event.size(); i++)

    {

        tmp_event[i] = tolower(tmp_event[i]);

        event[i] = tolower(event[i]);

    }

    tmp_event = replace_wildcard(tmp_event.c_str());

    event = replace_wildcard(event.c_str());



    // un-export event from database by seting ior="not exported"



    DatabaseConnectionHandle dch(dcp);

    sql_query_stream << "UPDATE event SET exported=0,stopped=NOW() WHERE name like \"" << tmp_event << "\"";

    sql_query_stream << "UPDATE event SET exported=0,stopped=NOW() WHERE name like \"" << event << "\"";

    DEBUG_STREAM << "DataBase::un_export_event(): sql_query " << sql_query_stream.str() << std::endl;

    simple_query(sql_query_stream.str(), "db_un_export_event()", dch);