Changeset 406 for veekun/trunk/lib/Vee/Controller/Dex/Search.pm

Timestamp:

02/08/08 02:44:39 (2 years ago)

Author:

eevee

Message:

Database refactoring. Renamed columns and tables to be more consistent and more readable. (#58)

Files:

• veekun/trunk/lib/Vee/Controller/Dex/Search.pm (modified) (9 diffs)

veekun/trunk/lib/Vee/Controller/Dex/Search.pm

@@ -49 +49 @@
     breed       => { type => 'select', options => [ [ 0 => 'n/a' ], map { [ $_ => ($_ ? "$_: " : '') . $BreedingGroups[$_] ] } 1 .. $#BreedingGroups ], count => 2 },
     breed_mode  => { type => 'select', options => [ [ and => 'exactly' ], [ or => 'either of' ] ], default => 'or' },
-    gender      => { type => 'select', options => [ [ any => 'anything' ], [ 255 => 'no gender' ], [ not255 => 'any gender' ], map { [ $_ => lc gender_text($_) ] } qw/0 31 63 127 191 254/ ] },
+    gender_rate => { type => 'select', options => [ [ any => 'anything' ], [ 255 => 'no gender' ], [ not255 => 'any gender' ], map { [ $_ => lc gender_text($_) ] } qw/0 31 63 127 191 254/ ] },
     ability     => { type => 'text', size => 20, title => 'Enter the name or number of an ability' },
     color       => { type => 'select', options => [qw/any black blue brown gray green pink purple red white yellow/], title => 'I have no explanation for why this is here' },
@@ -123 +123 @@
             if ($ability) {
                 $joins{pokemon_abilities} = 1;
-                $criteria{'pokemon_abilities.abilityid'} = $ability->id;
+                $criteria{'pokemon_abilities.ability_id'} = $ability->id;
             }
         }
@@ -142 +142 @@
 
         # BREEDING AND STUFF
-        if (defined $p->{gender} and $p->{gender} ne 'any') {
-            if ($p->{gender} eq 'not255') {
-                $criteria{'me.gender'} = { '!=' => 255 };
+        if (defined $p->{gender_rate} and $p->{gender_rate} ne 'any') {
+            if ($p->{gender_rate} eq 'not255') {
+                $criteria{'me.gender_rate'} = { '!=' => 255 };
             } else {
-                $criteria{'me.gender'} = $p->{gender};
+                $criteria{'me.gender_rate'} = $p->{gender_rate};
             }
         }
@@ -154 +154 @@
             $criteria{'breeds.breed'} = \@breeds;
             if ($p->{breed_mode} eq 'and') {
-                $clauses{having}{'COUNT(DISTINCT breeds.pokeid, breeds.breed)'} = scalar @breeds;
+                $clauses{having}{'COUNT(DISTINCT breeds.pokemon_id, breeds.breed)'} = scalar @breeds;
 
                 if (@breeds == 1) {
@@ -192 +192 @@
             for my $move (@{ $p->{move} }) {
                 # XXX: show some message if a move is invalid?
-                my $moveid = get_move($move);
-                push @moveids, $moveid if defined $moveid;
+                my $move_id = get_move($move);
+                push @moveids, $move_id if defined $move_id;
             }
             if (@moveids) {
-                $joins{pokemoves} = 1;
-                $criteria{'pokemoves.moveid'} = \@moveids;
-                $clauses{having}{'COUNT(DISTINCT pokemoves.pokeid, pokemoves.moveid)'} = scalar @moveids;
+                $joins{pokemon_moves} = 1;
+                $criteria{'pokemon_moves.move_id'} = \@moveids;
+                $clauses{having}{'COUNT(DISTINCT pokemon_moves.pokemon_id, pokemon_moves.move_id)'} = scalar @moveids;
 
                 if ($p->{move_method}) {
-                    $criteria{'pokemoves.method'} = $p->{move_method};
+                    $criteria{'pokemon_moves.method'} = $p->{move_method};
                 }
                 if ($p->{move_version}) {
-                    push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemoves.version)" } Vee::Utils::array($p->{move_version}) ] };
+                    push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemon_moves.versions)" } Vee::Utils::array($p->{move_version}) ] };
                 }
             }
@@ -237 +237 @@
 
             if ($evo_stages{base}) {
-                $criteria{'me.evparent'} = 0;
+                $criteria{'me.evo_parent_id'} = 0;
             }
 
@@ -308 +308 @@
 };
 
-for my $col (qw/power acc pp effect_chance priority/) {
+for my $col (qw/power accuracy pp effect_chance priority/) {
     for my $endpoint (keys %endpoints) {
         $move_search_fields->{ $col . '_' . $endpoint } = { type => 'text', size => 4, maxlength => 3, title => "\u$endpoints{$endpoint}{english} $col" };
@@ -366 +366 @@
             }
             if (@pokemonids) {
-                $joins{pokemoves} = 1;
-                $criteria{'pokemoves.pokeid'} = \@pokemonids;
-                $clauses{having}{'COUNT(DISTINCT pokemoves.pokeid, pokemoves.moveid)'} = scalar @pokemonids;
+                $joins{pokemon_moves} = 1;
+                $criteria{'pokemon_moves.pokemon_id'} = \@pokemonids;
+                $clauses{having}{'COUNT(DISTINCT pokemon_moves.pokemon_id, pokemon_moves.move_id)'} = scalar @pokemonids;
 
                 if ($p->{move_method}) {
-                    $criteria{'pokemoves.method'} = $p->{move_method};
+                    $criteria{'pokemon_moves.method'} = $p->{move_method};
                 }
                 if ($p->{move_version}) {
-                    push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemoves.version)" } Vee::Utils::array($p->{move_version}) ] };
+                    push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemon_moves.versions)" } Vee::Utils::array($p->{move_version}) ] };
                 }
             }
@@ -380 +380 @@
 
         # NUMBERS
-        for my $numbar (qw/power acc pp effect_chance priority/) {
+        for my $numbar (qw/power accuracy pp effect_chance priority/) {
             for my $endpoint (keys %endpoints) {
                 my $value = $p->{$numbar . '_' . $endpoint};