Changeset 346

Timestamp:

01/25/11 00:48:32 (13 years ago)

Author:

nanardon

Message:

• add management functions for metapath

Location:

server/trunk/web/lib/Sophie

Files:

• Base/Result/Arch.pm (modified) (1 diff)
• Base/Result/MetaPaths.pm (modified) (1 diff)
• Controller/Admin.pm (modified) (3 diffs)

server/trunk/web/lib/Sophie/Base/Result/Arch.pm

@@ -10 +10 @@
 __PACKAGE__->belongs_to(Release => 'Sophie::Base::Result::Release', 'd_release');
 __PACKAGE__->has_many(Medias => 'Sophie::Base::Result::Medias', 'd_arch');
+__PACKAGE__->has_many(MetaPaths => 'Sophie::Base::Result::MetaPaths', 'd_arch');
 
 1;

server/trunk/web/lib/Sophie/Base/Result/MetaPaths.pm

@@ -10 +10 @@
 __PACKAGE__->belongs_to(Archs => 'Sophie::Base::Result::Arch', 'd_arch');
 __PACKAGE__->has_many(Paths => 'Sophie::Base::Result::Paths', 'meta_path');
+__PACKAGE__->add_unique_constraint('upath' => [ 'd_arch', 'path', 'type' ]);
 
 1;

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

@@ -129 +129 @@
         ->search_related('Medias', $media ? (label => $media) : ())
         ->search_related('MediasPaths')
-        ->search_related('Paths')->get_column('path')
+        ->search_related('Paths', { meta_path => undef })->get_column('path')
         ->all ];
+}
+
+sub list_meta_path :XMLRPC {
+    my ($self, $c, $distribution, $version, $arch, $media) = @_;
+    
+    if (ref $distribution) {
+        ($distribution, $version, $arch, $media) = 
+        (
+            $distribution->{distribution},
+            $distribution->{release},
+            $distribution->{arch},
+            $version,
+        );
+    }
+
+    $c->stash->{xmlrpc}  = [
+    $c->model('Base')->resultset('Distribution')
+        ->search($distribution ? (name => $distribution) : ())
+        ->search_related('Release', $version ? (version => $version) : ())
+        ->search_related('Arch', $arch ? (arch => $arch) : ())
+        ->search_related('MetaPaths')
+        ->get_column('path')->all ];
 }
 
@@ -272 +294 @@
     }
 
+    $ref->{metapath} = [ map { { $_->get_columns } }
+        $c->model('Base')->resultset('Distribution')
+        ->search({ name => $distribution->{distribution} })
+        ->search_related('Release', { version => $distribution->{release} })
+        ->search_related('Arch', { arch => $distribution->{arch} })
+        ->search_related('MetaPaths')
+        ->search({}, 
+            { 
+                'select' => [ qw(path type) ], 
+                'as'     => [ qw(path type) ] ,
+            }
+        )->all ];
+
     $c->stash->{xmlrpc} = freeze($ref);
+}
+
+sub add_meta_path : XMLRPC {
+    my ($self, $c, $distrib, $meta, $type) = @_;
+
+    my ($dist) = 
+        $c->model('Base')->resultset('Distribution')
+        ->search(name => $distrib->{distribution})
+        ->search_related('Release', version => $distrib->{release})
+        ->search_related('Arch', arch => $distrib->{arch})
+        ->get_column('d_arch_key')->all or do {
+            return $c->stash->{xmlrpc} = "No such distrib";
+        };
+
+    if ($c->model('Base::MetaPaths')->find_or_create(
+        {
+            d_arch => $dist,
+            type => $type,
+            path => $meta,
+        },
+        { key => 'upath' },
+    )) {
+        return $c->stash->{xmlrpc} = 'OK';
+    } else {
+        return;
+    }
+
 }
 
@@ -323 +385 @@
         }
     }
+    foreach my $meta (@{ $ref->{metapath} || []}) {
+        $c->forward('add_meta_path', 
+            [ $ref->{distrib}, $meta->{path}, $meta->{type} ]);
+    }
 
     #$c->model('Base')->storage->dbh->rollback;