修改样本查询bug
This commit is contained in:
+1
-1
@@ -176,7 +176,7 @@ public abstract class AbstractAddressProcessor {
|
|||||||
}else if(token.getKeywordTypes().equals("district") && i != tokens.size() - 1){
|
}else if(token.getKeywordTypes().equals("district") && i != tokens.size() - 1){
|
||||||
for(int j = i +1; j < tokens.size(); j++){
|
for(int j = i +1; j < tokens.size(); j++){
|
||||||
Token nextToken = tokens.get(j);
|
Token nextToken = tokens.get(j);
|
||||||
if("partition".equals(nextToken.getKeywordTypes()) || "stage".equals(nextToken.getKeywordTypes())){
|
if("partition".equals(nextToken.getKeywordTypes()) || "stage".equals(nextToken.getKeywordTypes()) || "hao_yuan".equals(nextToken.getKeywordTypes())){
|
||||||
token.setEnd(nextToken.getEnd());
|
token.setEnd(nextToken.getEnd());
|
||||||
token.setName(token.getName() + nextToken.getName());
|
token.setName(token.getName() + nextToken.getName());
|
||||||
i++;
|
i++;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public enum KeywordEnum {
|
|||||||
partition, // 分区
|
partition, // 分区
|
||||||
town,//乡镇
|
town,//乡镇
|
||||||
village,//居委会
|
village,//居委会
|
||||||
|
hao_yuan,
|
||||||
number_cn, total_price, room, area, hall, toilet, alpha;
|
number_cn, total_price, room, area, hall, toilet, alpha;
|
||||||
|
|
||||||
public static KeywordEnum parse(String val) {
|
public static KeywordEnum parse(String val) {
|
||||||
|
|||||||
+14
@@ -16,6 +16,7 @@ public class PatternTokenizer {
|
|||||||
private static Pattern REG_NUMBER_CN; // 匹配面积
|
private static Pattern REG_NUMBER_CN; // 匹配面积
|
||||||
private static Pattern STAGE_PATTERN;// 分期
|
private static Pattern STAGE_PATTERN;// 分期
|
||||||
private static Pattern PARTITION_PATTERN;// 分区
|
private static Pattern PARTITION_PATTERN;// 分区
|
||||||
|
private static Pattern HAO_YUAN_PATTERN;// 分区
|
||||||
|
|
||||||
private static final String REG_NUM = "(((,|\\.|\\d| )*\\d)|(一|二|三|四|五|六|七|八|九|十|零|两|个|十|百|千|万|亿| )+)";
|
private static final String REG_NUM = "(((,|\\.|\\d| )*\\d)|(一|二|三|四|五|六|七|八|九|十|零|两|个|十|百|千|万|亿| )+)";
|
||||||
private static final String REG_RANGE_SPLITTER = "(-|~|~|-|到|至| )";
|
private static final String REG_RANGE_SPLITTER = "(-|~|~|-|到|至| )";
|
||||||
@@ -35,6 +36,7 @@ public class PatternTokenizer {
|
|||||||
REG_NUMBER_CN = Pattern.compile(REG_NUM + "(弄|号|栋|厅|卫)");
|
REG_NUMBER_CN = Pattern.compile(REG_NUM + "(弄|号|栋|厅|卫)");
|
||||||
STAGE_PATTERN = Pattern.compile("(([零一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([零一二三四五六七八九十百千\\d]+)期");
|
STAGE_PATTERN = Pattern.compile("(([零一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([零一二三四五六七八九十百千\\d]+)期");
|
||||||
PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|零|一|二|三|四|五|六|七|八|九|十)+(区|坊)");
|
PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|零|一|二|三|四|五|六|七|八|九|十)+(区|坊)");
|
||||||
|
HAO_YUAN_PATTERN = Pattern.compile("\\d+号((小区)|院)");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
@@ -58,6 +60,7 @@ public class PatternTokenizer {
|
|||||||
public static String tokenizers(List<Token> tokens, String k) {
|
public static String tokenizers(List<Token> tokens, String k) {
|
||||||
k = parsePartition(tokens, k);
|
k = parsePartition(tokens, k);
|
||||||
k = parseStage(tokens, k);
|
k = parseStage(tokens, k);
|
||||||
|
k = parseHaoYuan(tokens, k);
|
||||||
// 面积
|
// 面积
|
||||||
k = parseArea(tokens, k);
|
k = parseArea(tokens, k);
|
||||||
// 房型
|
// 房型
|
||||||
@@ -83,6 +86,17 @@ public class PatternTokenizer {
|
|||||||
}
|
}
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
private static String parseHaoYuan(List<Token> ret, String t) {
|
||||||
|
String value = null;
|
||||||
|
Matcher m = HAO_YUAN_PATTERN.matcher(t);
|
||||||
|
while (m.find()) {
|
||||||
|
value = m.group();
|
||||||
|
t = disableValue(t, value);
|
||||||
|
ret.add(new Token(value, m.start(), m.end(), KeywordEnum.hao_yuan.name()));
|
||||||
|
m = HAO_YUAN_PATTERN.matcher(t);
|
||||||
|
}
|
||||||
|
return t;
|
||||||
|
}
|
||||||
private static String parseStage(List<Token> ret, String t) {
|
private static String parseStage(List<Token> ret, String t) {
|
||||||
String value = null;
|
String value = null;
|
||||||
Matcher m = STAGE_PATTERN.matcher(t);
|
Matcher m = STAGE_PATTERN.matcher(t);
|
||||||
|
|||||||
Reference in New Issue
Block a user