X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=widgets.sh;h=f825c12c8213678ab4bb74caab25a61cba128bea;hb=65f7fdd29c51ce924260a9aae21f29fa15154dcb;hp=5cd371b7e8ae47040db55a617c04fdefc3ca2f9a;hpb=1cd8b8f7e99e3d18987ed17d084091e28773779f;p=serve0 diff --git a/widgets.sh b/widgets.sh index 5cd371b..f825c12 100644 --- a/widgets.sh +++ b/widgets.sh @@ -14,11 +14,12 @@ 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 ' + | xargs -0 -r sed -E ' s;^.*\t.*\t.*\ttags=(.*)\tcomment=.*\t.*\r$;\1;; - s;,;\n;g;'"$UNSTRING" \ + s;,;\n;g;' \ + | UNSTRING \ | { sort; printf '\n'; } \ | while read -r tag; do [ "$tag" = "$otag" ] \ @@ -218,7 +219,7 @@ w_advsearch(){ 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" "$d" + [ "$category" = \$ ] && printf '[input name="tag_%i" value="%s"]' "$n" "$(HTML "$d")" printf '\n]' done printf ']'