[Cpan-forum-commit] rev 300 - in trunk: . lib/CPAN

[svn at pti.co.il]

Author: gabor
Date: 2007-07-22 07:04:20 +0300 (Sun, 22 Jul 2007)
New Revision: 300

Modified:
   trunk/
   trunk/lib/CPAN/Forum.pm
Log:
show post, method _post



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

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2007-07-22 04:04:07 UTC (rev 299)
+++ trunk/lib/CPAN/Forum.pm	2007-07-22 04:04:20 UTC (rev 300)
@@ -1075,15 +1075,15 @@
     }
     $id ||= $q->param("new_parent");
     if ($id) { # Show post
-        my $post = CPAN::Forum::DB::Posts->retrieve($id);
+        my $post = CPAN::Forum::DB::Posts->get_post($id); # SQL
         if (not $post) {
             return $self->internal_error(
                 "in request",
                 );
         }
-        my $thread_count = CPAN::Forum::DB::Posts->count_thread($post->thread);
+        my $thread_count = CPAN::Forum::DB::Posts->count_thread($post->{thread}); # SQL
         if ($thread_count > 1) {
-            $t->param(thread_id    => $post->thread);
+            $t->param(thread_id    => $post->{thread});
             $t->param(thread_count => $thread_count);
         }
         my %post = %{$self->_post($post)};
@@ -1091,17 +1091,18 @@
         
 #       (my $dashgroup = $post->gid) =~ s/::/-/g;
 #       $t->param(dashgroup    => $dashgroup);
-        my $new_subject = $post->subject;
+        my $new_subject = $post->{subject};
         if ($new_subject !~ /^\s*re:\s*/i) {
             $new_subject = "Re: $new_subject";
         }
         
         $t->param(new_subject  => _subject_escape($new_subject));
-        $t->param(title        => _subject_escape($post->subject));
+        $t->param(title        => _subject_escape($post->{subject}));
         $t->param(post         => 1);
         
-        $new_group        = $post->gid->name;
-        $new_group_id     = $post->gid->id;     
+        my $group = CPAN::Forum::DB::Groups->info_by(id => $post->{gid}); # SQL
+        $new_group        = $group->{name};
+        $new_group_id     = $group->{id};     
     }
     $self->log->debug("D: new_group: '$new_group' and id: '$new_group_id'");
     #$t->param("group_selector" => $self->_group_selector($new_group, $new_group_id));
@@ -1150,11 +1151,11 @@
     
     my $parent_post;
     if ($parent) { # assume response
-        ($parent_post) = CPAN::Forum::DB::Posts->search(id => $parent);
+        $parent_post = CPAN::Forum::DB::Posts->get_post($parent); # SQL
         push @errors, "bad_thing"  if not $parent_post;
     } else {       # assume new post
         if ($q->param("new_group_id")) {
-            push @errors, "bad_group"  if not CPAN::Forum::DB::Groups->search(id => $q->param("new_group_id"));
+            push @errors, "bad_group"  if not CPAN::Forum::DB::Groups->info_by(id => $q->param("new_group_id")); # SQL
         } else {
             push @errors, "no_group";
         }
@@ -1218,19 +1219,19 @@
 
     my $post_id;
     my $username = $self->session->param("username");
-    my ($user) = CPAN::Forum::DB::Users->search({ username => $username });
+    my $user = CPAN::Forum::DB::Users->info_by( username => $username ); # SQL
     if (not $user) {
-        return $self->internal_error("Unknonw username: $username");
+        return $self->internal_error("Unknown username: '$username'");
     }
     eval {
         my $post = CPAN::Forum::DB::Posts->create({
-            uid     => $user->id,
-            gid     => $parent_post ? $parent_post->gid : $q->param("new_group_id"),
+            uid     => $user->{id},
+            gid     => $parent_post ? $parent_post->{gid} : $q->param("new_group_id"),
             subject => $q->param("new_subject"),
             text    => $new_text,
             date    => time,
         });
-        $post->thread($parent_post ? $parent_post->thread : $post->id);
+        $post->thread($parent_post ? $parent_post->{thread} : $post->id);
         $post->parent($parent) if $parent_post;
         $post->update;
         $post_id = $post->id;
@@ -1257,18 +1258,19 @@
 
 sub _post {
     my ($self, $post) = @_;
-    my @responses = map {{id => $_->id}} CPAN::Forum::DB::Posts->search(parent => $post->id);
+    my @responses = map {{id => $_->id}} CPAN::Forum::DB::Posts->search(parent => $post->{id});
 
+    my $user = CPAN::Forum::DB::Users->info_by(id => $post->{uid}); # SQL
     my %post = (
-        postername  => $post->uid->username,
-        date        => _post_date($post->date),
-        parentid    => $post->parent,
+        postername  => $user->{username},
+        date        => _post_date($post->{date}),
+        parentid    => $post->{parent},
         responses   => \@responses,
-        text        => $self->_text_escape($post->text),
+        text        => $self->_text_escape($post->{text}),
     );
 
-    $post{id}      = $post->id;
-    $post{subject} = _subject_escape($post->subject);
+    $post{id}      = $post->{id};
+    $post{subject} = _subject_escape($post->{subject});
 
     return \%post;
 }