add log4cplus
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file: $RCSfile: parse_xml.c,v $
|
||||
* @brief: $<EFBFBD><EFBFBD><EFBFBD><EFBFBD>xml
|
||||
* @brief: $解析xml
|
||||
*
|
||||
* @version: $Revision: 1.5 $
|
||||
* @date: $Date: 2018/12/29 03:18:14 $
|
||||
@@ -85,11 +85,11 @@ apr_status_t app_get_private_config(const char *myfilename)
|
||||
|
||||
|
||||
|
||||
//************<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReportControl.xml ***************//
|
||||
//************解析 ReportControl.xml ***************//
|
||||
#define REPORTCONTROL_FILE_PATH CONFIG_FILEPATH
|
||||
|
||||
/*
|
||||
<!-- װ<EFBFBD><EFBFBD>ID,CPUID,ReportCtrlNum -->
|
||||
<!-- 装置ID,CPUID,ReportCtrlNum -->
|
||||
<ReportControlCount>104,1,2</ReportControlCount>
|
||||
*/
|
||||
//lnk20250122start
|
||||
@@ -101,12 +101,12 @@ int init_rptctrl_by_count(LD_info_t* LD_info,int rptcount)
|
||||
int j,i;
|
||||
LD_info->rptcount = rptcount;
|
||||
|
||||
if(LD_info->rptinfo == NULL){ //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǿյ<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD>ǵ<EFBFBD>һ<EFBFBD>γ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ռ䣬ֱ<EFBFBD>Ӹ<EFBFBD>ÿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>20<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̨<EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD>ֱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD>ֵ
|
||||
if(LD_info->rptinfo == NULL){ //如果是空的说明是第一次初始化,需要申请空间,直接给每个监测点申请20个报告位,如果台账删除直接清空内容,如果需要重用直接重新赋值
|
||||
LD_info->rptinfo = apr_pcalloc( g_init_pool,MAX_RPT_COUNT*sizeof(rptinfo_t*) );
|
||||
}
|
||||
|
||||
for(j=0; j<rptcount; j++) {
|
||||
if(LD_info->rptinfo[j] == NULL){//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǿյ<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD>ǵ<EFBFBD>һ<EFBFBD>γ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ռ䣬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD>Ŀռ䣬ֱ<EFBFBD>ӽ<EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD>ij<EFBFBD>ʼ<EFBFBD><EFBFBD>
|
||||
if(LD_info->rptinfo[j] == NULL){//如果是空的说明是第一次初始化,需要申请空间,否则沿用原来的空间,直接进行值的初始化
|
||||
LD_info->rptinfo[j] = apr_pcalloc( g_init_pool,sizeof(rptinfo_t) );
|
||||
}
|
||||
LD_info->rptinfo[j]->LD_info = LD_info;
|
||||
@@ -124,7 +124,7 @@ int init_rptctrl_by_count(LD_info_t* LD_info,int rptcount)
|
||||
}
|
||||
//lnk20250122end
|
||||
|
||||
//ReportControl: װ<EFBFBD><EFBFBD>ID,CPUID,ID,RCBName, intgPd, dchg, qchg, dupd, period ,gi, ʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӻ<EFBFBD>,<2C><>
|
||||
//ReportControl: 装置ID,CPUID,ID,RCBName, intgPd, dchg, qchg, dupd, period ,gi, 实例名是否增加后缀,
|
||||
// seqNum, timeStamp, reasonCode, dataSet, dataRef, bufOvfl, entryID, configRef, segmentation
|
||||
//<ReportControl>104,1,1,brcbDin,60,1,0,0,1,0,yes,1,1,0,1,1,1,1,1,0</ReportControl>
|
||||
int fill_rptctrl_by_cfg(LD_info_t* LD_info,int rptno,char *buf)
|
||||
@@ -138,7 +138,7 @@ int fill_rptctrl_by_cfg(LD_info_t* LD_info,int rptno,char *buf)
|
||||
if(!(str = strtok(buf,",")))
|
||||
return 1;
|
||||
|
||||
rptinfo->rptNo = rptno;//CZY 2023-08-16 WW 2022-11-14 <EFBFBD><EFBFBD><EFBFBD>ӱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>жϱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>꣬<EFBFBD><EFBFBD><EFBFBD>Խ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݴ<EFBFBD><EFBFBD><EFBFBD>
|
||||
rptinfo->rptNo = rptno;//CZY 2023-08-16 WW 2022-11-14 增加报告编号,用于判断报告是否收完,可以进行数据处理
|
||||
|
||||
tmp_str = apr_pstrdup(g_init_pool,str);
|
||||
rptinfo->rptID = str_trim_both(tmp_str," \t\'" );
|
||||
@@ -199,7 +199,7 @@ int fill_rptctrl_by_cfg(LD_info_t* LD_info,int rptno,char *buf)
|
||||
rptinfo->report_PQ_type = atoi(str);
|
||||
}else return 1;
|
||||
|
||||
if ((str = strtok(NULL, ","))) { //CZY 2023-08-16 WW 2022-11-14<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䱨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>־
|
||||
if ((str = strtok(NULL, ","))) { //CZY 2023-08-16 WW 2022-11-14增加闪变报告标志
|
||||
rptinfo->flickerflag = atoi(str);
|
||||
if (rptinfo->flickerflag == 0) {
|
||||
LD_info->rptRecvFlag += 0x01 << rptno;
|
||||
@@ -218,10 +218,10 @@ int fill_rptctrl_by_cfg(LD_info_t* LD_info,int rptno,char *buf)
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////
|
||||
//************<EFBFBD><EFBFBD><EFBFBD><EFBFBD> LogControl.xml ***************//
|
||||
//************解析 LogControl.xml ***************//
|
||||
|
||||
/*
|
||||
<!-- װ<EFBFBD><EFBFBD>ID,CPUID,LogCtrlNum -->
|
||||
<!-- 装置ID,CPUID,LogCtrlNum -->
|
||||
<LogControlCount>104,1,2</LogControlCount>
|
||||
*/
|
||||
|
||||
@@ -274,7 +274,7 @@ int fill_logctrl_by_cfg(LD_info_t* LD_info,int logno,char *buf,char* devtype)
|
||||
|
||||
if(!(str = strtok(NULL,",")))
|
||||
return 1;
|
||||
apr_snprintf(loginfo->logName,sizeof(loginfo->logName), devtype,LD_info->cpuno);//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>PQM1
|
||||
apr_snprintf(loginfo->logName,sizeof(loginfo->logName), devtype,LD_info->cpuno);//例如PQM1
|
||||
|
||||
if((str = strtok(NULL,","))) loginfo->reasonCode = atoi(str); else return 1;
|
||||
if((str = strtok(NULL,","))) loginfo->IntgPd = atoi(str); else return 1;
|
||||
|
||||
Reference in New Issue
Block a user