diff options
author | Yorhel <git@yorhel.nl> | 2009-08-08 14:59:33 +0200 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2009-08-08 14:59:33 +0200 |
commit | e58e857ec3b3d15e220b665e818f9f29b9ecc48a (patch) | |
tree | 4516f44936ab0b21cd52117b875f5fefdadfc5d3 /lib/VNDB | |
parent | 3c0db27f773f99b325dcc7c6a7c7d1c5bbfb69a9 (diff) |
Removed last traces of the category system
Diffstat (limited to 'lib/VNDB')
-rw-r--r-- | lib/VNDB/DB/VN.pm | 23 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNEdit.pm | 7 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNPage.pm | 48 |
3 files changed, 8 insertions, 70 deletions
diff --git a/lib/VNDB/DB/VN.pm b/lib/VNDB/DB/VN.pm index 254e24e1..23961987 100644 --- a/lib/VNDB/DB/VN.pm +++ b/lib/VNDB/DB/VN.pm @@ -10,7 +10,7 @@ our @EXPORT = qw|dbVNGet dbVNAdd dbVNEdit dbVNImageId dbVNCache dbScreenshotAdd # Options: id, rev, char, search, lang, platform, tags_include, tags_exclude, results, page, order, what -# What: extended categories anime relations screenshots relgraph ranking changes +# What: extended anime relations screenshots relgraph ranking changes sub dbVNGet { my($self, %o) = @_; $o{results} ||= 10; @@ -101,24 +101,14 @@ sub dbVNGet { join(', ', @select), join(' ', @join), \%where, $o{order}, ); - if(@$r && $o{what} =~ /(categories|anime|relations|screenshots)/) { + if(@$r && $o{what} =~ /(anime|relations|screenshots)/) { my %r = map { - $r->[$_]{categories} = []; $r->[$_]{anime} = []; $r->[$_]{relations} = []; $r->[$_]{screenshots} = []; ($r->[$_]{cid}, $_) } 0..$#$r; - if($o{what} =~ /categories/) { - push(@{$r->[$r{$_->{vid}}]{categories}}, [ $_->{cat}, $_->{lvl} ]) for (@{$self->dbAll(q| - SELECT vid, cat, lvl - FROM vn_categories - WHERE vid IN(!l)|, - [ keys %r ] - )}); - } - if($o{what} =~ /anime/) { push(@{$r->[$r{$_->{vid}}]{anime}}, $_) && delete $_->{vid} for (@{$self->dbAll(q| SELECT va.vid, a.* @@ -182,8 +172,7 @@ sub dbVNAdd { # helper function, inserts a producer revision -# Arguments: global revision, item id, { columns in producers_rev + categories + anime + relations + screenshots } -# categories = [ [ catid, level ], .. ] +# Arguments: global revision, item id, { columns in producers_rev + anime + relations + screenshots } # screenshots = [ [ scrid, nsfw, rid ], .. ] # relations = [ [ rel, vid ], .. ] # anime = [ aid, .. ] @@ -197,12 +186,6 @@ sub insert_rev { [ $cid, $vid, @$o{qw|title original desc alias image img_nsfw length l_wp l_encubed l_renai l_vnn|} ]); $self->dbExec(q| - INSERT INTO vn_categories (vid, cat, lvl) - VALUES (?, ?, ?)|, - $cid, $_->[0], $_->[1] - ) for (@{$o->{categories}}); - - $self->dbExec(q| INSERT INTO vn_screenshots (vid, scr, nsfw, rid) VALUES (?, ?, ?, ?)|, $cid, $_->[0], $_->[1]?1:0, $_->[2] diff --git a/lib/VNDB/Handler/VNEdit.pm b/lib/VNDB/Handler/VNEdit.pm index 2b6e4ac5..feca72d6 100644 --- a/lib/VNDB/Handler/VNEdit.pm +++ b/lib/VNDB/Handler/VNEdit.pm @@ -17,7 +17,7 @@ YAWF::register( sub edit { my($self, $vid, $rev) = @_; - my $v = $vid && $self->dbVNGet(id => $vid, what => 'extended screenshots relations anime categories changes', $rev ? (rev => $rev) : ())->[0]; + my $v = $vid && $self->dbVNGet(id => $vid, what => 'extended screenshots relations anime changes', $rev ? (rev => $rev) : ())->[0]; return 404 if $vid && !$v->{id}; $rev = undef if !$vid || $v->{cid} == $v->{latest}; @@ -72,7 +72,6 @@ sub edit { my %args = ( (map { $_ => $frm->{$_} } qw|title original alias desc length l_wp l_encubed l_renai l_vnn editsum img_nsfw|), anime => [ keys %$anime ], - categories => $v->{categories}, relations => $relations, image => $image, screenshots => $screenshots, @@ -281,7 +280,7 @@ sub _updreverse { # edit all related VNs for my $i (keys %upd) { - my $r = $self->dbVNGet(id => $i, what => 'extended relations categories anime screenshots')->[0]; + my $r = $self->dbVNGet(id => $i, what => 'extended relations anime screenshots')->[0]; my @newrel = map $_->{id} != $vid ? [ $_->{relation}, $_->{id} ] : (), @{$r->{relations}}; push @newrel, [ $upd{$i}, $vid ] if $upd{$i} != -1; $self->dbVNEdit($i, @@ -291,7 +290,7 @@ sub _updreverse { uid => 1, # Multi - hardcoded anime => [ map $_->{id}, @{$r->{anime}} ], screenshots => [ map [ $_->{id}, $_->{nsfw}, $_->{rid} ], @{$r->{screenshots}} ], - ( map { $_ => $r->{$_} } qw| title original desc alias categories img_nsfw length l_wp l_encubed l_renai l_vnn image | ) + ( map { $_ => $r->{$_} } qw| title original desc alias img_nsfw length l_wp l_encubed l_renai l_vnn image | ) ); } } diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm index ed8ad7c0..0563c1dc 100644 --- a/lib/VNDB/Handler/VNPage.pm +++ b/lib/VNDB/Handler/VNPage.pm @@ -37,7 +37,7 @@ sub page { my $v = $self->dbVNGet( id => $vid, - what => 'extended categories anime relations screenshots ranking'.($rev ? ' changes' : ''), + what => 'extended anime relations screenshots ranking'.($rev ? ' changes' : ''), $rev ? (rev => $rev) : (), )->[0]; return 404 if !$v->{id}; @@ -120,7 +120,6 @@ sub page { } _producers($self, \$i, $r); - _categories($self, \$i, $v) if @{$v->{categories}}; _relations($self, \$i, $v) if @{$v->{relations}}; _anime($self, \$i, $v) if @{$v->{anime}}; _useroptions($self, \$i, $v) if $self->authInfo->{id}; @@ -173,7 +172,7 @@ sub _revision { return if !$rev; my $prev = $rev && $rev > 1 && $self->dbVNGet( - id => $v->{id}, rev => $rev-1, what => 'extended categories anime relations screenshots changes' + id => $v->{id}, rev => $rev-1, what => 'extended anime relations screenshots changes' )->[0]; $self->htmlRevision('v', $prev, $v, @@ -194,10 +193,6 @@ sub _revision { [ l_vnn => 'V-N.net link', htmlize => sub { $_[0] ? sprintf '<a href="http://visual-novels.net/vn/index.php?option=com_content&task=view&id=%d">%1$d</a>', xml_escape $_[0] : '[no link]' }], - [ categories => 'Categories', join => ', ', split => sub { - my @r = map $self->{categories}{substr($_->[0],0,1)}[1]{substr($_->[0],1,2)}."($_->[1])", sort { $a->[0] cmp $b->[0] } @{$_[0]}; - return @r ? @r : ('[no categories selected]'); - }], [ relations => 'Relations', join => '<br />', split => sub { my @r = map sprintf('%s: <a href="/v%d" title="%s">%s</a>', $self->{vn_relations}[$_->{relation}][0], $_->{id}, xml_escape($_->{original}||$_->{title}), xml_escape shorten $_->{title}, 40 @@ -254,45 +249,6 @@ sub _producers { } -sub _categories { - my($self, $i, $v) = @_; - - # create an ordered list of selected categories in the form of: [ parent, [ p, sub, lvl ], .. ], .. - my @cat; - my %nolvl = (map {$_=>1} qw| pli pbr gaa gab hfa hfe |); - for my $cp (qw|e s g p h|) { - my $thisparent = 0; - my @sel = sort { $a->[0] cmp $b->[0] } grep substr($_->[0], 0, 1) eq $cp, @{$v->{categories}}; - if(@sel) { - push @cat, [ $self->{categories}{$cp}[0] ]; - push @{$cat[$#cat]}, map [ $cp, substr($_->[0],1,2), $nolvl{$_->[0]} ? 0 : $_->[1] ], @sel; - } - } - my @placetime = grep $_->[0] =~ /^[tl]/, @{$v->{categories}}; - if(@placetime) { - push @cat, [ 'Place/Time' ]; - push @{$cat[$#cat]}, map [ substr($_->[0],0,1), substr($_->[0],1,2), 0], sort { $a->[0] cmp $b->[0] } @placetime; - } - - # format & output categories - Tr ++$$i % 2 ? (class => 'odd') : (); - td 'Categories'; - td; - dl id => 'vncats', style => 'display: none'; - dt 'Note:'; dd "The category system is outdated, please use tags instead.\n\n"; - for (@cat) { - dt shift(@$_).':'; - dd; - lit join ', ', map qq|<i class="catlvl_$_->[2]">$self->{categories}{$_->[0]}[1]{$_->[1]}</i>|, @$_; - end; - } - end; - a href => '#', onclick => "document.getElementById('vncats').style.display='';this.style.display='none';return false", 'Show categories'; - end; - end; -} - - sub _relations { my($self, $i, $v) = @_; |