diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 84cb480..f460534 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -26,7 +26,7 @@ #include "mesa_fuzzy.h" #include "great_index_engine.h" -int MAAT_FRAME_VERSION_1_8_20160907_TABLE_CONJ=1; +int MAAT_FRAME_VERSION_1_8_20160909_TABLE_CONJ=1; const char *maat_module="MAAT Frame"; const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", @@ -1357,9 +1357,13 @@ int get_district_id(_Maat_scanner_t *scanner,const char* district_str) { scanner->tmp_district_map=map_duplicate(scanner->district_map); } - district_id= scanner->district_num; - map_register(scanner->tmp_district_map,district_str, district_id); - scanner->district_num++; + map_ret=map_str2int(scanner->tmp_district_map, district_str,&district_id); + if(map_ret<0) + { + district_id= scanner->district_num; + map_register(scanner->tmp_district_map,district_str, district_id); + scanner->district_num++; + } } return district_id; } diff --git a/src/entry/Makefile b/src/entry/Makefile index 4b72255..65c5b52 100644 --- a/src/entry/Makefile +++ b/src/entry/Makefile @@ -4,10 +4,13 @@ CC = gcc CCC = g++ CFLAGS = -Wall -g -fPIC +GCOV_FLAGS = -fprofile-arcs -ftest-coverage CFLAGS += $(OPTFLAGS) +#CFLAGS += $(GCOV_FLAGS) LDDICTATOR = -Wl,-wrap,malloc -Wl,-wrap,calloc -Wl,-wrap,free -Wl,-wrap,realloc -LDFLAGS = -lMESA_handle_logger -lMESA_htable -lpthread -lrt -lm -lrulescan -lpcre -lMESA_field_stat2 +LDFLAGS = -lMESA_handle_logger -lMESA_htable -lpthread -lrt -lm -lrulescan -lpcre -lMESA_field_stat2 -lgcov #LDFLAGS += $(LDDICTATOR) +LDFLAGS += $(GCOV_FLAGS) MAILLIB = ../lib G_H_DIR =../inc_internal @@ -34,7 +37,7 @@ $(LIBMAAT): $(OBJS) cp $(LIBMAAT) ../../lib/ clean: - rm -rf *.o $(LIBMAAT) *~ + rm -rf *.o *.gcov *.gcno $(LIBMAAT) *~ opt: $(MAKE) all