daniel
/
zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Merge branch 'release-2.2.5' into develop

This commit is contained in:
daniel 2016-10-03 17:31:59 +02:00
parent ae012d42fb 5a9e7fe444
commit 9f118757a6
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/make-installer.iss Normal file → Executable file
View File

@ -8,7 +8,7 @@
#define ADDIN_NAME "zaaReloaded" #define ADDIN_NAME "zaaReloaded"
#define COMPANY "Daniel Kraus (bovender)" #define COMPANY "Daniel Kraus (bovender)"
#define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert." #define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert."
#define HOMEPAGE "http://zaa.nephrowiki.de" #define HOMEPAGE "https://doktorkraus.de/zaareloaded"
#define REGKEY "zaaReloaded2" #define REGKEY "zaaReloaded2"
#define SOURCEDIR "..\zaaReloaded2\bin\Release\" #define SOURCEDIR "..\zaaReloaded2\bin\Release\"

4
www/versioninfo.txt
View File

@ -1,4 +1,4 @@
2.2.4 2.2.5
https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
2149acc9b48152b84fedd0466d372dd11f8f4dbb72cd4db928f9a54890f06ed9 deploy/releases/zaaReloaded-2.2.4.exe f5f348b5ffdc532240b63af8fbfd1983219adeee338b9decb3ac3df5f23965ca deploy/releases/zaaReloaded-2.2.5.exe

11
zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs
View File

