Changeset 21 for server/trunk/web/lib/Sophie

Timestamp:

11/23/10 03:14:23 (14 years ago)

Author:

nanardon

Message:

• add initial distribution pages

File:

• server/trunk/web/lib/Sophie/Controller/Distrib.pm (modified) (4 diffs)

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

@@ -33 +33 @@
     my $rs = $c->model('Base')->resultset('Distribution');
     if (!$distribution) {
-        return $c->stash->{xmlrpc} = [ map { $_->name } $rs->all ];
+        return $c->stash->{xmlrpc} = [ map { $_->name }
+            $rs->search(undef, { order_by => ['name'] })->all ];
     }
     $rs = $rs->search(name => $distribution)->search_related('Release');
     if (!$release) {
-        return $c->stash->{xmlrpc} = [ map { $_->version } $rs->all ];
-        
+        return $c->stash->{xmlrpc} = [ map { $_->version }
+            $rs->search(undef, { order_by => ['version'] })->all ];
     }
     $rs = $rs->search(version => $release)->search_related('Arch');
     if (!$arch) {
-        return $c->stash->{xmlrpc} = [ map { $_->arch } $rs->all ];
+        return $c->stash->{xmlrpc} = [ map { $_->arch } 
+            $rs->search(undef, { order_by => ['arch'] })->all ];
     }
     $rs = $rs->search(arch => $arch)->search_related('Medias');
-    $c->stash->{xmlrpc} = [ map { $_->label } $rs->all ];
-    $c->stash->{xmlrpc}
+    return $c->stash->{xmlrpc} = [ map { $_->label }
+        $rs->search(undef, { order_by => ['label'] })->all ];
 }
 
@@ -117 +119 @@
 sub distrib :Chained('distrib_view') PathPart('') {
     my ( $self, $c ) = @_;
-    $c->forward('list', $c->stash->{dist});
-    $c->forward('rpms', $c->stash->{dist});
+    $c->forward('list', [ $c->stash->{dist} ]);
     # TODO store properly results
     # No call from json here
@@ -208 +209 @@
 sub rpm_by_name :Chained('distrib_view') PathPart('rpms/by-name') Args(1) {
 }
-sub rpm_by_pkid :Chained('distrib_view') PathPart('rpms/by-pkgid') Args(1) {
+sub rpm_by_pkid :Chained('distrib_view') PathPart('by-pkgid') Args(1) {
 }
 
@@ -250 +251 @@
     $c->forward('media_rpms', [ $c->stash->{dist}, $c->stash->{media} ]);
 }
-sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by_name') {
-    my ( $self, $c ) = @_;
-}
-sub media_srpm_byname :Chained('_media_list_rpms') PathPart('srpms/by_name') {
-    my ( $self, $c ) = @_;
-}
-sub media_rpm_bypkgid :Chained('_media_list_rpms') PathPart('rpms/by_pkgid') {
-    my ( $self, $c ) = @_;
+
+sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by-name') {
+    my ( $self, $c ) = @_;
+}
+sub media_srpm_byname :Chained('_media_list_rpms') PathPart('srpms/by-name') {
+    my ( $self, $c ) = @_;
+}
+sub media_rpm_bypkgid :Chained('_media_list_rpms') PathPart('by-pkgid') {
+    my ( $self, $c, $pkgid ) = @_;
+    $c->forward('/rpms/queryformat', [ $pkgid, '%{name}' ]);
 }