X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Fcommon.sh;h=e03e6f5da8e5e9c7e2f413594713f7f82c448f2c;hb=bd06005650121b28e904060a5ab4da7c0b99529a;hp=cf054910b384245ec03eed2d6914f2bc13f63030;hpb=06af2f639193f9e2de0bae67125b66665c327e8f;p=serve0 diff --git a/pages/common.sh b/pages/common.sh index cf05491..e03e6f5 100755 --- a/pages/common.sh +++ b/pages/common.sh @@ -112,13 +112,16 @@ thumblist() { genlist \ | if [ -n "$search" ] ; then + debug "Applying search: ${search}" xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \ | xargs -d '\n' egrep -sil "$search" \ | sed -r 's;^.*/;;;s;\.meta$;;' - elif [ "$filterex" != "q0" ]; then + elif [ -n "$filter" ]; then + debug "Applying filters: ${filter} ++ ${filterex}" xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \ | xargs -d '\n' sed -srn ":a;N;2!ba;{${filterex}}" else + debug "No search or filtering" cat fi \ | sed -n "$page,$(($page + $pagesize - 1))p" \