implemented card ordering

diff --git a/cards/list.sh b/cards/list.sh
index 8b911fb88e9bf63583d75702c79efccdeea81020..677519113d01e96c6a4c75c8ea0db260d2ebbc70 100755 (executable)
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -6,21 +6,17 @@ unescape() { [ $# = 0 ] && sed -E 's;\\(.);\1;g' || printf %s "$*" |sed -E 's;\\
 upcase=' y;abcdefghijklmnopqrstuvwxyzäöüé;ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜÉ;; '
 
 card_fullname(){
 upcase=' y;abcdefghijklmnopqrstuvwxyzäöüé;ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜÉ;; '
 
 card_fullname(){

-  local card="$1" n1 n2 n3 n4 n5
+  local card="$1" N n1 n2 n3 n4 n5

 
 

-  local N="$(pdi_value "$card" N)"
-  local FN="$(pdi_value "$card" FN)"
-  local NICKNAME="$(pdi_value "$card" NICKNAME)"
-
-  if [ "$FN" ]; then
-    printf %s "$FN"
-  elif [ "$N" ]; then
+  if pdi_value "$card" FN; then
+    return
+  elif N="$(pdi_value "$card" N)"; then

     IFS=\; read n1 n2 n3 n4 n5 <<-EOF
        $(pdi_value "$card" N)
        EOF
     printf '%s %s %s %s %s' "$n4" "$n2" "$n3" "$n1" "$n5"
     IFS=\; read n1 n2 n3 n4 n5 <<-EOF
        $(pdi_value "$card" N)
        EOF
     printf '%s %s %s %s %s' "$n4" "$n2" "$n3" "$n1" "$n5"

-  elif [ "$NICKNAME" ]; then
-    printf '"%s"' "$NICKNAME"
+  else
+    pdi_value "$card" NICKNAME

   fi
 }
 
   fi
 }
 


@@ -154,8 +150,32 @@ filter_cards(){
              '"$upcase""$fex"
 }
 
              '"$upcase""$fex"
 }
 

+order_cards() {
+  local cardfile card
+  echo ORDER $order >&2
+
+  while read cardfile; do
+    card="$(pdi_load "$cardfile")"
+
+    case $order in
+      firstname)
+        printf '%s     %s\n' "$(card_fullname "$card")" "$cardfile"
+        ;;
+      lastname)
+        printf '%s     %s\n' "$(pdi_value "$card" N || card_fullname "$card")" "$cardfile"
+        ;;
+      bdate)
+        printf '%s     %s\n' "$(pdi_value "$card" BDAY || printf 0000-00-00)" "$cardfile"
+        ;;
+    esac
+  done \
+  | sort \
+  | sed -E 's;^.*\t;;g'
+}
+

 list_cards(){
   filter_cards \
 list_cards(){
   filter_cards \

+  | order_cards \

   | while read cardfile; do
     print_card "$cardfile"
   done
   | while read cardfile; do
     print_card "$cardfile"
   done

diff --git a/pdiread.sh b/pdiread.sh
index 112a827c15c03726e8818cdfc1b1973a90ae74a2..cbbc4e57b232a7473296eedb53eb73aa67c88dd7 100755 (executable)
--- a/pdiread.sh
+++ b/pdiread.sh
@@ -91,6 +91,7 @@ pdi_count(){
 pdi_attrib(){
   local card=":$1" name="$2" cnt="${3:-1}"
   while [ $cnt -gt 0 ]; do
 pdi_attrib(){
   local card=":$1" name="$2" cnt="${3:-1}"
   while [ $cnt -gt 0 ]; do

+    [ "${card#*${BR}${name};}" = "$card" ] && return 1

     card="${card#*${BR}${name};}"
     cnt=$((cnt - 1))
   done
     card="${card#*${BR}${name};}"
     cnt=$((cnt - 1))
   done


@@ -100,6 +101,7 @@ pdi_attrib(){
 pdi_value(){
   local card="${BR}$1" name="$2" cnt="${3:-1}"
   while [ $cnt -gt 0 ]; do
 pdi_value(){
   local card="${BR}$1" name="$2" cnt="${3:-1}"
   while [ $cnt -gt 0 ]; do

+    [ "${card#*${BR}${name};*:}" = "$card" ] && return 1

     card="${card#*${BR}${name};*:}"
     cnt=$((cnt - 1))
   done
     card="${card#*${BR}${name};*:}"
     cnt=$((cnt - 1))
   done