@ -103,6 +103,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
// "HBs-Antigen: neg. ;" // "HBs-Antigen: neg. ;"
// "Erythrozyten (U): + [negativ]" // "Erythrozyten (U): + [negativ]"
Match match; Match match;
Logger.Debug("ParseLauris: {0}", LaurisText);
if (_numericalRegex.IsMatch(LaurisText)) if (_numericalRegex.IsMatch(LaurisText))
{ {
Logger.Debug("ParseLauris: Numerical match"); Logger.Debug("ParseLauris: Numerical match");
@ -139,10 +140,11 @@ namespace zaaReloaded2.Importer.ZaaImporter
{ {
if (match.Groups["limits"].Success) if (match.Groups["limits"].Success)
{ {
Logger.Debug("ParseLimits: Has limits"); Logger.Debug("ParseLimits: Has limits: {0}", match.Groups["limits"].Value);
Match limitMatch = _limitRegex.Match(match.Groups["limits"].Value); Match limitMatch = _limitRegex.Match(match.Groups["limits"].Value);
if (limitMatch.Groups["limit1"].Success && limitMatch.Groups["limit2"].Success) if (limitMatch.Groups["limit1"].Success && limitMatch.Groups["limit2"].Success)
{ {
Logger.Debug("ParseLimits: Upper and lower limit detected");
// Use InvariantCulture because Lauris always outputs dots as decimal separator // Use InvariantCulture because Lauris always outputs dots as decimal separator
// Only in rare cases, a comma sneaks in... // Only in rare cases, a comma sneaks in...
LowerLimit = Double.Parse(limitMatch.Groups["limit1"].Value.Replace(',', '.'), LowerLimit = Double.Parse(limitMatch.Groups["limit1"].Value.Replace(',', '.'),
@ -152,6 +154,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
} }
else else
{ {
Logger.Debug("ParseLimits: Single limit detected");
switch (limitMatch.Groups["operator"].Value.Trim()) switch (limitMatch.Groups["operator"].Value.Trim())
{ {
case "<=": case "<=":
@ -167,9 +170,9 @@ namespace zaaReloaded2.Importer.ZaaImporter
// Fixes exception ID 65ca8575. // Fixes exception ID 65ca8575.
break; break;
default: default:
throw new InvalidOperationException( string unknown = match.Groups["limits"].Value;
String.Format("Unknown operator in {0}", Logger.Fatal("ParseLimits: Unknown operator \"{0}\"", unknown);
match.Groups["limits"].Value)); throw new InvalidOperationException(String.Format("Unknown operator in {0}",unknown));
} }
} }
} }

2
zaaReloaded2/Importer/ZaaImporter/LaurisParagraph.cs
View File

@ -110,6 +110,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
/// </summary> /// </summary>
void Parse() void Parse()
{ {
Logger.Info("Parse: \"{0}\"", OriginalParagraph.TruncateWithEllipsis(40));
Match m = _expectedFormat.Match(OriginalParagraph); Match m = _expectedFormat.Match(OriginalParagraph);
if (m.Success) if (m.Success)
{ {
@ -130,7 +131,6 @@ namespace zaaReloaded2.Importer.ZaaImporter
else else
{ {
Logger.Info("Parse: Does not match Lauris paragraph format"); Logger.Info("Parse: Does not match Lauris paragraph format");
Logger.Info("Parse: {0}", OriginalParagraph.TruncateWithEllipsis(40));
IsLaurisParagraph = false; IsLaurisParagraph = false;
} }
} }

4
zaaReloaded2/Importer/ZaaImporter/LaurisTimePoint.cs
View File

@ -219,12 +219,12 @@ namespace zaaReloaded2.Importer.ZaaImporter
// the normal format of a paragraph generated from Lauris. // the normal format of a paragraph generated from Lauris.
if (m.Groups["tail"].Success) if (m.Groups["tail"].Success)
{ {
Logger.Debug("ParseParagraph: Time stamp has tail, adding dummy caption"); Logger.Info("ParseParagraph: Time stamp has a tail -- putting it back with a dummy caption");
paragraph = "DUMMY CAPTION: " + m.Groups["tail"].Value; paragraph = "DUMMY CAPTION: " + m.Groups["tail"].Value;
} }
else else
{ {
paragraph = String.Empty; paragraph = null;
} }
} }

9
zaaReloaded2/Importer/ZaaImporter/ZaaImporter.cs
View File

@ -67,17 +67,19 @@ namespace zaaReloaded2.Importer.ZaaImporter
/// <param name="text">ZAA-formatted Lauris output to import.</param> /// <param name="text">ZAA-formatted Lauris output to import.</param>
public void Import(string text) public void Import(string text)
{ {
Logger.Info("Import"); Logger.Info("Import: \"{0}\"", text.TruncateWithEllipsis(120));
string[] paragraphs = Helpers.SplitParagraphs(text); string[] paragraphs = Helpers.SplitParagraphs(text);
Logger.Info("Import: {0} paragraph(s)", paragraphs.Length);
LaurisTimePoint timePoint = null; LaurisTimePoint timePoint = null;
foreach (string paragraph in paragraphs) foreach (string paragraph in paragraphs)
{ {
Logger.Info("Import: \"{0}\"", paragraph.TruncateWithEllipsis(40));
// If the current paragraph looks like a Lauris time stamp, // If the current paragraph looks like a Lauris time stamp,
// create a new time point. // create a new time point.
if (LaurisTimePoint.IsTimeStampLine(paragraph)) if (LaurisTimePoint.IsTimeStampLine(paragraph))
{ {
Logger.Info("Import: Time stamp line: {0}", paragraph); Logger.Info("Import: Time stamp detected", paragraph);
timePoint = new LaurisTimePoint(paragraph, _parameters, _units); timePoint = new LaurisTimePoint(paragraph, _parameters, _units);
// Add the time point to the laboratory only if none // Add the time point to the laboratory only if none
// with the same time stamp exists yet. // with the same time stamp exists yet.
@ -106,8 +108,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
} }
else else
{ {
Logger.Debug("Import: Neither time line, nor Lauris paragraph"); Logger.Debug("Import: Neither time stamp, nor Lauris paragraph");
Logger.Debug("Import: {0}", paragraph.TruncateWithEllipsis(30));
} }
} }
} }

4
zaaReloaded2/VERSION
View File

@ -1,2 +1,2 @@
2.2.4 2.2.5
2.2.4.0 2.2.5.0

2
zaaReloaded2/Views/AboutView.xaml
View File

@ -38,7 +38,7 @@
<TextBlock TextAlignment="Center" Margin="0, 10, 0, 10"> <TextBlock TextAlignment="Center" Margin="0, 10, 0, 10">
Homepage: Homepage:
<Hyperlink Command="{Binding GotoHomepageCommand}"> <Hyperlink Command="{Binding GotoHomepageCommand}">
<TextBlock Text="zaa.nephrowiki.de" /> <TextBlock Text="doktorkraus.de/zaareloaded" />
</Hyperlink> </Hyperlink>
<LineBreak /> <LineBreak />
Quellcode: Quellcode: