diff --git a/HISTORY.md b/HISTORY.md
index 6c9ab41..e41a1af 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,12 @@
+Version 2.2.1 (2015-12-03)
+========================================================================
+
+- VERBESSERT: 'Alternative' Verordnungen wurden nicht erkannt, wenn in der selben Zeile nicht auch eine 'kanonische' Verordnung stand.
+- VERBESSERT: Fehlermeldung "Ein Name darf nicht mit dem Zeichen ' ' beginnen" wurde abgestellt (Fehlernr. 6a36e38b).
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+
Version 2.2.0 (2015-12-03)
========================================================================
diff --git a/www/versioninfo.txt b/www/versioninfo.txt
index 39edb10..d22af2e 100644
--- a/www/versioninfo.txt
+++ b/www/versioninfo.txt
@@ -1,4 +1,4 @@
-2.2.0
+2.2.1
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-aef576f192cb58aef59670df6407e36e2403675dc558af56430babbd218b6c0e publish/release/zaaReloaded-2.2.0.exe
+5d961a309294b43c88b17905206f1162791e14e7dad8d367dc47c21205a60e3e publish/release/zaaReloaded-2.2.1.exe
diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded
index e97c1f7..c263e28 100755
--- a/zaaReloaded2/Defaults/clinic.zaaReloaded
+++ b/zaaReloaded2/Defaults/clinic.zaaReloaded
@@ -171,7 +171,7 @@
2
-Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)
+Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)
diff --git a/zaaReloaded2/Demo/Demo.docx b/zaaReloaded2/Demo/Demo.docx
index 7957a04..6206475 100755
Binary files a/zaaReloaded2/Demo/Demo.docx and b/zaaReloaded2/Demo/Demo.docx differ
diff --git a/zaaReloaded2/Medication/Importer.cs b/zaaReloaded2/Medication/Importer.cs
index 393ac34..c3f1c8b 100755
--- a/zaaReloaded2/Medication/Importer.cs
+++ b/zaaReloaded2/Medication/Importer.cs
@@ -180,7 +180,7 @@ namespace zaaReloaded2.Medication
string[] lines = Helpers.SplitParagraphs(text);
foreach (string line in lines)
{
- if (Prescription.IsCanonicalPrescriptionLine(line))
+ if (Prescription.IsPotentialPrescriptionLine(line))
{
addition = Prescription.ManyFromLine(line);
columns = System.Math.Max(columns, addition.Count);
diff --git a/zaaReloaded2/Medication/Prescription.cs b/zaaReloaded2/Medication/Prescription.cs
index adbe5c7..f549804 100755
--- a/zaaReloaded2/Medication/Prescription.cs
+++ b/zaaReloaded2/Medication/Prescription.cs
@@ -40,9 +40,15 @@ namespace zaaReloaded2.Medication
return canonicalRegex.IsMatch(line);
}
+ ///
+ /// Determines if a line contains prescriptions, either canonical
+ /// ones or alternative ones (in the form "Ramipril 5 mg \t alle 2 Tage").
+ ///
+ /// Line to examine.
+ /// True if the line potentially contains prescriptions.
public static bool IsPotentialPrescriptionLine(string line)
{
- return alternativeRegex.IsMatch(line);
+ return unifiedRegex.IsMatch(line);
}
#endregion
diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION
index 3c80d93..ae32db3 100755
--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@@ -1,2 +1,2 @@
-2.2.0
-2.2.0.0
+2.2.1
+2.2.1.0