# HG changeset patch
# User pyon@macmini
# Date 1593242385 -32400
# Node ID 4877160411ccb44cb3f97c5b21929980da4b7f1b
# Parent  665f92c37b7287b1591de072f6fad1a8a20e3f8c
bug fix.

diff -r 665f92c37b72 -r 4877160411cc src/kaigo/Perori/bk.go
--- a/src/kaigo/Perori/bk.go	Thu May 21 22:53:50 2020 +0900
+++ b/src/kaigo/Perori/bk.go	Sat Jun 27 16:19:45 2020 +0900
@@ -1,7 +1,7 @@
 /*
  bk.go: Insert Biko & Hatsuban
 
- Last Change: 2020-03-10 火 15:13:54.
+ Last Change: 2020-06-24 水 10:16:00.
 */
 
 package main
@@ -46,7 +46,7 @@
 	all_lpszvalue = (char*)malloc(sizeof(char)*datasize[0]);
 	all_lpszvalue[0] = '\0';
     for (int i = 1; i <= nPage; i++) {
-		if (i<nPage) datasize[i]++;	// for "\n"
+		if (i < nPage) datasize[i]++;	// for "\n"
         lpszvalue = (char*)malloc(sizeof(char)*(datasize[i]));
         XDW_GetPageTextToMemory(h, i, lpszvalue, datasize[i], NULL);
 		strcat(all_lpszvalue, lpszvalue);
@@ -143,7 +143,7 @@
 {
 	int x = 1870;
 	int y = 4680;
-	int yoff = 2825;
+	int yoff = 2830;
 	int sz = 90;
 
 	char in_path[_MAX_PATH];
@@ -201,7 +201,7 @@
 
 // Constants
 const (
-	version = "0.4"
+	version = "0.5"
 	default_ccsvfile = "chosairai.csv"
 	default_icsvfile = "ikenshoirai.csv"
 	default_cxdwfile = "KBPC116G.xdw"
@@ -227,10 +227,10 @@
     os.Remove(default_iout)
     os.Remove(default_lout)
 
-	re_hhsno = regexp.MustCompile(`0[1238]\d{8}`)
+	re_hhsno = regexp.MustCompile(`0[1238]00\d{6}`)
 	re_date  = regexp.MustCompile(`((明治)|(大正)|(昭和)|(平成)|(令和)).{1,2}年.\d月.\d日`)
 	re_city  = regexp.MustCompile(`(((平成)|(令和)).{1,2}年.\d月.\d日){2}...`)
-	re_name  = regexp.MustCompile(`0[1238]\d{8}.*((平成)|(令和)).{1,2}年.\d月.\d日`)
+	re_name  = regexp.MustCompile(`0[1238]00\d{6}.*((平成)|(令和)).{1,2}年.\d月.\d日`)
 	re_zensp = regexp.MustCompile(`　{2,}`)
 }