bugfix: strip old page number in pagination link

[serve0] / list.sh

diff --git a/list.sh b/list.sh
index 65d929a3204bd15967215b0729a9b2e8c6582a52..86b60fd55f3a0260fcf5c246db312d091f6f2fec 100755 (executable)
--- a/list.sh
+++ b/list.sh
@@ -87,24 +87,14 @@ list_filter(){
 }
 
 list_order(){
-  local fm fn fn al length ln h w t c name buffer l
+  local fm fn fn al length ln h w t c name group o buffer l
 
   if [ $ORDER = Name ]; then
     sort -k6
   elif [ $ORDER = Group ]; then
-    sed -E '
-      /^[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\r]*\r$/bX;
-      /^[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\r]*\r\t\\$/bX;
-      s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t)([^\r]*)\r\t(.*)$;\1\r\3 \2\r\t;;
-      t;
-      :X
-      s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^ 0-9]*)-([0-9a-zA-Z_-]{11}\r|ph[0-9a-f]{13}\r|[0-9]{8}\r)(.*)$;\1-\r\3 \2;;
-      t;
-      s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^ 0-9]*)([0-9]+)(.*)$;\1\r\3 \2;;
-      tX;' \
-    | { sort -n -k7 -k8 -k9 -k10 -k11 |sort -s -k6,6 ; echo '0 0 0 tags= comment= _'; } \
-    | while read -r length w h t c name; do
-      if [ "${ln%% *}" = "${name%% *}" ]; then
+    { sort -n -k8 -k6,6 |sort -s -k7,7 ; echo '0 0 0 tags= comment= _'; } \
+    | while read -r length w h t c name group o; do
+      if [ "${ln%% *}" = "${group}" ]; then
         al=$((al + length))
         buffer="${buffer}${BR}$length  $w      $h      $t      $c      $name"
       else
@@ -114,13 +104,9 @@ list_order(){
         al="$length"
         buffer="$length        $w      $h      $t      $c      $name"
       fi
-      ln="$name"
+      ln="$group"
     done \
-    | sort -s -n -k1,1 |sed -E 's;^[0-9]+\t;;;' \
-    | sed -E '
-      s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t)\r([0-9A-Za-z:=]{16}) ([^ ]+)$;\1\3\r\t\2;; t;
-      :X s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\r]*)\r([^ ]*) ([^ ]+)( .*)?$;\1\3\2\4;; tX
-    '
+    | sort -s -n -k1,1 |sed -E 's;^[0-9]+\t;;;'
   elif [ $ORDER = Length ]; then
     sort -sn -k1
   elif [ $ORDER = Date ]; then
@@ -176,7 +162,6 @@ list_paginate() {
   local page i c n end qry
   page="$(GET p |grep -axE '[0-9]+' || printf 1)"; c=1
   end=$((page + LISTSIZE))
-  qry="${w_refuri#*\?}"; qry="${qry#p=*&}"
 
   printf '[div .itemlist '
   while read -r i; do
@@ -193,8 +178,8 @@ list_paginate() {
   for n in $( seq 1 $end ); do
     c=$(( (n - 1) * LISTSIZE + 1 ))
     [ $c = $page ] \
-    && printf '[a .page .current href="%s" %s]' "?p=${c}&${qry}" "$n" \
-    || printf '[a .page href="%s" %s]' "?p=${c}&${qry}" "$n"
+    && printf '[a .page .current href="?p=%i&%s" %i]' "${c}" "${QUERY_STRING#p=*&}" "$n" \
+    || printf '[a .page          href="?p=%i&%s" %i]' "${c}" "${QUERY_STRING#p=*&}" "$n"
   done
   printf ']'
 }