X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=cards%2Flist.sh;h=ce8c1ab50929901269d365c374b7c7799a317f31;hb=26149592a7023d89ac39cd88285d49f7fd28f71c;hp=80abde80df442143c1278ba12acd07a7ab19bc1f;hpb=15b5d8e1b341b11588f23c66e7ebb27c13f6eaeb;p=lobster

diff --git a/cards/list.sh b/cards/list.sh
index 80abde8..ce8c1ab 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -97,16 +97,17 @@ filter_cards(){
 
   while [ "$filter" ]; do
     f="${filter%%^*}" filter="${filter#*^}"
+    debug "Filter: $f"
     case $f in
       '') break
         ;;
       ANY:*) fex="/\n.*(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
         ;;
-      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:[^\n]*(${f#*:}).*\r?\n/{${fex}}"
         ;;
-      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:[^\n]*(${f#*:}).*\r?\n/{${fex}}"
         ;;
-      *) fex="/\n${f%%:*}(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      *) fex="/\n${f%%:*}(\;[^:]*)?:[^\n]*(${f#*:}).*\r?\n/{${fex}}"
         ;;
     esac
   done