chardb: Allow specifying the order of trait groups +'sexual' trait flag

The sexual flag isn't used yet.

2 files changed, 22 insertions, 7 deletions

diff --git a/lib/VNDB/Handler/Chars.pm b/lib/VNDB/Handler/Chars.pm
index ef15b823..64e7df2d 100644
--- a/lib/VNDB/Handler/Chars.pm
+++ b/lib/VNDB/Handler/Chars.pm
@@ -50,8 +50,7 @@ sub page {
       }],
       [ traits    => join => '<br />', split => sub {
         map sprintf('%s<a href="/i%d">%s</a> (%s)', $_->{group}?qq|<b class="grayedout">$_->{groupname} / </b> |:'',
-            $_->{tid}, $_->{name}, mt("_spoil_$_->{spoil}")),
-          sort { ($a->{groupname}||$a->{name}) cmp ($b->{groupname}||$b->{name}) || $a->{name} cmp $b->{name} } @{$_[0]}
+            $_->{tid}, $_->{name}, mt("_spoil_$_->{spoil}")), @{$_[0]}
       }],
       [ vns       => join => '<br />', split => sub {
         map sprintf('<a href="/v%d">v%d</a> %s %s (%s)', $_->{vid}, $_->{vid},
@@ -120,10 +119,15 @@ sub page {
      }
 
      # traits
-     # TODO: handle spoilers!
+     # TODO: handle spoilers and 'sexual' traits
      my %groups;
-     push @{$groups{ $_->{group}||$_->{tid} }}, $_ for(sort { $a->{name} cmp $b->{name} } @{$r->{traits}});
-     for my $g (sort { ($groups{$a}[0]{groupname}||$groups{$a}[0]{name}) cmp ($groups{$a}[0]{groupname}||$groups{$a}[0]{name}) } keys %groups) {
+     my @groups;
+     for (@{$r->{traits}}) {
+       my $g = $_->{group}||$_->{tid};
+       push @groups, $g if !$groups{$g};
+       push @{$groups{ $g }}, $_
+     }
+     for my $g (@groups) {
        Tr ++$i % 2 ? (class => 'odd') : ();
         td class => 'key'; a href => '/i'.($groups{$g}[0]{group}||$groups{$g}[0]{tid}), $groups{$g}[0]{groupname} || $groups{$g}[0]{name}; end;
         td;
diff --git a/lib/VNDB/Handler/Traits.pm b/lib/VNDB/Handler/Traits.pm
index 9d02ec0d..a66721a8 100644
--- a/lib/VNDB/Handler/Traits.pm
+++ b/lib/VNDB/Handler/Traits.pm
@@ -66,6 +66,11 @@ sub traitpage {
       lit bb2html $t->{description};
      end;
    }
+   if($t->{sexual}) {
+     p class => 'center';
+      b mt '_traitp_sexual';
+     end;
+   }
    if($t->{alias}) {
      p class => 'center';
       b mt('_traitp_aliases');
@@ -147,9 +152,11 @@ sub traitedit {
       { post => 'name',        required => 1, maxlength => 250, regex => [ qr/^[^,]+$/, 'A comma is not allowed in trait names' ] },
       { post => 'state',       required => 0, default => 0,  enum => [ 0..2 ] },
       { post => 'meta',        required => 0, default => 0 },
+      { post => 'sexual',      required => 0, default => 0 },
       { post => 'alias',       required => 0, maxlength => 1024, default => '', regex => [ qr/^[^,]+$/s, 'No comma allowed in aliases' ]  },
       { post => 'description', required => 0, maxlength => 10240, default => '' },
       { post => 'parents',     required => !$self->authCan('tagmod'), default => '', regex => [ qr/^(?:$|(?:[1-9]\d*)(?: +[1-9]\d*)*)$/, 'Parent traits must be a space-separated list of trait IDs' ] },
+      { post => 'order',       required => 0, default => 0, template => 'int', min => 0 },
     );
     my @parents = split /[\t ]+/, $frm->{parents};
     my $group = undef;
@@ -168,7 +175,9 @@ sub traitedit {
         state => $frm->{state},
         description => $frm->{description},
         meta => $frm->{meta}?1:0,
+        sexual => $frm->{sexual}?1:0,
         alias => $frm->{alias},
+        order => $frm->{order},
         parents => \@parents,
         group => $group,
       );
@@ -187,7 +196,7 @@ sub traitedit {
   }
 
   if($t) {
-    $frm->{$_} ||= $t->{$_} for (qw|name meta description state alias|);
+    $frm->{$_} ||= $t->{$_} for (qw|name meta sexual description state alias order|);
     $frm->{parents} ||= join ' ', map $_->{id}, @{$t->{parents}};
   }
 
@@ -216,10 +225,12 @@ sub traitedit {
         map [$_, mt '_traite_frm_state'.$_], 0..2 ] ],
       [ checkbox => short => 'meta',     name => mt '_traite_frm_meta' ]
     ) : (),
+    [ checkbox => short => 'sexual',   name => mt '_traite_frm_sexual' ],
     [ textarea => short => 'alias',    name => mt('_traite_frm_alias'), cols => 30, rows => 4 ],
     [ textarea => short => 'description', name => mt '_traite_frm_desc' ],
     [ input    => short => 'parents',  name => mt '_traite_frm_parents' ],
     [ static   => content => mt '_traite_frm_parents_msg' ],
+    [ input    => short => 'order', name => mt('_traite_frm_gorder'), width => 50, post => ' '.mt('_traite_frm_gorder_msg') ],
   ]);
 
   $self->htmlFooter;
@@ -407,7 +418,7 @@ sub traitxml {
     $f->{id} && $f->{id}[0] ? (id => $f->{id}) : (),
     results => $f->{r},
     page => 1,
-    sort => 'groupname'
+    sort => 'group'
   );
 
   $self->resHeader('Content-type' => 'text/xml; charset=UTF-8');