simplified vcf parser, enabled field for health insurance

[confetti] / templates / edit_client.sh

diff --git a/templates/edit_client.sh b/templates/edit_client.sh
index ddb33c3d352492d886b3e8fd4d191d6ad2ca0ef6..049f251da7a56e804ffb32f9e0ba427aab308562 100755 (executable)
--- a/templates/edit_client.sh
+++ b/templates/edit_client.sh
@@ -1,4 +1,4 @@
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -22,11 +22,14 @@ check_a() {
   egrep -q "^${1}.${id}$" "$_DATA/mappings/attendance" && echo 'checked="checked"'
 }
 
-n_last="$(echo "$values[N]" |sed -rn 's:^([^;]*;){0} *([^;]*).*$:\2:p')"
-n_first="$(echo "$values[N]" |sed -rn 's:^([^;]*;){1} *([^;]*).*$:\2:p')"
-n_middle="$(echo "$values[N]" |sed -rn 's:^([^;]*;){2} *([^;]*).*$:\2:p')"
-n_pre="$(echo "$values[N]" |sed -rn 's:^([^;]*;){3} *([^;]*).*$:\2:p')"
-n_post="$(echo "$values[N]" |sed -rn 's:^([^;]*;){4} *([^;]*)*$:\2:p')"
+n_last="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){0} *([^;]*).*$:\2:p')"
+n_first="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){1} *([^;]*).*$:\2:p')"
+n_middle="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){2} *([^;]*).*$:\2:p')"
+n_pre="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){3} *([^;]*).*$:\2:p')"
+n_post="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){4} *([^;]*)*$:\2:p')"
+
+hi_number="${values[X-HEALTH-INSURANCE]%;*}"
+hi_company="${values[X-HEALTH-INSURANCE]#*;}"
 
 SUP_FIELDS=(N NICKNAME GENDER BDAY ADR TEL EMAIL X-HEALTH-INSURANCE X-HEALTH-INSURANCE-NOCONTRIB IMPP URL NOTE X-CLIENT-REFERRAL)
 
@@ -101,7 +104,7 @@ cat <<END_HTML
       <option value="" disabled="disabled" selected="selected">$(l10n hi_company)</option>
       $(list_hi_companies |while read f; do echo "<option value=\"$f\">$(l10n $f)</option>"; done)
     </select>
-    <input class="item hi_number" name="hi_number" value="$values[hi_number]" placeholder="$(l10n hi_number)" />
+    <input class="item hi_number" name="hi_number" value="$hi_number" placeholder="$(l10n hi_number)" />
 
   </div>