Commit 5b72fc6e authored by Thomas Braun's avatar Thomas Braun
Browse files

DataBase.cpp: Remove tmp prefix from tmp_filter variables 

And name it properly.
parent 6cfd476a

DataBase.cpp

+7 −7
Original line number Diff line number Diff line
@@ -3844,7 +3844,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_exported_list(Tango::DevString 


    Tango::DevString filter = argin;

    TangoSys_MemStream sql_query_stream;

    std::string tmp_filter;

    std::string device;

    MYSQL_RES *result;

    MYSQL_ROW row;

    int n_rows;
@@ -3854,9 +3854,9 @@ Tango::DevVarStringArray *DataBase::db_get_device_exported_list(Tango::DevString 


    INFO_STREAM << "DataBase::db_get_device_exported_list(): filter " << filter << std::endl;



    tmp_filter = replace_wildcard(filter);

    sql_query_stream << "SELECT DISTINCT name FROM device WHERE (name LIKE \"" << tmp_filter << "\" OR alias LIKE \""

                     << tmp_filter << "\") AND exported=1 ORDER BY name";

    device = replace_wildcard(filter);

    sql_query_stream << "SELECT DISTINCT name FROM device WHERE (name LIKE \"" << device << "\" OR alias LIKE \""

                     << device << "\") AND exported=1 ORDER BY name";



    DEBUG_STREAM << "DataBase::db_get_device_exported_list(): sql_query " << sql_query_stream.str() << std::endl;
@@ -4213,7 +4213,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_wide_list(Tango::DevString arg 


    Tango::DevString filter = argin;

    TangoSys_MemStream sql_query_stream;

    std::string tmp_filter;

    std::string device;

    MYSQL_RES *result;

    MYSQL_ROW row;

    int n_rows;
@@ -4223,8 +4223,8 @@ Tango::DevVarStringArray *DataBase::db_get_device_wide_list(Tango::DevString arg 


    INFO_STREAM << "DataBase::db_get_device_wide_list(): filter " << filter << std::endl;



    tmp_filter = replace_wildcard(filter);

    sql_query_stream << "SELECT DISTINCT name FROM device WHERE name LIKE \"" << tmp_filter << "\"  ORDER BY name";

    device = replace_wildcard(filter);

    sql_query_stream << "SELECT DISTINCT name FROM device WHERE name LIKE \"" << device << "\"  ORDER BY name";



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