diff options
author | yorhel <yorhel@1fe2e327-d9db-4752-bcf7-ef0cb4a1748b> | 2008-06-15 07:37:37 +0000 |
---|---|---|
committer | yorhel <yorhel@1fe2e327-d9db-4752-bcf7-ef0cb4a1748b> | 2008-06-15 07:37:37 +0000 |
commit | dfcfb4a402dcfbc1b1873c5ead08584c3e71a5c6 (patch) | |
tree | 816ed80e180bc818d245be54ea90111f59d7ab86 /lib | |
parent | f8b467a1a6cff156a55770642e34a1d5c0142079 (diff) |
Permenantly removed the CISV link, added links to renai.us and encubed, and small bugfix in the VNDBID pattern matching
git-svn-id: svn://vndb.org/vndb@28 1fe2e327-d9db-4752-bcf7-ef0cb4a1748b
Diffstat (limited to 'lib')
-rw-r--r-- | lib/VNDB/Util/DB.pm | 8 | ||||
-rw-r--r-- | lib/VNDB/VN.pm | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/VNDB/Util/DB.pm b/lib/VNDB/Util/DB.pm index 82b51f05..ab23040d 100644 --- a/lib/VNDB/Util/DB.pm +++ b/lib/VNDB/Util/DB.pm @@ -617,7 +617,7 @@ sub DBGetVN { # %options->{ id rev char search order results page what cati cate ); my $sel = 'v.id, v.locked, v.hidden, v.c_released, v.c_languages, v.c_votes, v.c_platforms, vr.title, vr.id AS cid, v.rgraph'; - $sel .= ', vr.alias, vr.image AS image, vr.img_nsfw, vr.length, vr.desc, vr.l_wp, vr.l_cisv, vr.l_vnn' if $o{what} =~ /extended/; + $sel .= ', vr.alias, vr.image AS image, vr.img_nsfw, vr.length, vr.desc, vr.l_wp, vr.l_encubed, vr.l_renai, vr.l_vnn' if $o{what} =~ /extended/; $sel .= ', c.added, c.requester, c.comments, v.latest, u.username, c.prev, c.causedby' if $o{what} =~ /changes/; my $r = $s->DBAll(qq| @@ -732,9 +732,9 @@ sub _insert_vn_rev { my($s, $cid, $vid, $o) = @_; $s->DBExec(q| - INSERT INTO vn_rev (id, vid, title, "desc", alias, image, img_nsfw, length, l_wp, l_cisv, l_vnn) - VALUES (%d, %d, !s, !s, !s, %d, %d, %d, !s, %d, %d)|, - $cid, $vid, @$o{qw|title desc alias image img_nsfw length l_wp l_cisv l_vnn|}); + INSERT INTO vn_rev (id, vid, title, "desc", alias, image, img_nsfw, length, l_wp, l_encubed, l_renai, l_vnn) + VALUES (%d, %d, !s, !s, !s, %d, %d, %d, !s, !s, !s, %d)|, + $cid, $vid, @$o{qw|title desc alias image img_nsfw length l_wp l_encubed l_renai l_vnn|}); $s->DBExec(q| INSERT INTO vn_categories (vid, cat, lvl) diff --git a/lib/VNDB/VN.pm b/lib/VNDB/VN.pm index 63b5801f..2abd4035 100644 --- a/lib/VNDB/VN.pm +++ b/lib/VNDB/VN.pm @@ -73,7 +73,7 @@ sub VNEdit { return $self->ResDenied if !$self->AuthCan('edit') || ($v->{locked} && !$self->AuthCan('lock')); my %b4 = $id ? ( - ( map { $_ => $v->{$_} } qw| title desc alias img_nsfw length l_wp l_cisv l_vnn | ), + ( map { $_ => $v->{$_} } qw| title desc alias img_nsfw length l_wp l_encubed l_renai l_vnn | ), relations => join('|||', map { $_->{relation}.','.$_->{id}.','.$_->{title} } @{$v->{relations}}), categories => join(',', map { $_->[0].$_->[1] } sort { $a->[0] cmp $b->[0] } @{$v->{categories}}), anime => join(' ', sort { $a <=> $b } map $_->{id}, @{$v->{anime}}), @@ -87,7 +87,8 @@ sub VNEdit { { name => 'desc', required => 1, maxlength => 10240 }, { name => 'length', required => 0, enum => [ 0..($#$VNDB::VNLEN+1) ], default => 0 }, { name => 'l_wp', required => 0, default => '', maxlength => 150 }, - { name => 'l_cisv', required => 0, default => 0, template => 'int' }, + { name => 'l_encubed', required => 0, default => '', maxlength => 100 }, + { name => 'l_renai', required => 0, default => '', maxlength => 100 }, { name => 'l_vnn', required => 0, default => 0, template => 'int' }, { name => 'anime', required => 0, default => '' }, { name => 'img_nsfw', required => 0 }, @@ -95,12 +96,11 @@ sub VNEdit { { name => 'relations', required => 0, default => '' }, { name => 'comm', required => 0, default => '' }, ); - $frm->{l_cisv} = $b4{l_cisv}; $frm->{img_nsfw} = $frm->{img_nsfw} ? 1 : 0; $frm->{anime} = join(' ', sort { $a <=> $b } grep /^[0-9]+$/, split(/\s+/, $frm->{anime})); # re-sort return $self->ResRedirect('/v'.$id, 'post') - if $id && !$self->ReqParam('img') && 11 == scalar grep { $b4{$_} eq $frm->{$_} } keys %b4; + if $id && !$self->ReqParam('img') && 12 == scalar grep { $b4{$_} eq $frm->{$_} } keys %b4; my $relations = [ map { /^([0-9]+),([0-9]+)/ && $2 != $id ? ( [ $1, $2 ] ) : () } split /\|\|\|/, $frm->{relations} ]; my $cat = [ map { [ substr($_,0,3), substr($_,3,1) ] } split /,/, $frm->{categories} ]; @@ -137,7 +137,7 @@ sub VNEdit { } my %args = ( - ( map { $_ => $frm->{$_} } qw| title desc alias comm length l_wp l_cisv l_vnn img_nsfw| ), + ( map { $_ => $frm->{$_} } qw| title desc alias comm length l_wp l_encubed l_renai l_vnn img_nsfw| ), image => $imgid, anime => $anime, relations => $relations, @@ -347,7 +347,7 @@ sub VNUpdReverse { # old, new, id, cid causedby => $cid, uid => 1, # Multi - hardcoded anime => [ map $_->{id}, @{$r->{anime}} ], - ( map { $_ => $r->{$_} } qw| title desc alias categories img_nsfw length l_wp l_cisv l_vnn image | ) + ( map { $_ => $r->{$_} } qw| title desc alias categories img_nsfw length l_wp l_encubed l_renai l_vnn image | ) ); } |