diff --git a/EcomAnalysis/Form1.cs b/EcomAnalysis/Form1.cs index af0281d..c2a8088 100644 --- a/EcomAnalysis/Form1.cs +++ b/EcomAnalysis/Form1.cs @@ -76,7 +76,7 @@ // ログファイル情報の処理 if (!_LogFileInfo.Set(filename)) { - MessageBox.Show("Logファイル名が正しくありません", "Error", + MessageBox.Show("Logファイルが正しくありません", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } diff --git a/EcomAnalysis/LogFileInfo.cs b/EcomAnalysis/LogFileInfo.cs index c2dc9ff..4d6bf5b 100644 --- a/EcomAnalysis/LogFileInfo.cs +++ b/EcomAnalysis/LogFileInfo.cs @@ -32,14 +32,17 @@ var parseStr = "yyyyMMdd_HHmmss"; DateTime dt; + if (Filename.Length < parseStr.Length) return false; if (!DateTime.TryParseExact(Filename.Substring(0, parseStr.Length), parseStr, CultureInfo.InvariantCulture, DateTimeStyles.None, out dt)) return false; ExecDate = dt; var strs = Filename.Split('_'); if (strs.Length < 4) return false; - + var visitStr = strs[strs.Length - 1]; + if (visitStr.Equals("calib")) return false; + int v; if (!int.TryParse(visitStr, out v)) return false; Visit = v;