summaryrefslogtreecommitdiff
path: root/lib/VNDB/DB/Chars.pm
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2014-12-22 12:06:55 +0100
committerYorhel <git@yorhel.nl>2014-12-22 12:06:55 +0100
commitb646361f63e066c6859a1f05e29af7d9c812a13a (patch)
tree89e848a66ad36c710a0ec5d0f3f9a9330d7c0368 /lib/VNDB/DB/Chars.pm
parent12338003bde24a3a263abe8caca71b1836ecee83 (diff)
DB: Merge name/title fetching in main fetching functions
And call bbSubstLinks() from Handler::Discussions rather than DB::Discussions - it's not a transformation that the DB layer should do, IMO.
Diffstat (limited to 'lib/VNDB/DB/Chars.pm')
-rw-r--r--lib/VNDB/DB/Chars.pm16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/VNDB/DB/Chars.pm b/lib/VNDB/DB/Chars.pm
index f387b044..0f4120fd 100644
--- a/lib/VNDB/DB/Chars.pm
+++ b/lib/VNDB/DB/Chars.pm
@@ -5,7 +5,7 @@ use strict;
use warnings;
use Exporter 'import';
-our @EXPORT = qw|dbCharGet dbCharRevisionInsert dbCharImageId dbCharNames|;
+our @EXPORT = qw|dbCharGet dbCharRevisionInsert dbCharImageId|;
# options: id rev instance tagspoil trait_inc trait_exc char what results page gender bloodt
@@ -25,7 +25,8 @@ sub dbCharGet {
my %where = (
!$o{id} && !$o{rev} ? ( 'c.hidden = FALSE' => 1 ) : (),
- $o{id} ? ( 'c.id = ?' => $o{id} ) : (),
+ $o{id} ? (
+ 'c.id IN(!l)' => [ ref $o{id} ? $o{id} : [$o{id}] ] ) : (),
$o{rev} ? ( 'h.rev = ?' => $o{rev} ) : (),
$o{notid} ? ( 'c.id <> ?' => $o{notid} ) : (),
$o{instance} ? ( 'cr.main = ?' => $o{instance} ) : (),
@@ -138,16 +139,5 @@ sub dbCharImageId {
}
-sub dbCharNames {
- my ($self, @ids) = @_;
- return $self->dbAll(q|
- SELECT c.id, cr.name
- FROM chars c
- JOIN chars_rev cr ON cr.id = c.latest
- WHERE c.id IN (!l)|, \@ids
- );
-}
-
-
1;