Removed the rating system and small cleanup on the homepage

git-svn-id: svn://vndb.org/vndb@55 1fe2e327-d9db-4752-bcf7-ef0cb4a1748b

4 files changed, 9 insertions, 12 deletions

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0a39be9a..a37bce7f 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -10,6 +10,7 @@ TODO:
 	- Integrated discussion board
 	- Colored diff for alies field
 	- 'ttabs' for user entries
+	- Removed the rating system
 
 1.18 - 2008-07-02 (r51)
 	- Releases, producers and visual novel items can't be fully deleted anymore
diff --git a/lib/VNDB/HomePages.pm b/lib/VNDB/HomePages.pm
index 7a70797a..1db0fbe4 100644
--- a/lib/VNDB/HomePages.pm
+++ b/lib/VNDB/HomePages.pm
@@ -20,9 +20,6 @@ sub HomePage {
     recentedits => scalar $self->DBGetHist( results => 10, what => 'iid ititle'),
     recentvns   => scalar $self->DBGetHist( results => 10, what => 'iid ititle', edits => 0, type => 'v'),
     recentps    => scalar $self->DBGetHist( results => 10, what => 'iid ititle', edits => 0, type => 'p'),
-    randomvns   => scalar $self->DBGetVN(   results => 10, order => 'RANDOM()'),
-    recentvotes => scalar $self->DBGetVotes(results => 10, hide => 1),
-    popular     => scalar $self->DBGetVN(   results => 10, order => 'v.c_votes DESC'),
   });
 }
 
diff --git a/lib/VNDB/Util/DB.pm b/lib/VNDB/Util/DB.pm
index 8391f58f..679c16b6 100644
--- a/lib/VNDB/Util/DB.pm
+++ b/lib/VNDB/Util/DB.pm
@@ -428,7 +428,6 @@ sub DBAddVote { # vid, uid, vote
     $_[1], $_[2], $_[3], time
   );
   # XXX: performance improvement: let a cron job handle this
-  $_[0]->DBExec('SELECT calculate_rating()');
 }
 
 
@@ -438,7 +437,6 @@ sub DBDelVote { # uid, vid  # uid = 0 to delete all
     DELETE FROM votes
       WHERE %s vid = %d|,
     $uid, $_[2]);
-  $_[0]->DBExec('SELECT calculate_rating()');
 }
 
 
@@ -617,7 +615,7 @@ sub DBGetVN { # %options->{ id rev char search order results page what cati cate
       'JOIN users u ON u.id = c.requester' ) : (),
   );
 
-  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';
+  my $sel = 'v.id, v.locked, v.hidden, v.c_released, v.c_languages, 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_encubed, vr.l_renai, vr.l_vnn' if $o{what} =~ /extended/;
   $sel .= ', c.added, c.requester, c.comments, v.latest, u.username, c.rev, c.causedby' if $o{what} =~ /changes/;
 
diff --git a/lib/VNDB/VN.pm b/lib/VNDB/VN.pm
index 365204d4..683aba67 100644
--- a/lib/VNDB/VN.pm
+++ b/lib/VNDB/VN.pm
@@ -49,10 +49,10 @@ sub VNPage {
         latest => scalar $self->DBGetVNList(vid => $id, results => 7, hide => 1),
         graph => $self->DBVNListStats(vid => $id),
       },
-      votes => {
-        latest => scalar $self->DBGetVotes(vid => $id, results => 10, hide => 1),
-        graph => $self->DBVoteStats(vid => $id),
-      },
+      #votes => {
+      #  latest => scalar $self->DBGetVotes(vid => $id, results => 10, hide => 1),
+      #  graph => $self->DBVoteStats(vid => $id),
+      #},
     ) : (),
   });
 }
@@ -212,12 +212,13 @@ sub VNBrowse {
   $chr = 'all' if !defined $chr;
 
   my $f = $self->FormCheck(
-    { name => 's', required => 0, default => 'title', enum => [ qw|title released votes| ] },
+    { name => 's', required => 0, default => 'title', enum => [ qw|title released| ] },
     { name => 'o', required => 0, default => 'a', enum => [ 'a','d' ] },
     { name => 'q', required => 0, default => '' },
     { name => 'sq', required => 0, default => '' },
     { name => 'p', required => 0, template => 'int', default => 1},
   );
+  $f->{s} = 'title' if $f->{_err};
 
   $f->{q} ||= $f->{sq};
 
@@ -257,7 +258,7 @@ sub VNBrowse {
     @plat ? ( platform => \@plat ) : (),
     results => 50,
     page => $f->{p},
-    order => {title => 'vr.title', released => 'v.c_released', votes => 'v.c_votes'
+    order => {title => 'vr.title', released => 'v.c_released', 
       }->{$f->{s}}.{a=>' ASC',d=>' DESC'}->{$f->{o}},
   )) : ([], 0);