diff --git a/zaaReloaded2/Importer/AutoDetector.cs b/zaaReloaded2/Importer/AutoDetector.cs index 17fafac..b8bc168 100755 --- a/zaaReloaded2/Importer/AutoDetector.cs +++ b/zaaReloaded2/Importer/AutoDetector.cs @@ -175,15 +175,15 @@ namespace zaaReloaded2.Importer string text = paragraph.Range.Text; bool isCinicTimePoint = ClinicTimePoint.IsTimeStampLine(text); bool isZaaTimePoint = LaurisTimePoint.IsTimeStampLine(text); - // If the line is a ZAA time point, but not a clinic timepoint, we can deduct that - // the lab mode *must* be ZAA, because it will be a line in the form - // "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;" which does not - // occur in the clinic format. - if ((ImportMode == ImportMode.Undefined) && isZaaTimePoint && !isCinicTimePoint) - { - Logger.Info("IsTimeStampParagraph: Found ZAA time stamp, setting mode to ZAA"); - ImportMode = ImportMode.Zaa; - } + // // If the line is a ZAA time point, but not a clinic timepoint, we can deduct that + // // the lab mode *must* be ZAA, because it will be a line in the form + // // "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;" which does not + // // occur in the clinic format. + // if ((ImportMode == ImportMode.Undefined) && isZaaTimePoint && !isCinicTimePoint) + // { + // Logger.Info("IsTimeStampParagraph: Found ZAA time stamp, setting mode to ZAA"); + // ImportMode = ImportMode.Zaa; + // } return isCinicTimePoint || isZaaTimePoint; } diff --git a/zaaReloaded2/Importer/ClinicImporter/ClinicTimePoint.cs b/zaaReloaded2/Importer/ClinicImporter/ClinicTimePoint.cs index 8ca5aeb..c508f71 100755 --- a/zaaReloaded2/Importer/ClinicImporter/ClinicTimePoint.cs +++ b/zaaReloaded2/Importer/ClinicImporter/ClinicTimePoint.cs @@ -240,7 +240,7 @@ namespace zaaReloaded2.Importer.ClinicImporter /// paragraph of a LaurisText. /// static readonly Regex _timeStampRegex = new Regex( - @"^(Labor:?)?\s*\(?\s*(?\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)(:00)?\)\s*$"); + @"^(Labor:?)?\s*\(?\s*(?\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)(:00)?\)"); IList _lines; Parameters _parameterDictionary; Units _unitDictionary;