cleanup of category handling

svn path=/trunk/; revision=158

diff --git a/pages/cards.sh b/pages/cards.sh
index b836f6b63cd450db45f7704fc0151e2dcfe1be24..a90981c6a16d02ec265bc80653aed9b29b90eca4 100755 (executable)
--- a/pages/cards.sh
+++ b/pages/cards.sh
@@ -60,7 +60,8 @@ list_hi_companies(){
 
 list_categories() {
   catfile="${_DATA}/mappings/categories"
-  sort -u "$catfile"
+  sort -u "$catfile" \
+  | sed -r '/^[\t ]*$/d'
 }
 
 listcards() {

diff --git a/pages/categories.sh b/pages/categories.sh
index 88d78c22d4e982b345ca7f0d4fa861b058c670ba..e875eef7d756e6759c35b66ae6663d619343dbfe 100755 (executable)
--- a/pages/categories.sh
+++ b/pages/categories.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2015 Paul Hänsch
+# Copyright 2015, 2017 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -20,25 +20,32 @@
 catfile="${_DATA}/mappings/categories"
 
 listcards() {
-  ls -1 ${_DATA}/vcard/*vcf 2>/dev/null |while read file; do
-    fn=$(sed -rn 's:^N(;.+)*\:([^;]*;){1} *([^;]*).*$:\3:p' "$file")
-    echo "$fn\t$file"
-  done |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:'
+  for file in "${_DATA}/vcard/"*.vcf; do
+    printf '%s\t%s\n' \
+      "$(sed -rn 's:^N(;.+)*\:([^;]*;){1} *([^;]*).*$:\3:p' "$file")" \
+      "$file"
+  done \
+  | sort \
+  | sed -r 's;^.*\t(.*/)([^/]+)$;\2;'
 }
 
 get_name() {
   cfile="${_DATA}/vcard/$1"
-  sed -rn 's:^N(;[^"\:]+|;"[^"]+")*\:([^;]*)(\;[^;]*)(\;[^;]*)?(\;[^;]*)?(\;[^;]*)?\r?$:\5 \3 \4 \2 \6:p' "$cfile" \
-  |sed -r 's:,: :;s:\;: :g;s: +: :g' \
+  sed -rn 's;^N(\;[^":]+|\;"[^"]+")*:([^\;]*)(\;[^\;]*)(\;[^\;]*)?(\;[^\;]*)?(\;[^\;]*)?\r?$;\5 \3 \4 \2 \6;;
+           tX; b; :X s;[,\; ]+; ;g; p;' "$cfile"
 }
 
 get_categories(){
   cfile="${_DATA}/vcard/$1"
-  sed -rn 's:^CATEGORIES(;[^"\:]+|;"[^"]+")*\:(.+)\r?$:\2:p' "$cfile" \
-  | sed -r 's;(^|[^\\]+)((\\\\)+),;\1\2\n;g; s;(^|[^\\]),;\1\n;g; s;(^|[^\\]+)((\\\\)+),;\1\2\n;g; s;(^|[^\\]),;\1\n;g; s;\\,;,;g' \
+  sed -rn 's;^CATEGORIES(\;[^":]+|\;"[^"]+")*:(.+)\r?$;\2;;
+           tX; b; :X
+           s;(^|[^\\]+)((\\\\)+),;\1\2\n;g;
+           s;(^|[^\\]),;\1\n;g; s;(^|[^\\]+)((\\\\)+),;\1\2\n;g;
+           s;(^|[^\\]),;\1\n;g; s;\\,;,;g; p;' "$cfile" \
   | sort -u
 }
 
 list_categories() {
-  sort -u "$catfile"
+  sort -u "$catfile" \
+  | sed -r '/^[\t ]*$/d'
 }

diff --git a/templates/categories.html.sh b/templates/categories.html.sh
index 5375965027dd10b91f8d10db4494c614c978a0a3..e266e1f24e18b704208433cc843619b0614e8bc0 100755 (executable)
--- a/templates/categories.html.sh
+++ b/templates/categories.html.sh
@@ -1,4 +1,4 @@
-# Copyright 2015 Paul Hänsch
+# Copyright 2015, 2017 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -17,29 +17,27 @@
 
 cat_listing(){
   list_categories | while read cat; do
-    cat <<-END
-       <li>${cat}<button type="submit" name="remove" value="${cat}">$(l10n cat_remove)</button></li>
-       END
+    printf '<li>%s<button type="submit" name="remove" value="%s">%s</button></li>\n' \
+           "$(htmlsafe "$cat")" "$(attribsafe "$cat")" "$(l10n cat_remove)"
   done
 }
 
 list_catsel(){
   card="$1"
-  cats="$(get_categories $card)"
+  cats="$(get_categories "$card")"
 
   list_categories |while read cat; do
-  cat <<-END
-       <li><label><input type="checkbox" name="$card" value="$cat"
-       $(printf %s "$cats" |grep -qF "$cat" && printf %s 'checked="checked"')>${cat}</label></li>
-       END
+    printf '<li><label><input %s type="checkbox" name="%s" value="%s">%s</label></li>' \
+          "$(printf %s "$cats" |grep -qF "$cat" && printf 'checked="checked"')" \
+           "$(attribsafe "$card")" "$(attribsafe "$cat")" "$(htmlsafe "$cat")" 
   done
 }
 
 display_catsel(){
   card="$1"
-  cat <<-END
-       <li><h2>$(get_name "$card")</h2><ul>$(list_catsel "$card")</ul></li>
-       END
+  printf '<li><h2>%s</h2><ul>' "$(htmlsafe "$(get_name "$card")")"
+  list_catsel "$card"
+  printf '</ul></li>'
 }
 
 cat <<EOF
@@ -60,12 +58,16 @@ cat <<EOF
     <button type="submit" name="submit" value="submit">$(l10n cat_update)</button>
   </fieldset>
   <ul class="namelist">
-    $(listcards |while read card; do display_catsel "$card"; done )
+EOF
+listcards \
+| while read card; do
+  display_catsel "$card"
+done
+cat <<EOF
   </ul>
   <fieldset>
     <button type="submit" name="submit" value="submit">$(l10n cat_update)</button>
   </fieldset>
 </form>
-
 EOF
 

diff --git a/templates/edit_card.sh b/templates/edit_card.sh
index 741a31217e6b2cc58f8c68d600236df020838a94..bc71db2f91514ec684f2185feac2aeaf48a9e9fe 100755 (executable)
--- a/templates/edit_card.sh
+++ b/templates/edit_card.sh
@@ -1,4 +1,4 @@
-# Copyright 2014 - 2016 Paul Hänsch
+# Copyright 2014 - 2017 Paul Hänsch
 #
 # This file is part of Confetti.
 # 

diff --git a/templates/view_card.sh b/templates/view_card.sh
index 9728d8fc4a7ecc99ca20d1fe403567c0517ea875..6d23a76bd0037798df0ade2c6cb265ecb64fec71 100755 (executable)
--- a/templates/view_card.sh
+++ b/templates/view_card.sh
@@ -1,4 +1,4 @@
-# Copyright 2014 - 2016 Paul Hänsch
+# Copyright 2014 - 2017 Paul Hänsch
 #
 # This file is part of Confetti.
 #