X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=widgets.sh;h=35b8b70ed349a9414e020e1789df3dc4176aa301;hb=dc6472d32f28fbfa9fbf4a9991c3227f1ebf6dc8;hp=cd9dda30ca344037e5db60751e9c8a990eec9bfe;hpb=f8c309d40c54fd0c8ad9cb6d9629d778113cb32a;p=serve0 diff --git a/widgets.sh b/widgets.sh index cd9dda3..35b8b70 100644 --- a/widgets.sh +++ b/widgets.sh @@ -14,7 +14,7 @@ c_tags="$_DATA/.index/tags.cache"; c_tagcategories="$_DATA/.index/tagcategories. if [ ! -s "$c_tags" -o ! -s "$c_tagcategories" ] \ || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$c_tags")" ] then - w_tags="$( local cn=1 + w_tags="$( cn=1 find "$_DATA/" -path '*/.index/meta' -print0 \ | xargs -r0 sed -r ' s;^.*\t.*\t.*\ttags=(.*)\tcomment=.*\t.*\r$;\1;; @@ -188,7 +188,7 @@ w_advsearch(){ $n "${t:+checked}" $n $n f="|${f#\~}|" - printf '*\n%s\n' "$w_tagcategories" \ + printf '*\n%s\n$\n' "$w_tagcategories" \ | while read -r category; do lbid="cat_${n}_${category}" @@ -217,6 +217,8 @@ w_advsearch(){ # printf '[option %s value="%s"\n%s]' "$t" "$tag" "$d" printf '[label [checkbox "tag_%s" "%s" %s] %s]' "$n" "$tag" "$t" "$d" done + d="${f##*\$:}" d="${d%%\|*}" + [ "$category" = \$ ] && printf '[input name="tag_%i" value="%s"]' "$n" "$(HTML "$d")" printf '\n]' done printf ']'