X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=pdiread.sh;fp=pdiread.sh;h=112a827c15c03726e8818cdfc1b1973a90ae74a2;hp=e01c71c42229790ae65b34f15fd8416a1bf38415;hb=2a2877f7c42a130056d2ca9cc4be516644c88a3a;hpb=6655ac8dd9a786d394d628fed0fbc6e6008078c1 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; ' }