Merge pull request #102 from tychy/issue-95

fix issue95
tychy · Jun 17, 2024 · 2bc2e9f · 2bc2e9f
2 parents e472e72 + 612fcf6
commit 2bc2e9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/toukibo/parse_body.go b/toukibo/parse_body.go
@@ -126,8 +126,8 @@ func getExecutiveNameAndPosition(s string) (string, string, string) {
 		name := trimAllSpace(matches[2])
 
 		// 金額の記載がある場合、役員名から削除
-		name = trimPattern(name, fmt.Sprintf("金[%s]+円全部履行", ZenkakuStringPattern))
-		name = trimPattern(name, fmt.Sprintf("金[%s]+円", ZenkakuStringPattern)) // sample519用のハック
+		name = trimPattern(name, fmt.Sprintf("金[%s]+(?:万円|円)全部履行", ZenkakuNumberPattern))
+		name = trimPattern(name, fmt.Sprintf("金[%s]+(?:万円|円)", ZenkakuNumberPattern)) // sample519用のハック
 
 		// 「取締役・監査等」の場合、役職は「取締役・監査等委員」に変更
 		if pos == "取締役・監査等" {
@@ -140,8 +140,8 @@ func getExecutiveNameAndPosition(s string) (string, string, string) {
 	out, pos, name := getShain(s)
 	if pos != "" {
 		// 金額の記載がある場合、役員名から削除
-		name = trimPattern(name, fmt.Sprintf("金[%s]+円全部履行", ZenkakuStringPattern))
-		name = trimPattern(name, fmt.Sprintf("金[%s]+円", ZenkakuStringPattern)) // sample519用のハック
+		name = trimPattern(name, fmt.Sprintf("金[%s]+(?:万円|円)全部履行", ZenkakuNumberPattern))
+		name = trimPattern(name, fmt.Sprintf("金[%s]+(?:万円|円)", ZenkakuNumberPattern)) // sample519用のハック
 
 		return out, pos, name
 	}

diff --git a/toukibo/zenkaku.go b/toukibo/zenkaku.go
@@ -15,6 +15,7 @@ const (
 	ZenkakuColon         = '：'
 	ZenkakuSlash         = '／'
 	ZenkakuHyphen        = '－'
+	ZenkakuNumberPattern = `０-９`
 	ZenkakuStringPattern = `\p{Han}\p{Hiragana}\p{Katakana}Ａ-Ｚａ-ｚ０-９A-Za-z0-9＆’，‐．・ー\s　。－、：／`
 )