From c1ba19566f180ae64f10fef7540e4a1136966fc5 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Thu, 19 Nov 2015 16:34:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMESA=5Ffuzzy=E4=B8=AD?= =?UTF-8?q?=E9=9B=B6=E5=81=8F=E7=A7=BB=E9=87=8F=E5=8C=BA=E9=97=B4=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E6=97=B6=E5=AF=BC=E8=87=B4=E5=81=8F=E7=A7=BB=E9=87=8F?= =?UTF-8?q?=E6=BA=A2=E5=87=BA=E7=9A=84bug=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_rule.cpp | 2 +- src/entry/mesa_fuzzy.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 8f44e96..bfe5ee9 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_20151113=0; +int MAAT_FRAME_VERSION_1_3_20151119=0; const char *maat_module="MAAT Frame"; const char* CHARSET_STRING[]={"CHARSET_NONE","GBK","BIG5","UNICODE","UTF-8"}; diff --git a/src/entry/mesa_fuzzy.c b/src/entry/mesa_fuzzy.c index 22adcba..03b3296 100644 --- a/src/entry/mesa_fuzzy.c +++ b/src/entry/mesa_fuzzy.c @@ -186,7 +186,7 @@ void fuzzy_destroy_handle(fuzzy_handle_t * handle) */ unsigned int fuzzy_feed(fuzzy_handle_t * handle, const char * data, unsigned int size, unsigned long long offset) { - if(data==NULL||size==0) + if(data == NULL || size == 0) { return 0; } @@ -265,7 +265,7 @@ unsigned int segment_overlap(fuzzy_handle_t * handle, fuzzy_node * fnode, unsign } case CONTAIN: //包含关系，将左边那部分直接插入，然后改变seg的左值，并将data移动到指定的位置 { - if(overlap_segs[i]->left - 1 >= seg->left) + if(overlap_segs[i]->left >= 1 && overlap_segs[i]->left - 1 >= seg->left) { fuzzy_node * node = (fuzzy_node *)calloc(sizeof(fuzzy_node), 1); memcpy(node, fnode, sizeof(fuzzy_node));