Changeset 5

Timestamp:

11/18/10 23:29:45 (14 years ago)

Author:

nanardon

Message:

• reverse sort of rpms to add new rpm before removing old
• trap error

Location:

web/trunk

Files:

• lib/Sophie/Base.pm (modified) (1 diff)
• lib/Sophie/Base/Result/Medias.pm (modified) (1 diff)
• lib/Sophie/Base/RpmsPath.pm (modified) (3 diffs)
• lib/Sophie/Controller/Distrib.pm (modified) (8 diffs)
• lib/Sophie/Controller/Search.pm (added)
• t/controller_Search.t (added)

web/trunk/lib/Sophie/Base.pm

@@ -25 +25 @@
        {
            AutoCommit => 0,
+           PrintError => 1,
        }
    ); 

web/trunk/lib/Sophie/Base/Result/Medias.pm

@@ -6 +6 @@
 
 __PACKAGE__->table('d_media');
-__PACKAGE__->add_columns(qw/d_media_key label comment group_label d_arch/);
+__PACKAGE__->add_columns(
+    qw/d_media_key label comment group_label d_arch dist_label/
+);
 __PACKAGE__->set_primary_key('d_media_key');
 __PACKAGE__->belongs_to(Arch => 'Sophie::Base::Result::Arch', 'd_arch');

web/trunk/lib/Sophie/Base/RpmsPath.pm

@@ -70 +70 @@
     }
 
-    foreach my $rpm (sort keys %list) {
+    foreach my $rpm (sort { $b cmp $a } keys %list) {
         if ($localrpms->{$rpm} && $baserpms->{$rpm}) {
             # nothing to do
@@ -109 +109 @@
     my ($self, $rpm) = @_;
 
-    my $header = RPM4::Header->new($self->path . '/' . $rpm) or do {
+    my $header;
+    eval {
+        $header = RPM4::Header->new($self->path . '/' . $rpm) 
+    };
+    $header or do {
         warn "Cannot read " . $self->path . '/' . $rpm;
         return;
@@ -128 +132 @@
     my $tmp = File::Temp->new( UNLINK => 1, SUFFIX => '.hdr' );
     unlink($tmp->filename);
-    $header->write($tmp);
+    $header->write($tmp, 0);
     seek($tmp, 0, 0);
     my $string = '';

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

@@ -18 +18 @@
 
 sub list :XMLRPC {
-    my ( $self, $c, $distribution, $release ) = @_;
-    $c->session->{toto} = 1; 
+    my ( $self, $c, $distrib, $release, $arch ) = @_;
+
+    my $distribution;
+    if (ref $distrib) {
+        ($distribution, $release, $arch) = (
+            $distrib->{distribution},
+            $distrib->{release},
+            $distrib->{arch},
+        );
+    } else {
+        $distribution = $distrib;
+    }
+
     my $rs = $c->model('Base')->resultset('Distribution');
     if (!$distribution) {
@@ -31 +42 @@
     }
     $rs = $rs->search(version => $release)->search_related('Arch');
-    @{$c->stash->{xmlrpc}} = map { $_->arch } $rs->all;
+    if (!$arch) {
+        @{$c->stash->{xmlrpc}} = map { $_->arch } $rs->all;
+        return;
+    }
+    $rs = $rs->search(arch => $arch)->search_related('Medias');
+    @{$c->stash->{xmlrpc}} = map { $_->label } $rs->all;
+
 }
 
 sub struct :XMLRPC {
-    my ( $self, $c, $distribution, $release, $arch ) = @_;
+    my ( $self, $c, $distrib, $release, $arch ) = @_;
+
+    my $distribution;
+    if (ref $distrib) {
+        ($distribution, $release, $arch) = (
+            $distrib->{distribution},
+            $distrib->{release},
+            $distrib->{arch},
+        );
+    } else {
+        $distribution = $distrib;
+    }
+
     my $rs = $c->model('Base')->resultset('Distribution')
         ->search(name => $distribution)
@@ -43 +72 @@
     @{$c->stash->{xmlrpc}} = map { 
         { 
+            dist_label => $_->dist_label,
             label => $_->label,
             group_label => $_->group_label,
@@ -79 +109 @@
     my ( $self, $c, $distribution, $release, $arch ) = @_;
     $c->stash->{distrib} = [ $distribution, $release, $arch ];
-    warn @{$c->req->args};
 }
 
@@ -143 +172 @@
 }
 
+sub list_rpms :Chained('distrib_view') PathPart('rpms') {
+    my ( $self, $c ) = @_;
+    $c->forward('rpms', $c->stash->{distrib});
+}
+
+sub list_srpms :Chained('distrib_view') PathPart('srpms') {
+    my ( $self, $c ) = @_;
+    $c->forward('srpms',    $c->stash->{distrib});
+}
+
+sub srpm_by_name :Chained('distrib_view') PathPart('srpms/by-name') Args(1) {
+}
+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 media_rpms : XMLRPC {
-    my ( $self, $c, $media_key ) = @_;
+    my ( $self, $c, $distribution, $release, $arch, $media ) = @_;
     @{$c->stash->{rpm}} = map {
             { 
@@ -152 +198 @@
         }
         $c->model('Base')
-        ->resultset('Medias')->search({ d_media_key => $media_key })
+        ->resultset('Distribution')->search({ name => $distribution })
+        ->search_related('Release', { version => $release })
+        ->search_related('Arch',    { arch => $arch })
+        ->search_related('Medias', { label => $media })
         ->search_related('MediasPaths')
         ->search_related('Paths')
@@ -160 +209 @@
 }
 
-
-sub list_rpms :Chained('distrib_view') PathPart('rpms') {
-    my ( $self, $c ) = @_;
-    $c->forward('rpms',    $c->stash->{distrib});
-}
-
-sub list_srpms :Chained('distrib_view') PathPart('srpms') {
-    my ( $self, $c ) = @_;
-    $c->forward('srpms',    $c->stash->{distrib});
-}
-
-sub srpm_by_name :Chained('distrib_view') PathPart('srpms/by-name') Args(1) {
-}
-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 _media_list_rpms :Chained('distrib_view') PathPart('media') CaptureArgs(1) {
     my ( $self, $c, $media ) = @_;
@@ -185 +216 @@
 sub media_list_rpms :Chained('_media_list_rpms') PathPart('') {
     my ( $self, $c ) = @_;
-    $c->forward('media_rpms', [ $c->stash->{media} ]);
+    $c->forward('media_rpms', [ @{$c->stash->{distrib}}, $c->stash->{media} ]);
 }
 sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by_name') {