Skip to content

Commit 0a647a4

Browse files
committed
調整 localRE
1 parent e6b8c0b commit 0a647a4

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

ArticutAPI/Toolkit/localRE.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ def __init__(self, locale=None):
1313
self.TWaddPatDICT = {"countyPat" : "[^\s][^市]縣",
1414
"cityPat" : "[^是在於及、,\s]{1,2}市",
1515
"districtPat" : "那瑪夏區|[^市及、,\s]+?.社?區|[東西南北中]區",
16-
"townshipPat" : "(阿里山|三地門|太麻里)鄉|..鄉|[^縣].里(?!區)",
16+
"townshipPat" : "(?:阿里山|三地門|太麻里)鄉|..鄉|[^縣].里(?!區)",
1717
"townPat" : "[^\s][^\s]鎮",
18-
"villagePat" : "[^\s][^\s]新?村(?!路)",
19-
"neighborhoodPat": "(\s?[零一二三四五六七八九十廿卅0-9\d]+?\s?鄰)",
20-
"roadPat" : "市府路|市[政場]([北南中]|[1-7一二三四五六七]){0,2}路|市港[^\s]路|美村路|[新環村盛果]市[^\s]?[路街]|市民大道|市宅街|[埔菜美元西]市[路街]|(?<=[縣市區鄉鎮里村鄰])[^市區鄉鎮村路及鄰、,]{1,4}([路街](?!里)|大道)([零一二三四五六七八九十廿卅百0-9\d]+?街)?",
18+
"villagePat" : "(?:(?<=[縣市區鄉鎮路段])(?:[^\s縣市區鄉鎮路段]+)?新?村|[^\s][^\s]新?村)(?!路)",
19+
"neighborhoodPat": "(?:\s?[零一二三四五六七八九十廿卅0-9\d]+?\s?鄰)",
20+
"roadPat" : "市府路|市[政場](?:[北南中]|[1-7一二三四五六七]){0,2}路|市港[^\s]路|美村路|[新環村盛果]市[^\s]?[路街]|市民大道|市宅街|[埔菜美元西]市[路街]|(?<=[縣市區鄉鎮里村鄰])[^市區鄉鎮村路及鄰、,]{1,4}(?:[路街](?!里)|大道)(?:[零一二三四五六七八九十廿卅百0-9\d]+?街)?",
2121
"sectionPat" : "\s?[零一二三四五六七八九十廿卅百0-9\d]*?\s?段",
22-
"alleyPat" : "(國中|市場|新市.|([^縣市區鄉鎮里村路街段]{1,2}|鐵路)[零一二三四五六七八九十廿卅百0-9\d]*?|\s?[零一二三四五六七八九十廿卅百0-9\d]*?)\s?巷([零一二三四五六七八九十廿卅百0-9\d]*?\s?弄)?",
23-
"numberPat" : "(\s?[零一二三四五六七八九十廿卅百0-9\d]*?\s?[之\-]\s?)?\s?[零一二三四五六七八九十廿卅百0-9\d]*?\s?號([之\-]\s?[零一二三四五六七八九十廿卅百0-9\d]+?)?",
22+
"alleyPat" : "(?:國中|市場|新市.|七里溪|(?:[^縣市區鄉鎮里村路街段]{1,2}|鐵路)[零一二三四五六七八九十廿卅百0-9\d]*?|\s?[零一二三四五六七八九十廿卅百0-9\d]*?)\s?巷(?:[零一二三四五六七八九十廿卅百0-9\d]*?\s?弄)?",
23+
"numberPat" : "(?:\s?[零一二三四五六七八九十廿卅百0-9\d]*?\s?[之\-]\s?)?\s?[零一二三四五六七八九十廿卅百0-9\d]*?\s?號(?:[之\-]\s?[零一二三四五六七八九十廿卅百0-9\d]+?)?",
2424
"floorPat" : "\s?[零一二三四五六七八九十廿卅百0-9\d]*?\s?[fF樓]",
25-
"roomPat" : "\s?([a-zA-Z零一二三四五六七八九十廿卅百\d0-9]+?)\s?(室?$)"}
25+
"roomPat" : "\s?(?:[a-zA-Z零一二三四五六七八九十廿卅百\d0-9]+?)\s?(室?$)"}
2626
self.stripPat = re.compile("(?<=>).*?(?=<)")
2727

2828
def _addIndexConverter(self, ArticutResultDICT, addIndexLIST):

0 commit comments

Comments
 (0)