[Perfparse-cvs] _perfparse/modules storage_mysql.c, 1.15, 1.16 storage_mysql.h, 1.5, 1.6

[Florian G. <re...@us...>]

Update of /cvsroot/perfparse/_perfparse/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7457/modules

Modified Files:
	storage_mysql.c storage_mysql.h 
Log Message:
Add error log level and more purging data.


Index: storage_mysql.h
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** storage_mysql.h	4 Sep 2007 07:51:42 -0000	1.5
--- storage_mysql.h	9 Dec 2007 20:40:40 -0000	1.6
***************
*** 33,36 ****
--- 33,39 ----
  #define STORAGE_MYSQL_VERSION "0.0.2"
  
+ #define DEL_POLICY_UNDEFINED -1
+ #define DEL_POLICY_INFINITY -2
+ 
  int storage_mysql_init(void);
  

Index: storage_mysql.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** storage_mysql.c	8 Dec 2007 21:25:30 -0000	1.15
--- storage_mysql.c	9 Dec 2007 20:40:40 -0000	1.16
***************
*** 409,421 ****
  	
  	// raw data
! 	typedef struct struct_sid_policyinfo {
  		int iServiceId;
  		int iHostId;
! 		char sPolicyName[21];
  		int iPolicySeconds;
! 		int iRawDelPolicy} sid_policyinfo;
  		
! 	g_string_printf(s_SQL,"SELECT service_id,host_id,policy_name,delete_policy_seconds,raw_delete_policy_individual FROM perfdata_service s LEFT JOIN perfdata_delete_policy d ON s.raw_delete_policy_id=d.policy_id");
  
  	pp_log(__FILE__,__LINE__,LOG_DEBUG,"Closing mysql connection\n");
  	mysql_close(&db_mysql);
--- 409,454 ----
  	
  	// raw data
! 	typedef struct t_raw_policyinfo {
  		int iServiceId;
+ 		char *sServiceDesc;
  		int iHostId;
! 		char *sPolicyName;
! 		int iPolicySource;
  		int iPolicySeconds;
! 		int iRawDelPolicy;
! 		} t_raw_policyinfo;
  		
! 	t_raw_policyinfo *raw_policyinfo=NULL;
! 		
! 	g_string_printf(s_SQL,"SELECT service_id,service_description,host_id,policy_name,delete_policy_seconds,raw_delete_policy_individual FROM perfdata_service s LEFT JOIN perfdata_delete_policy d ON s.raw_delete_policy_id=d.policy_id");
! 	query(s_SQL->str);
! 	
! 	while ((result_row = mysql_fetch_row(query_result))) {
! 		raw_policyinfo = (t_raw_policyinfo *)malloc(sizeof(t_raw_policyinfo));
! 		raw_policyinfo->iServiceId = iData(0);
! 		raw_policyinfo->sServiceDesc=malloc(strlen(sData(1))+sizeof(char));
! 		strncpy(raw_policyinfo->sServiceDesc,sData(1),strlen(sData(1))+1);
! 		raw_policyinfo->iHostId=iData(2);
! 		// todo: check if this policy matches and if not search for matching parent policy
! 		raw_policyinfo->sPolicyName=malloc(strlen(sData(3))+sizeof(char));
! 		strncpy(raw_policyinfo->sPolicyName,sData(3),strlen(sData(3))+1);
! 		if(isNull(4)){
! 			raw_policyinfo->iPolicySeconds=DEL_POLICY_UNDEFINED;
! 		} else {
! 			raw_policyinfo->iPolicySeconds=iData(4);
! 		}
! 		if(isNull(5)) {
! 			raw_policyinfo->iRawDelPolicy=DEL_POLICY_UNDEFINED;
! 		} else {
! 			raw_policyinfo->iRawDelPolicy=iData(5);
! 		}
! 		pp_log(__FILE__,__LINE__,LOG_DEBUG,"service_id %d policy info (%s,%d,%s,%d,%d) added to temporary list\n"
! 		,raw_policyinfo->iServiceId,raw_policyinfo->sServiceDesc,
! 		raw_policyinfo->iHostId,raw_policyinfo->sPolicyName,
! 		raw_policyinfo->iPolicySeconds,raw_policyinfo->iRawDelPolicy);
! 		tmplist=g_slist_append(tmplist,raw_policyinfo);
! 	}
  
+ 		
  	pp_log(__FILE__,__LINE__,LOG_DEBUG,"Closing mysql connection\n");
  	mysql_close(&db_mysql);