X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=widgets.sh;h=45084750583ff4369bab691385337bfea6a4a4aa;hb=2b4ea41c4ea2475028242179e89119873011af28;hp=f64930661445622732d23b372caaa082a8ce7ea1;hpb=2db187f7531b31110316c05426db47c773f503a2;p=serve0 diff --git a/widgets.sh b/widgets.sh index f649306..4508475 100644 --- a/widgets.sh +++ b/widgets.sh @@ -26,7 +26,7 @@ w_ascii=' w_tags="$_DATA/.index/tags.cache"; w_tagcategories="$_DATA/.index/tagcategories.cache" if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \ - || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$w_tags" -quit)" ] + || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$w_tags")" ] then w_tags="$( { local cn=1 find "$_DATA/" -path '*/.index/meta' -print0 \ @@ -196,8 +196,11 @@ w_advsearch(){ printf '%s\n' "$w_tags" \ | { [ "$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 + | { for n in 1 2 3 4 5 6 7 8 9 0; do + read -r line && printf '%s\n' "$line" || break; + done; # path 10 lines through without modification + sort; # and sort remaining lines + } | while read -r tag; do [ "$tag" ] || continue t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}" @@ -229,8 +232,11 @@ w_tagging(){ printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category" printf %s "$w_tags" \ | { [ "$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 + | { for n in 1 2 3 4 5 6 7 8 9 0; do + read -r line && printf '%s\n' "$line" || break + done; + sort; + } | while read -r tag; do [ "$tag" ] || continue printf '[option value="%s"\n%s]' "$tag" "${tag#*:}" done