Changeset 27

Timestamp:

11/24/10 08:50:41 (14 years ago)

Author:

nanardon

Message:

• add detail page about rpms

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Distrib.pm (modified) (1 diff)
• lib/Sophie/Controller/Rpms.pm (modified) (10 diffs)
• root/templates/html/distrib/media_rpm_bypkgid.html (added)
• root/templates/html/distrib/media_rpm_bypkgid.tt (added)
• root/templates/html/rpms (added)
• root/templates/html/rpms/rpms.html (added)
• root/templates/html/rpms/rpms.tt (added)

server/trunk/web/lib/Sophie/Controller/Distrib.pm

@@ -260 +260 @@
 sub media_rpm_bypkgid :Chained('_media_list_rpms') PathPart('by-pkgid') {
     my ( $self, $c, $pkgid ) = @_;
-    $c->forward('/rpms/queryformat', [ $pkgid, '%{name}' ]);
+    $c->forward('/rpms/rpms', [ $pkgid ]);
 }
 

server/trunk/web/lib/Sophie/Controller/Rpms.pm

@@ -32 +32 @@
 sub queryformat : XMLRPCLocal {
     my ( $self, $c, $pkgid, $qf ) = @_;
-    @{$c->stash->{xmlrpc}} = map { $_->get_column('qf') } $c->model('Base')->resultset('Rpms')->search(
+    $c->stash->{xmlrpc} = $c->model('base')->resultset('Rpms')->search(
         { pkgid => $pkgid },
         { 
@@ -39 +39 @@
             bind => [ $qf ],
         }
-    )->all;
+    )->next->get_column('qf');
 }
 
 sub tag : XMLRPCLocal {
     my ( $self, $c, $pkgid, $tag ) = @_;
-    @{$c->stash->{xmlrpc}} = map { $_->get_column('tag') } $c->model('Base')->resultset('Rpms')->search(
+    $c->stash->{xmlrpc} = [ map { $_->get_column('tag') } $c->model('Base')->resultset('Rpms')->search(
         { pkgid => $pkgid },
         { 
@@ -51 +51 @@
             bind => [ $tag ], 
         }
-    )->all;
-}
+    )->all ]
+}
+
+
+sub info : XMLRPCLocal {
+    my ($self, $c, $pkgid, $deptype) = @_;
+
+    my %info;
+    foreach (qw(name version release epoch url group size packager
+                url summary description sourcerpm license buildhost
+                pkgid builddate)) {
+        if (my $r = $c->model('base')->resultset('Rpms')->search(
+            { pkgid => $pkgid },
+            { 
+                select => [ qq{rpmqueryformat("header", ?)} ],
+                as => [ 'qf' ],
+                bind => [ "%{$_}" ],
+            }
+            )->next) { 
+            $info{$_} = $r->get_column('qf');
+        }
+    }
+
+    return $c->stash->{xmlrpc} = \%info;
+}
+
 
 sub deps : XMLRPCLocal {
@@ -83 +107 @@
     my ($self, $c, $pkgid) = @_;
 
+    my %deps;
     foreach (
         $c->model('Base')->resultset('Deps')->search(
@@ -96 +121 @@
             },
         )->all) {
-        push( @{ $c->stash->{xmlrpc}{deps}{$_->get_column('deptype')} },
+        push( @{ $deps{$_->get_column('deptype')} },
             {
                 name => $_->get_column('depname'),
@@ -105 +130 @@
         );
     }
+    $c->stash->{xmlrpc} = \%deps;
 }
 
@@ -110 +136 @@
     my ($self, $c, $pkgid) = @_;
 
-    @{ $c->stash->{xmlrpc}{files} } = map {
+    $c->stash->{xmlrpc} = [ map {
         {
             filename => $_->get_column('dirname') . $_->get_column('basename'),
@@ -123 +149 @@
 
             },
-        )->all;
+        )->all ];
 }
 
@@ -149 +175 @@
     }
 
-    $c->stash->{xmlrpc}{changelog} = \@ch;
+    $c->stash->{xmlrpc} = \@ch;
 }
 
@@ -155 +181 @@
 sub rpms : Chained : PathPart {
     my ( $self, $c, $pkgid ) = @_;
-    $c->stash->{pkgid} = $c->model('Base::Rpms')->search(pkgid => $pkgid)->next;
-    $c->log->debug('rpms ' . $c->stash->{pkgid});
+    $c->stash->{pkgid} = $c->model('Base')->resultset('Rpms')->search(pkgid => $pkgid)->next;
+    $c->stash->{xmlrpc} = {
+        info      => $c->forward('info', [ $pkgid ]),
+        changelog => $c->forward('changelog', [ $pkgid ]),
+        files     => $c->forward('files', [ $pkgid ]),
+        deps      => $c->forward('alldeps', [ $pkgid ]),
+    };
 }