[Cpan-forum-commit] rev 285 - in trunk: . lib/CPAN lib/CPAN/Forum/DB lib/CPAN/Forum/RM

[svn at pti.co.il]

Author: gabor
Date: 2007-07-21 18:19:16 +0300 (Sat, 21 Jul 2007)
New Revision: 285

Modified:
   trunk/
   trunk/lib/CPAN/Forum.pm
   trunk/lib/CPAN/Forum/DB/Groups.pm
   trunk/lib/CPAN/Forum/RM/Dist.pm
Log:
fix some of the uses of a group hash that were broken in the previous commit



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4277
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4278
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752

Modified: trunk/lib/CPAN/Forum/DB/Groups.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Groups.pm	2007-07-21 15:18:46 UTC (rev 284)
+++ trunk/lib/CPAN/Forum/DB/Groups.pm	2007-07-21 15:19:16 UTC (rev 285)
@@ -19,9 +19,9 @@
     my ($self, $field, $value) = @_;
     Carp::croak("Invalid field '$field'") if $field ne 'id' and $field ne 'name';
 
-    my $sql = "SELECT id, name, status
-               FROM groups
-               WHERE $field=?";
+    my $sql = "SELECT groups.id id, name, status, groups.pauseid, authors.pauseid pauseid_name
+               FROM groups, authors
+               WHERE $field=? AND authors.id=groups.pauseid";
     return $self->_fetch_single_hashref($sql, $value);
 }
 

Modified: trunk/lib/CPAN/Forum/RM/Dist.pm
===================================================================
--- trunk/lib/CPAN/Forum/RM/Dist.pm	2007-07-21 15:18:46 UTC (rev 284)
+++ trunk/lib/CPAN/Forum/RM/Dist.pm	2007-07-21 15:19:16 UTC (rev 285)
@@ -61,8 +61,8 @@
 
     # TODO: is is not clear to me how can here anything be undef, but I got
     # several exceptions on eith $gr or $gr->pauseid being undef:
-    if ($gr and  $gr->pauseid and $gr->pauseid->pauseid) {
-        $t->param(pauseid_name => $gr->pauseid->pauseid);
+    if ($gr and  $gr->{pauseid_name}) {
+        $t->param(pauseid_name => $gr->{pauseid_name});
     }
 
     my $frequent_tags = CPAN::Forum::DB::Tags->get_tags_of_module($gid);

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2007-07-21 15:18:46 UTC (rev 284)
+++ trunk/lib/CPAN/Forum.pm	2007-07-21 15:19:16 UTC (rev 285)
@@ -1048,7 +1048,7 @@
 
         if ($new_group_id =~ /^(\d+)$/) {
             $new_group_id = $1;
-            my ($grp) = CPAN::Forum::DB::Groups->info_by(id => $new_group_id);
+            my ($grp) = CPAN::Forum::DB::Groups->info_by(id => $new_group_id); # SQL
             if ($grp) {
                 $new_group = $grp->{name};
             } else {
@@ -1376,8 +1376,8 @@
     my %people;
     foreach my $s (
             CPAN::Forum::DB::Subscriptions_all->search(allposts => 1),
-            CPAN::Forum::DB::Subscriptions_pauseid->search(allposts => 1, pauseid => $group->pauseid),
-            CPAN::Forum::DB::Subscriptions->search(allposts => 1, gid => $group->id),
+            CPAN::Forum::DB::Subscriptions_pauseid->search(allposts => 1, pauseid => $group->{pauseid}),
+            CPAN::Forum::DB::Subscriptions->search(allposts => 1, gid => $group->{id}),
             ) {
         $people{$s->uid} =  {
             username => $s->uid->username,