Menu
▾
▴
[Perfparse-cvs] _perfparse/libpp_mysql del_policy.c, 1.3, 1.4 del_policy.h, 1.1.1.1, 1.2
|
From: Florian G. <re...@us...> - 2007-11-26 00:54:07
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16645/libpp_mysql Modified Files: del_policy.c del_policy.h Log Message: cleanup code from old unused stuff Index: del_policy.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** del_policy.c 6 Jun 2007 09:53:14 -0000 1.3 --- del_policy.c 26 Nov 2007 00:54:09 -0000 1.4 *************** *** 52,86 **** - void editPolicy(char *sPolicyName, int iPolicy) - { - - if (isPolicyDefined(sPolicyName)) { - - g_string_printf(s_SQL, "UPDATE perfdata_delete_policy SET policy_name = '%s'", - sql_escape(sPolicyName,PERCENT_ESCAPE_CHAR)); - g_string_append_printf(s_SQL, ", delete_policy = %s WHERE policy_name = '%s'", - pval2sql(iPolicy), sql_escape(sPolicyName,PERCENT_ESCAPE_CHAR)); - - } else { - - g_string_printf(s_SQL, "INSERT perfdata_delete_policy (policy_name, delete_policy) VALUES ('%s',%s)", - sql_escape(sPolicyName,PERCENT_ESCAPE_CHAR), pval2sql(iPolicy)); - } - - query_no_return(s_SQL->str); - - } - - - - void deletePolicyName(char *sPolicy) - { - - g_string_printf(s_SQL, "DELETE FROM perfdata_delete_policy WHERE policy_name = '%s'", sql_escape(sPolicy,PERCENT_ESCAPE_CHAR)); - - query_no_return(s_SQL->str); - - - } int isPolicyDefined(char *sPolicyName) --- 52,55 ---- *************** *** 108,209 **** - /*************************************************** - * - * Working with delete_policy record on tables. - * - ***************************************************/ - - - void setRawPolicy(char *sHostIn, char *sServiceIn, int iPolicy, int iPolicyType, char *sTemplate) - { - char sName[31]; - - if (sTemplate && sTemplate[0]) sprintf(sName, "'%s'", sql_escape(sTemplate,PERCENT_ESCAPE_CHAR)); - else strcpy(sName, "NULL"); - - g_string_printf(s_SQL, "UPDATE perfdata_service SET raw_delete_policy = %s, raw_delete_policy_type = %s", - pval2sql(iPolicy), ptype2sql(iPolicyType)); - g_string_append_printf(s_SQL, ", raw_delete_policy_name = %s", sName); - g_string_append_printf(s_SQL, " WHERE host_name = '%s'", - sql_escape(sHostIn,PERCENT_ESCAPE_CHAR)); - g_string_append_printf(s_SQL, " AND service_description = '%s'", - sql_escape(sServiceIn,PERCENT_ESCAPE_CHAR)); - query_no_return(s_SQL->str); - - } - - - void setBinPolicy(char *sHostIn, char *sServiceIn, char *sMetricIn, int iPolicy, int iPolicyType, char *sTemplate) - { - - char sName[31]; - - if (sTemplate && sTemplate[0]) sprintf(sName, "'%s'", sql_escape(sTemplate,PERCENT_ESCAPE_CHAR)); - else strcpy(sName, "NULL"); - - g_string_printf(s_SQL, "UPDATE perfdata_service_metric SET bin_delete_policy = %s, bin_delete_policy_type = %s", - pval2sql(iPolicy), ptype2sql(iPolicyType)); - g_string_append_printf(s_SQL, ", bin_delete_policy_name = %s", sName); - g_string_append_printf(s_SQL, " WHERE host_name = '%s'", - sql_escape(sHostIn,PERCENT_ESCAPE_CHAR)); - g_string_append_printf(s_SQL, " AND service_description = '%s'", - sql_escape(sServiceIn,PERCENT_ESCAPE_CHAR)); - g_string_append_printf(s_SQL, " AND metric = '%s'", - sql_escape(sMetricIn,PERCENT_ESCAPE_CHAR)); - query_no_return(s_SQL->str); - - } - - void setBinHostPolicyUser(char *sHostIn, int iPolicy) - { - - g_string_printf(s_SQL, "UPDATE perfdata_host SET bin_delete_policy = %s, bin_delete_policy_type = 'user' WHERE host_name = '%s'", - pval2sql(iPolicy), sql_escape(sHostIn,PERCENT_ESCAPE_CHAR)); - - query_no_return(s_SQL->str); - - } - - - void setBinHostPolicyTemplate(char *sHostIn, char *sTemplate) - { - - g_string_printf(s_SQL, "UPDATE perfdata_host SET bin_delete_policy = %s, bin_delete_policy_type = 'template'", - pval2sql(getPolicy(sTemplate))); - g_string_append_printf(s_SQL, ", bin_delete_policy_name = '%s'", - sql_escape(sTemplate,PERCENT_ESCAPE_CHAR)); - g_string_append_printf(s_SQL, " WHERE host_name = '%s'", - sql_escape(sHostIn,PERCENT_ESCAPE_CHAR)); - query_no_return(s_SQL->str); - - } - - - void setRawHostPolicyUser(char *sHostIn, int iPolicy) - { - - g_string_printf(s_SQL, "UPDATE perfdata_host SET raw_delete_policy = %s, raw_delete_policy_type = 'user' WHERE host_name = '%s'", - pval2sql(iPolicy), sql_escape(sHostIn,PERCENT_ESCAPE_CHAR)); - query_no_return(s_SQL->str); - - } - - - void setRawHostPolicyTemplate(char *sHostIn, char *sTemplate) - { - - g_string_printf(s_SQL, "UPDATE perfdata_host SET raw_delete_policy_type = 'template', raw_delete_policy = %s", - pval2sql(getPolicy(sTemplate))); - g_string_append_printf(s_SQL, ", raw_delete_policy_name = '%s'", - sql_escape(sTemplate,PERCENT_ESCAPE_CHAR)); - g_string_append_printf(s_SQL, " WHERE host_name = '%s'", - sql_escape(sHostIn,PERCENT_ESCAPE_CHAR)); - - query_no_return(s_SQL->str); - - } - - - /*************************************************** --- 77,80 ---- Index: del_policy.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** del_policy.h 26 Sep 2005 14:36:33 -0000 1.1.1.1 --- del_policy.h 26 Nov 2007 00:54:09 -0000 1.2 *************** *** 17,33 **** /* Working with perfdata_delete_policy records */ - void editPolicy(char *sPolicyName, int iPolicy); - void deletePolicyName(char *sPolicy); int isPolicyDefined(char *sPolicyName); int getPolicy(char *sPolicyName); - /* Definition of policies against other tables. */ - void setBinPolicy(char *sHostIn, char *sServiceIn, char *sMetricIn, int iPolicy, int iPolicyType, char *sTemplate); - void setRawPolicy(char *sHostIn, char *sServiceIn, int iPolicy, int iPolicyType, char *sTemplate); - void setBinHostPolicyUser(char *sHostIn, int iPolicy); - void setBinHostPolicyTemplate(char *sHostIn, char *sTemplate); - void setRawHostPolicyUser(char *sHostIn, int iPolicy); - void setRawHostPolicyTemplate(char *sHostIn, char *sTemplate); - /* general helpers */ char *pval2sql(int iPolicy); --- 17,23 ---- *************** *** 59,62 **** ! #endif ! --- 49,51 ---- ! #endif |
