From: Paul Hänsch <paul@plutz.net>
Date: Wed, 6 Feb 2019 20:21:02 +0000 (+0100)
Subject: bugfix: field splitting
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=2a2877f7c42a130056d2ca9cc4be516644c88a3a;p=confetti

bugfix: field splitting
---

diff --git a/pdiread.sh b/pdiread.sh
index e01c71c..112a827 100755
--- a/pdiread.sh
+++ b/pdiread.sh
@@ -38,11 +38,6 @@ pdi_load() {
     # === strip trailing CR (but keep CRs in property value) ===
     # s;\r$;;;  # already done in in previous filter
 
-    # unscramble aggregated fields
-    :disag
-    s;^([^:]+:)((.*[^\])?(\\\\)*),;\1\2\n\1;;
-    t disag;
-
     # === Normalise various known vendor properties ===
                 s;^X-MS-CARDPICTURE(\;|:);PHOTO\1;;
                         s;^X-GENDER(\;|:);GENDER\1;;
@@ -75,6 +70,11 @@ pdi_load() {
 
     # === Insert empty attribute fields where no attributes are present ===
     s;^([^;:]+):;\1\;:;;
+
+    # unscramble aggregated fields
+    :disag
+    s;^([^:]+:)((.*[^\])?(\\\\)*),;\1\2\n\1;;
+    t disag;
     '
 }