Commit 06d0ebc6 authored by Thomas Braun's avatar Thomas Braun
Browse files

DataBase.cpp: Remove tmp prefix from tmp_ior variables

parent 6b44e2cb

DataBase.cpp

+7 −7
Original line number Diff line number Diff line
@@ -1771,7 +1771,7 @@ void DataBase::db_export_device(const Tango::DevVarStringArray *argin) 
    TangoSys_MemStream sql_query_stream;

    MYSQL_RES *result;

    MYSQL_ROW row;

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

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

    std::string device, server;



    TimeVal before, after;
@@ -1793,7 +1793,7 @@ void DataBase::db_export_device(const Tango::DevVarStringArray *argin) 
    {

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

    }

    tmp_ior = (*export_info)[1];

    ior = (*export_info)[1];

    host = (*export_info)[2];

    tmp_pid = (*export_info)[3];

    if(strcmp(tmp_pid, "null") == 0)
@@ -1868,7 +1868,7 @@ void DataBase::db_export_device(const Tango::DevVarStringArray *argin) 


        // update the new value for this tuple

        sql_query_stream.str("");

        sql_query_stream << "UPDATE device set exported=1,ior=\'" << tmp_ior << "\',host=\'" << host << "\',pid=\'"

        sql_query_stream << "UPDATE device set exported=1,ior=\'" << ior << "\',host=\'" << host << "\',pid=\'"

                         << tmp_pid << "\',version=\'" << tmp_version << "\',started=NOW() where name LIKE \'" << device

                         << "\'";

        DEBUG_STREAM << "DataBase::ExportDevice(): sql_query " << sql_query_stream.str() << std::endl;
@@ -1925,7 +1925,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;

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

    std::string event, server;



    TimeVal before, after;
@@ -1947,7 +1947,7 @@ void DataBase::db_export_event(const Tango::DevVarStringArray *argin) 
        event[i] = tolower(event[i]);

    }

    event = replace_wildcard(event.c_str());

    tmp_ior = (*export_info)[1];

    ior = (*export_info)[1];

    host = (*export_info)[2];

    tmp_pid = (*export_info)[3];

    tmp_version = (*export_info)[4];
@@ -1964,8 +1964,8 @@ void DataBase::db_export_event(const Tango::DevVarStringArray *argin) 
        // update the new value for this tuple



        sql_query_stream.str("");

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

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

        sql_query_stream << "INSERT event set name=\'" << event << "\',exported=1,ior=\'" << 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());