diff options
author | Yorhel <git@yorhel.nl> | 2020-04-06 18:22:47 +0200 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2020-04-06 18:22:47 +0200 |
commit | 7cfc606c4ae05814fb4dde6fce90dcb09cb93679 (patch) | |
tree | 5be04b0c10e7f2e676bd6d8cb57d7eb51f590fd2 /lib/VNDB/DB | |
parent | 91c5ca72e9c90c5a60f71e53a68c980094a59da8 (diff) |
Delete old relation graph generating and caching machinery
Diffstat (limited to 'lib/VNDB/DB')
-rw-r--r-- | lib/VNDB/DB/Producers.pm | 12 | ||||
-rw-r--r-- | lib/VNDB/DB/VN.pm | 8 |
2 files changed, 7 insertions, 13 deletions
diff --git a/lib/VNDB/DB/Producers.pm b/lib/VNDB/DB/Producers.pm index 0caf0ece..9497a8eb 100644 --- a/lib/VNDB/DB/Producers.pm +++ b/lib/VNDB/DB/Producers.pm @@ -9,7 +9,7 @@ our @EXPORT = qw|dbProducerGet dbProducerGetRev dbProducerRevisionInsert|; # options: results, page, id, search, char, sort, inc_hidden -# what: extended relations relgraph +# what: extended relations sub dbProducerGet { my $self = shift; my %o = ( @@ -34,11 +34,8 @@ sub dbProducerGet { '(ASCII(p.name) < 97 OR ASCII(p.name) > 122) AND (ASCII(p.name) < 65 OR ASCII(p.name) > 90)' => 1 ) : (), ); - my $join = $o{what} =~ /relgraph/ ? 'JOIN relgraphs pg ON pg.id = p.rgraph' : ''; - - my $select = 'p.id, p.type, p.name, p.original, p.lang, p.rgraph'; + my $select = 'p.id, p.type, p.name, p.original, p.lang'; $select .= ', p.desc, p.alias, p.website, p.l_wp, p.l_wikidata, p.hidden, p.locked' if $o{what} =~ /extended/; - $select .= ', pg.svg' if $o{what} =~ /relgraph/; my($order, @order) = ('p.name'); if($o{sort} && $o{sort} eq 'search') { @@ -49,10 +46,9 @@ sub dbProducerGet { my($r, $np) = $self->dbPage(\%o, qq| SELECT !s FROM producers p - !s !W ORDER BY $order|, - $select, $join, \%where, @order + $select, \%where, @order ); return _enrich($self, $r, $np, 0, $o{what}); @@ -67,7 +63,7 @@ sub dbProducerGetRev { $o{rev} ||= $self->dbRow('SELECT MAX(rev) AS rev FROM changes WHERE type = \'p\' AND itemid = ?', $o{id})->{rev}; - my $select = 'c.itemid AS id, p.type, p.name, p.original, p.lang, po.rgraph'; + my $select = 'c.itemid AS id, p.type, p.name, p.original, p.lang'; $select .= ', extract(\'epoch\' from c.added) as added, c.comments, c.rev, c.ihid, c.ilock, '.VNWeb::DB::sql_user(); $select .= ', c.id AS cid, NOT EXISTS(SELECT 1 FROM changes c2 WHERE c2.type = c.type AND c2.itemid = c.itemid AND c2.rev = c.rev+1) AS lastrev'; $select .= ', p.desc, p.alias, p.website, p.l_wp, p.l_wikidata, po.hidden, po.locked' if $o{what} =~ /extended/; diff --git a/lib/VNDB/DB/VN.pm b/lib/VNDB/DB/VN.pm index 5b0fa932..d0c9caa5 100644 --- a/lib/VNDB/DB/VN.pm +++ b/lib/VNDB/DB/VN.pm @@ -14,7 +14,7 @@ our @EXPORT = qw|dbVNGet dbVNGetRev dbVNRevisionInsert dbScreenshotGet dbScreens # Options: id, char, search, gtin, length, lang, olang, plat, tag_inc, tag_exc, tagspoil, # hasani, hasshot, ul_notblack, ul_onwish, results, page, what, sort, # reverse, inc_hidden, date_before, date_after, released, release, character -# What: extended anime staff seiyuu relations screenshots relgraph rating ranking vnlist +# What: extended anime staff seiyuu relations screenshots rating ranking vnlist # Note: vnlist is ignored (no db search) unless a user is logged in # Sort: id rel pop rating title tagscore rand sub dbVNGet { @@ -96,7 +96,6 @@ sub dbVNGet { } my @join = ( - $o{what} =~ /relgraph/ ? 'JOIN relgraphs vg ON vg.id = v.rgraph' : (), $uid && $o{what} =~ /vnlist/ ? ("LEFT JOIN ( SELECT irv.vid, COUNT(*) AS userlist_all, SUM(CASE WHEN irl.status = 2 THEN 1 ELSE 0 END) AS userlist_obtained @@ -109,10 +108,9 @@ sub dbVNGet { my $tag_ids = $o{tag_inc} && join ',', ref $o{tag_inc} ? @{$o{tag_inc}} : $o{tag_inc}; my @select = ( # see https://rt.cpan.org/Ticket/Display.html?id=54224 for the cast on c_languages and c_platforms - qw|v.id v.locked v.hidden v.c_released v.c_languages::text[] v.c_olang::text[] v.c_platforms::text[] v.title v.original v.rgraph|, + qw|v.id v.locked v.hidden v.c_released v.c_languages::text[] v.c_olang::text[] v.c_platforms::text[] v.title v.original|, $o{what} =~ /extended/ ? ( qw|v.alias v.img_nsfw v.length v.desc v.l_wp v.l_encubed v.l_renai v.l_wikidata|, 'coalesce(vndbid_num(v.image),0) as image' ) : (), - $o{what} =~ /relgraph/ ? 'vg.svg' : (), $o{what} =~ /rating/ ? (qw|v.c_popularity v.c_rating v.c_votecount|) : (), $o{what} =~ /ranking/ ? ( '(SELECT COUNT(*)+1 FROM vn iv WHERE iv.hidden = false AND iv.c_popularity > COALESCE(v.c_popularity, 0.0)) AS p_ranking', @@ -157,7 +155,7 @@ sub dbVNGetRev { # XXX: Too much duplication with code in dbVNGet() here. Can we combine some code here? my $uid = $self->authInfo->{id}; - my $select = 'c.itemid AS id, vo.c_released, vo.c_languages::text[], vo.c_olang::text[], vo.c_platforms::text[], v.title, v.original, vo.rgraph'; + my $select = 'c.itemid AS id, vo.c_released, vo.c_languages::text[], vo.c_olang::text[], vo.c_platforms::text[], v.title, v.original'; $select .= ', extract(\'epoch\' from c.added) as added, c.comments, c.rev, c.ihid, c.ilock, '.VNWeb::DB::sql_user(); $select .= ', c.id AS cid, NOT EXISTS(SELECT 1 FROM changes c2 WHERE c2.type = c.type AND c2.itemid = c.itemid AND c2.rev = c.rev+1) AS lastrev'; $select .= ', v.alias, coalesce(vndbid_num(v.image), 0) as image, v.img_nsfw, v.length, v.desc, v.l_wp, v.l_encubed, v.l_renai, v.l_wikidata, vo.hidden, vo.locked' if $o{what} =~ /extended/; |