diff options
Diffstat (limited to 'lib/VNDB/Handler')
-rw-r--r-- | lib/VNDB/Handler/Discussions.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Handler/Misc.pm | 10 | ||||
-rw-r--r-- | lib/VNDB/Handler/Releases.pm | 2 | ||||
-rw-r--r-- | lib/VNDB/Handler/Tags.pm | 26 | ||||
-rw-r--r-- | lib/VNDB/Handler/ULists.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Handler/Users.pm | 2 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNBrowse.pm | 10 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNPage.pm | 4 |
8 files changed, 23 insertions, 39 deletions
diff --git a/lib/VNDB/Handler/Discussions.pm b/lib/VNDB/Handler/Discussions.pm index 12b55029..fc477de2 100644 --- a/lib/VNDB/Handler/Discussions.pm +++ b/lib/VNDB/Handler/Discussions.pm @@ -295,7 +295,7 @@ sub board { results => 50, page => $f->{p}, what => 'firstpost lastpost boardtitles', - order => $type eq 'an' ? 't.id DESC' : 'tpl.date DESC', + sort => $type eq 'an' ? 'id' : 'lastpost', reverse => 1, ); $self->htmlHeader(title => $title, noindex => !@$list || $type eq 'u'); @@ -349,7 +349,7 @@ sub index { results => 5, page => 1, what => 'firstpost lastpost boardtitles', - order => 'tpl.date DESC', + sort => 'lastpost', reverse => 1, ); h1 class => 'boxtitle'; a href => "/t/$_", mt "_dboard_$_"; diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm index dbb348be..e762df8f 100644 --- a/lib/VNDB/Handler/Misc.pm +++ b/lib/VNDB/Handler/Misc.pm @@ -78,7 +78,7 @@ sub homepage { # Announcements td; - my $an = $self->dbThreadGet(type => 'an', order => 't.id DESC', results => 2); + my $an = $self->dbThreadGet(type => 'an', sort => 'id', reverse => 1, results => 2); h1; a href => '/t/an', mt '_home_announcements'; end; @@ -98,7 +98,7 @@ sub homepage { h1; a href => '/t', mt '_home_recentposts'; end; - my $posts = $self->dbThreadGet(what => 'lastpost boardtitles', results => 10, order => 'tpl.date DESC', notusers => 1); + my $posts = $self->dbThreadGet(what => 'lastpost boardtitles', results => 10, sort => 'lastpost', reverse => 1, notusers => 1); ul; for (@$posts) { my $boards = join ', ', map mt("_dboard_$_->{type}").($_->{iid}?' > '.$_->{title}:''), @{$_->{boards}}; @@ -120,7 +120,7 @@ sub homepage { h1; a href => '/v/rand', mt '_home_randomvn'; end; - my $random = $self->dbVNGet(results => 10, order => 'RANDOM()'); + my $random = $self->dbVNGet(results => 10, sort => 'rand'); ul; for (@$random) { li; @@ -154,7 +154,7 @@ sub homepage { h1; a href => strftime('/r?ma=%Y%m%d;o=d;s=released', gmtime), mt '_home_justreleased'; end; - my $justrel = $self->dbReleaseGet(results => 10, order => 'rr.released DESC', unreleased => 0, what => 'platforms'); + my $justrel = $self->dbReleaseGet(results => 10, sort => 'released', reverse => 1, unreleased => 0, what => 'platforms'); ul; for (@$justrel) { li; @@ -300,7 +300,7 @@ sub docpage { $ii; }eg; s{^:TOP5CONTRIB:$}{ - my $l = $self->dbUserGet(results => 6, order => 'c_changes DESC'); + my $l = $self->dbUserGet(results => 6, sort => 'changes', reverse => 1); '<dl>'.join('', map $_->{id} == 1 ? () : sprintf('<dt><a href="/u%d">%s</a></dt><dd>%d</dd>', $_->{id}, $_->{username}, $_->{c_changes}), @$l).'</dl>'; diff --git a/lib/VNDB/Handler/Releases.pm b/lib/VNDB/Handler/Releases.pm index daeffb9e..b699e596 100644 --- a/lib/VNDB/Handler/Releases.pm +++ b/lib/VNDB/Handler/Releases.pm @@ -517,7 +517,7 @@ sub browse { $f->{do} ? (doujin => $f->{do}) : (), ); my($list, $np) = !@filters ? ([], 0) : $self->dbReleaseGet( - order => $f->{s}.($f->{o}eq'd'?' DESC':' ASC'), + sort => $f->{s}, reverse => $f->{o} eq 'd', page => $f->{p}, results => 50, what => 'platforms', diff --git a/lib/VNDB/Handler/Tags.pm b/lib/VNDB/Handler/Tags.pm index 5412be02..2a55fd8f 100644 --- a/lib/VNDB/Handler/Tags.pm +++ b/lib/VNDB/Handler/Tags.pm @@ -38,19 +38,11 @@ sub tagpage { my $tagspoil = $self->reqCookie('tagspoil'); $f->{m} = $tagspoil =~ /^[0-2]$/ ? $tagspoil : 0 if $f->{m} == -1; - my $sortcol = {qw| - rel c_released - pop c_popularity - rating c_rating - title title - tagscore tagscore - |}->{$f->{s}}; - my($list, $np) = $t->{meta} || $t->{state} != 2 ? ([],0) : $self->dbVNGet( what => 'rating', results => 50, page => $f->{p}, - order => $sortcol.($f->{o} eq 'a' ? ' ASC' : ' DESC'), + sort => $f->{s}, reverse => $f->{o} eq 'd', tags_include => [ $f->{m}, [$tag ]], ); @@ -309,7 +301,7 @@ sub taglist { return 404 if $f->{_err}; my($t, $np) = $self->dbTagGet( - order => $f->{s}.($f->{o}eq'd'?' DESC':' ASC'), + sort => $f->{s}, reverse => $f->{o} eq 'd', page => $f->{p}, results => 50, state => $f->{t}, @@ -457,7 +449,7 @@ sub usertags { return 404 if !$u; my $f = $self->formValidate( - { name => 's', required => 0, default => 'cnt', enum => [ qw|cnt name| ] }, + { name => 's', required => 0, default => 'count', enum => [ qw|count name| ] }, { name => 'o', required => 0, default => 'd', enum => [ 'a','d' ] }, { name => 'p', required => 0, default => 1, template => 'int' }, ); @@ -467,7 +459,7 @@ sub usertags { my($list, $np) = $self->dbTagStats( uid => $uid, page => $f->{p}, - order => ($f->{s}eq'cnt'?'COUNT(*)':'name').($f->{o}eq'a'?' ASC':' DESC'), + sort => $f->{s}, reverse => $f->{o} eq 'd', what => 'vns', ); @@ -497,8 +489,8 @@ sub usertags { b id => 'expandall'; lit '<i>▸</i> '.mt('_tagu_col_num').' '; end; - lit $f->{s} eq 'cnt' && $f->{o} eq 'a' ? "\x{25B4}" : qq|<a href="/u$u->{id}/tags?o=a;s=cnt">\x{25B4}</a>|; - lit $f->{s} eq 'cnt' && $f->{o} eq 'd' ? "\x{25BE}" : qq|<a href="/u$u->{id}/tags?o=d;s=cnt">\x{25BE}</a>|; + lit $f->{s} eq 'count' && $f->{o} eq 'a' ? "\x{25B4}" : qq|<a href="/u$u->{id}/tags?o=a;s=count">\x{25B4}</a>|; + lit $f->{s} eq 'count' && $f->{o} eq 'd' ? "\x{25BE}" : qq|<a href="/u$u->{id}/tags?o=d;s=count">\x{25BE}</a>|; end; }, [ mt('_tagu_col_name'), 'name' ], @@ -553,7 +545,7 @@ sub tagindex { # Recently added td; a class => 'right', href => '/g/list', mt '_tagidx_browseall'; - my $r = $self->dbTagGet(order => 'added DESC', results => 10, state => 2); + my $r = $self->dbTagGet(sort => 'added', reverse => 1, results => 10, state => 2); h1 mt '_tagidx_recent'; ul; for (@$r) { @@ -568,7 +560,7 @@ sub tagindex { # Popular td; - $r = $self->dbTagGet(order => 'c_vns DESC', meta => 0, results => 10); + $r = $self->dbTagGet(sort => 'vns', reverse => 1, meta => 0, results => 10); h1 mt '_tagidx_popular'; ul; for (@$r) { @@ -583,7 +575,7 @@ sub tagindex { # Moderation queue td; h1 mt '_tagidx_queue'; - $r = $self->dbTagGet(state => 0, order => 'added DESC', results => 10); + $r = $self->dbTagGet(state => 0, sort => 'added', reverse => 1, results => 10); ul; li mt '_tagidx_queue_empty' if !@$r; for (@$r) { diff --git a/lib/VNDB/Handler/ULists.pm b/lib/VNDB/Handler/ULists.pm index 6a0d6c9e..9d6885ad 100644 --- a/lib/VNDB/Handler/ULists.pm +++ b/lib/VNDB/Handler/ULists.pm @@ -122,7 +122,7 @@ sub wishlist { my($list, $np) = $self->dbWishListGet( uid => $uid, - order => $f->{s}.' '.($f->{o} eq 'a' ? ($f->{s} eq 'wstat' ? 'DESC' : 'ASC' ) : ($f->{s} eq 'wstat' ? 'ASC' : 'DESC')).($f->{s} eq 'wstat' ? ', title ASC' : ''), + sort => $f->{s}, reverse => $f->{o} eq 'd', $f->{f} != -1 ? (wstat => $f->{f}) : (), what => 'vn', results => 50, @@ -229,7 +229,7 @@ sub vnlist { uid => $uid, results => 50, page => $f->{p}, - order => $f->{s}.' '.($f->{o} eq 'd' ? 'DESC' : 'ASC').($f->{s} eq 'vote' ? ', title ASC' : ''), + sort => $f->{s}, reverse => $f->{o} eq 'd', voted => $f->{v}, $f->{c} ne 'all' ? (char => $f->{c}) : (), ); diff --git a/lib/VNDB/Handler/Users.pm b/lib/VNDB/Handler/Users.pm index fbbbfc5d..e9c97198 100644 --- a/lib/VNDB/Handler/Users.pm +++ b/lib/VNDB/Handler/Users.pm @@ -474,7 +474,7 @@ sub list { end; my($list, $np) = $self->dbUserGet( - order => ($f->{s} eq 'changes' || $f->{s} eq 'tags' ? 'c_' : $f->{s} eq 'votes' ? 'NOT show_list, c_' : '').$f->{s}.($f->{o} eq 'a' ? ' ASC' : ' DESC'), + sort => $f->{s}, reverse => $f->{o} eq 'd', $char ne 'all' ? ( firstchar => $char ) : (), results => 50, diff --git a/lib/VNDB/Handler/VNBrowse.pm b/lib/VNDB/Handler/VNBrowse.pm index c7944a46..43e8b3cb 100644 --- a/lib/VNDB/Handler/VNBrowse.pm +++ b/lib/VNDB/Handler/VNBrowse.pm @@ -55,21 +55,13 @@ sub list { $f->{s} = 'title' if !@ti && $f->{s} eq 'tagscore'; $f->{o} = $f->{s} eq 'tagscore' ? 'd' : 'a' if !$f->{o}; - my $sortcol = {qw| - rel c_released - pop c_popularity - rating c_rating - title title - tagscore tagscore - |}->{$f->{s}}; - my($list, $np) = $self->dbVNGet( what => 'rating', $char ne 'all' ? ( char => $char ) : (), $f->{q} ? ( search => $f->{q} ) : (), results => 50, page => $f->{p}, - order => $sortcol.($f->{o} eq 'a' ? ' ASC' : ' DESC'), + sort => $f->{s}, reverse => $f->{o} eq 'd', $f->{pl}[0] ? ( platform => $f->{pl} ) : (), $f->{ln}[0] ? ( lang => $f->{ln} ) : (), @ti ? (tags_include => [ $f->{sp}, \@ti ]) : (), diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm index 2a333337..cc469848 100644 --- a/lib/VNDB/Handler/VNPage.pm +++ b/lib/VNDB/Handler/VNPage.pm @@ -16,7 +16,7 @@ YAWF::register( sub rand { my $self = shift; - $self->resRedirect('/v'.$self->dbVNGet(results => 1, order => 'RANDOM()')->[0]{id}, 'temp'); + $self->resRedirect('/v'.$self->dbVNGet(results => 1, sort => 'rand')->[0]{id}, 'temp'); } @@ -146,7 +146,7 @@ sub page { clearfloat; # tags - my $t = $self->dbTagStats(vid => $v->{id}, order => 'avg(tv.vote) DESC', minrating => 0, results => 999); + my $t = $self->dbTagStats(vid => $v->{id}, sort => 'rating', reverse => 1, minrating => 0, results => 999); if(@$t) { div id => 'tagops'; # NOTE: order of these links is hardcoded in JS |