X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=advsearch.sh;h=3a2f33389fc54180bfc6f48dadee482d2a15c458;hp=38cb17023f453160043e99e52eed6bc2ff7610c5;hb=608e267413cf7f8399cacbbfc4269d3c3820a3aa;hpb=0a576d1d2ce23eb3043adcd7adb7b45c89ba6051 diff --git a/advsearch.sh b/advsearch.sh index 38cb170..3a2f333 100644 --- a/advsearch.sh +++ b/advsearch.sh @@ -1,7 +1,7 @@ #!/bin/sh f='' -order="$(POST order |grep -m1 -xE 'Name|Date|Length' || printf Name)" +order="$(POST order |grep -m1 -xE 'Name|Date|Length|Group' || printf Name)" for n in 1 2 3 4 5 6 7 8 9; do [ "$(POST pol_$n)" = neg ] \ @@ -9,7 +9,7 @@ for n in 1 2 3 4 5 6 7 8 9; do cat="$(POST cat_$n)" for m in $(seq 1 $(POST_COUNT tag_$n)); do tag="$(POST tag_$n $m)" - [ ! "${tag##${cat}:*}" ] || [ "$cat" = '*' -a "${tag##*:*}" ] \ + [ ! "${tag##${cat}:*}" ] || [ ! "${tag##-${cat}:*}" ] || [ "$cat" = '*' -a "${tag##*:*}" ] \ && f="${f}${tag}|" done f="${f%[|^]}^"