From 125a2e3cb3f6d9b2aaaa5482385a5a4ccb852284 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Tue, 26 Jan 2016 08:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0IRIS=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=92=8C=E5=85=A8=E9=87=8F=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E9=83=BD=E9=83=A8=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E7=9B=B4=E6=8E=A5=E6=AE=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.txt | 3 ++- src/entry/Maat_rule.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/readme.txt b/readme.txt index 8b45fd1..ac9419f 100644 --- a/readme.txt +++ b/readme.txt @@ -41,4 +41,5 @@ indexfile; 2015-07-06 1)handle wrong expr format like "aa&&bb" and "aa&bb&"; 2)iconv_convert performance optimized; 2015-10-19 check table_type in callback register; -2015-12-24 change plugin table update mechanism to save memory; \ No newline at end of file +2015-12-24 change plugin table update mechanism to save memory; +2016-01-20 maat_finish_cb adapt empty inc callback on a NULL scanner; diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 5a5585f..3fbbf62 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -24,7 +24,7 @@ #include "mesa_fuzzy.h" #include "great_index_engine.h" -int MAAT_FRAME_VERSION_1_3_20151224=1; +int MAAT_FRAME_VERSION_1_3_20160120=1; const char *maat_module="MAAT Frame"; const char* CHARSET_STRING[]={"CHARSET_NONE","GBK","BIG5","UNICODE","UTF-8"}; @@ -2258,7 +2258,7 @@ void maat_finish_cb(void* u_para) "Full config version %u load %d entries complete.", feather->update_tmp_scanner->version,feather->update_tmp_scanner->cfg_num); } - else + else if(feather->scanner!=NULL) { feather->scanner->cfg_num=total; feather->scanner->version=feather->maat_version; @@ -2275,7 +2275,7 @@ void maat_finish_cb(void* u_para) else { MESA_handle_runtime_log(feather->logger,RLOG_LV_INFO,maat_module, - "Postpone config version %u %d entries load to rulescan.", + "Postpone config version %u (%d entries) load to rulescan.", feather->scanner->version,feather->scanner->cfg_num); } }