bugfix: dont drop last tag in listing

diff --git a/widgets.sh b/widgets.sh
index 0474fa5ea7f07ce669995f6caaf3ed4288438c0f..f64930661445622732d23b372caaa082a8ce7ea1 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -21,7 +21,7 @@ w_ascii='
   s-s-s-g; s-t-t-g; s-u-u-g; s-v-v-g; s-w-w-g; s-x-x-g;
   s-y-y-g; s-z-z-g;
   s---\--g; s-/-/-g; s-/-/-g; s-:-:-g; s-=-=-g; s-@-@-g;
   s-s-s-g; s-t-t-g; s-u-u-g; s-v-v-g; s-w-w-g; s-x-x-g;
   s-y-y-g; s-z-z-g;
   s---\--g; s-/-/-g; s-/-/-g; s-:-:-g; s-=-=-g; s-@-@-g;

-  s-_-_-g; s-~-~-g;              s-- -g; s-^-^-g; s-|-|-g;
+  s-_-_-g; s-~-~-g;              s- - -g; s-^-^-g; s-|-|-g;

 '
 
 w_tags="$_DATA/.index/tags.cache"; w_tagcategories="$_DATA/.index/tagcategories.cache"
 '
 
 w_tags="$_DATA/.index/tags.cache"; w_tagcategories="$_DATA/.index/tagcategories.cache"


@@ -33,8 +33,8 @@ if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \
     | xargs -r0 sed -r '
       s;^.*\t.*\t.*\ttags=(.*)\tcomment=.*\t.*\r$;\1;;
       s;,;\n;g;'"$UNSTRING" \
     | xargs -r0 sed -r '
       s;^.*\t.*\t.*\ttags=(.*)\tcomment=.*\t.*\r$;\1;;
       s;,;\n;g;'"$UNSTRING" \

-    | sort \
-    | while read tag; do
+    | { sort; printf '\n'; } \
+    | while read -r tag; do

       [ "$tag" = "$otag" ] \
       && cn=$((cn + 1)) \
       || {
       [ "$tag" = "$otag" ] \
       && cn=$((cn + 1)) \
       || {


@@ -43,8 +43,7 @@ if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \
       }
       otag="$tag"
     done
       }
       otag="$tag"
     done

-    printf "%i %s\n" "$cn" "$otag"
-  } |sort -rn |cut -f2- |HTML |sed "$w_ascii s-
-\n-g;" |tee "$w_tags" )"
+  } |sort -rn |cut -f2- |HTML |sed "$w_ascii s-
-\n-g; s;\n\n;\n;g;" |tee "$w_tags" )"

   w_tagcategories="$(printf %s "$w_tags" \
                      | cut -sd: -f1 |sort -u \
                      | tee "$w_tagcategories" )"
   w_tagcategories="$(printf %s "$w_tags" \
                      | cut -sd: -f1 |sort -u \
                      | tee "$w_tagcategories" )"


@@ -196,9 +195,10 @@ w_advsearch(){
               $n "$category" "$t" "$lbid" "$lbid" "$category" $n
 
       printf '%s\n' "$w_tags" \
               $n "$category" "$t" "$lbid" "$lbid" "$category" $n
 
       printf '%s\n' "$w_tags" \

-      | { [ "$category" = '*' ] && grep -avF ':' |grep -avxF '' || grep -awF "${category}"; } \
-      | { for n in 1 2 3 4 5 6 7 8 9 0; do line; done; sort; } \
+      | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \
+      | { for n in 1 2 3 4 5 6 7 8 9 0; do line || break; done; sort; } \

       | while read -r tag; do
       | while read -r tag; do

+        [ "$tag" ] || continue

         t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
         printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}"
       done
         t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
         printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}"
       done


@@ -228,9 +228,10 @@ w_tagging(){
   | while read -r category; do
     printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category"
     printf %s "$w_tags" \
   | while read -r category; do
     printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category"
     printf %s "$w_tags" \

-    | { [ "$category" = 'Tags' ] && grep -avF ':' | grep -avxF '' || grep -awF "${category}"; } \
-    | { for n in 1 2 3 4 5 6 7 8 9 0; do line; done; sort; } \
+    | { [ "$category" = 'Tags' ] && grep -avF ':' || grep -awF "${category}"; } \
+    | { for n in 1 2 3 4 5 6 7 8 9 0; do line || break; done; sort; } \

     | while read -r tag; do
     | while read -r tag; do

+      [ "$tag" ] || continue

       printf '[option value="%s"\n%s]' "$tag" "${tag#*:}"
     done
     printf ']]'
       printf '[option value="%s"\n%s]' "$tag" "${tag#*:}"
     done
     printf ']]'