Changeset 460 for web

Timestamp:

07/30/12 01:04:22 (12 years ago)

Author:

nanardon

Message:

• various DBIx::Class fixes

Location:

web

Files:

• lib/Sophie/Base/Result/Paths.pm (modified) (1 diff)
• lib/Sophie/Base/Result/RpmFile.pm (modified) (1 diff)
• lib/Sophie/Controller/Login.pm (modified) (3 diffs)
• lib/Sophie/Controller/Rpms.pm (modified) (6 diffs)
• lib/Sophie/Controller/Search.pm (modified) (2 diffs)
• lib/Sophie/Controller/Search/Rpm.pm (modified) (2 diffs)
• lib/Sophie/Controller/Search/Rpms.pm (modified) (3 diffs)
• lib/Sophie/Controller/Sources.pm (modified) (2 diffs)
• t/controller_Rpms.t (modified) (1 diff)

web/lib/Sophie/Base/Result/Paths.pm

@@ -14 +14 @@
 __PACKAGE__->belongs_to('MetaPaths' => 'Sophie::Base::Result::MetaPaths', 'meta_path');
 __PACKAGE__->has_many(MediasPaths => 'Sophie::Base::Result::MediasPaths', 'd_path');
-__PACKAGE__->has_many(Rpmfiles => 'Sophie::Base::Result::RpmFile', 'd_path');
+__PACKAGE__->has_many(Rpmfile => 'Sophie::Base::Result::RpmFile', 'd_path');
 
 

web/lib/Sophie/Base/Result/RpmFile.pm

@@ -8 +8 @@
 __PACKAGE__->add_columns(qw/d_path filename pkgid added mtime size/);
 __PACKAGE__->set_primary_key(qw/d_path filename/);
-__PACKAGE__->belongs_to(Path => 'Sophie::Base::Result::Paths', 'd_path');
+__PACKAGE__->belongs_to(Paths => 'Sophie::Base::Result::Paths', 'd_path');
 __PACKAGE__->belongs_to(Rpms => 'Sophie::Base::Result::Rpms', 'pkgid');
 

web/lib/Sophie/Controller/Login.pm

@@ -41 +41 @@
             if ($c->req->xmlrpc->is_xmlrpc_request) {
                 $c->error('invalid login / password');
+            } else {
+                $c->stash->{error} = 'Invalid login / password';
             }
         }
@@ -51 +53 @@
 }
 
-sub logout :Local {
-    my ($self, $c) = @_;
+sub create_request : Private {
+    my ($self, $c, $mail) = @_;
 
-    $c->logout;
+    my $valid_code = join('', map { printf("%02x", rand(256)) } (0 .. 15));
+
+    $c->model('Base::AccountRequest')->create({
+            mail => $mail,
+            valid_code => $valid_code,
+    });
 }
 
@@ -81 +88 @@
     $c->stash->{valid} = "$aa + $bb";
     $c->session->{valid_create_user} = $aa + $bb;
-
 }
 

web/lib/Sophie/Controller/Rpms.pm

@@ -249 +249 @@
             { 
                 order_by => [ 'count' ],
-                select => [ 'rpmsenseflag("flags")', qw(depname flags evr) ],
+                select => [ \[ 'rpmsenseflag("flags")' ], qw(depname flags evr) ],
                 as => [ qw'sense depname flags evr' ],
 
@@ -411 +411 @@
             { 
                 order_by => [ 'count' ],
-                select => [ 'rpmsenseflag("flags")',
-                    qw(depname flags evr deptype) ],
+                select => [
+                    \[ 'rpmsenseflag("flags")' ],
+                    qw(depname flags evr deptype)
+                ],
                 as => [ qw'sense depname flags evr deptype' ],
 
@@ -457 +459 @@
             },
             { 
-                'select' => [ 'contents is NOT NULL as has_content', 'rpmfilesmode(mode) as perm', @col, '"group"',
-                    '"user"' ],
+                'select' => [ 
+                    \[ 'contents is NOT NULL as has_content' ],
+                    \[ 'rpmfilesmode(mode) as perm' ],
+                    @col, '"group"', '"user"'
+                ],
                 as => [ qw(has_content perm), @col, 'group', 'user' ],
                 order_by => [ 'dirname', 'basename' ],
@@ -530 +535 @@
             { 
                 select => [ 
-                    qq{rpmquery("header", ?)},
-                    qq{rpmquery("header", ?)},
+                    \[ qq{rpmquery("header", ?)} ],
+                    \[ qq{rpmquery("header", ?)} ],
                 ],
                 as => [ qw(script prog) ],
@@ -546 +551 @@
             { 
                 select => [ 
-                    qq{rpmquery("header", ?)},
-                    qq{rpmquery("header", ?)},
-                    qq{rpmquery("header", ?)},
-                    qq{rpmsenseflag(rpmquery("header", ?)::int)},
-                    qq{rpmquery("header", ?)},
+                    \[ qq{rpmquery("header", ?)} ],
+                    \[ qq{rpmquery("header", ?)} ],
+                    \[ qq{rpmquery("header", ?)} ],
+                    \[ qq{rpmsenseflag(rpmquery("header", ?)::int)} ],
+                    \[ qq{rpmquery("header", ?)} ],
                 ],
                 as => [ qw(script prog name sense version) ],
@@ -580 +585 @@
         map {
         {
-            distribution => $_->get_column('name'),
-            dist => $_->get_column('shortname'),
-            release => $_->get_column('version'),
-            arch => $_->get_column('arch'), 
-            media => $_->get_column('label'),
-            media_group => $_->get_column('group_label'),
-        }
-        }
-        $c->forward('/distrib/distrib_rs', [ {} ])
+            distribution => ($_->Arch->Release->Distribution->name || undef),
+            dist => ($_->Arch->Release->Distribution->shortname || undef),
+            release => ($_->Arch->Release->version || undef),
+            arch => ($_->Arch->arch || undef),
+            media => ($_->label || undef),
+            media_group => ($_->group_label || undef),
+        }
+        } $c->model('Base')->resultset('RpmFile')->search(
+            { pkgid => $pkgid },
+        )->search_related('Paths')
          ->search_related('MediasPaths')
-                 ->search_related('Paths')
-        ->search_related('Rpmfiles',
-            { pkgid => $pkgid },
-            {
-                select => [ qw(shortname name version arch label group_label) ],
-                order_by => [ qw(name version arch label) ],
-            }
-        )->all ]
+         ->search_related('Medias', {},
+             {
+                 select => [ qw() ],
+                 prefetch => {
+                     Arch => { Release => 'Distribution' }
+                 }
+             }
+         )->all ]
+
 }
 

web/lib/Sophie/Controller/Search.pm

@@ -105 +105 @@
             ->search_related('MediasPaths')
             ->search_related('Paths')
-            ->search_related('Rpmfiles');
+            ->search_related('Rpmfile');
         } else {
             return;
@@ -197 +197 @@
             { depname => $depname },
             ($depsense
-                ? ({-nest => \[
+                ? (\[
                     'rpmdepmatch(flags, me.evr, rpmsenseflag(?), ?)',
                     [ plain_text => $depsense],
                     [ plain_text => $depevr ]
-                ]})
+                ])
             : ()),
             ($searchspec->{pkgid}

web/lib/Sophie/Controller/Search/Rpm.pm

@@ -227 +227 @@
     $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
         {
-            -nest => \[
-                    "to_tsvector('english', description) @@ to_tsquery(?)",
-                    [ plain_text => $tsquery],
-                ],
+            -and => [
+                \[ "to_tsvector('english', description) @@ to_tsquery(?)",
+                    [ plain_text => $tsquery ] ],
                 (exists($searchspec->{src})
                     ? (issrc => $searchspec->{src} ? 1 : 0)
@@ -237 +236 @@
                     ? (pkgid => { IN => $distrs->get_column('pkgid')->as_query, },)
                     : ()),
+            ]
         },
         {
             select => [ 
-                "ts_rank_cd(to_tsvector('english', description),to_tsquery(?)) as rank",
-                'pkgid'
+                \[ "ts_rank_cd(to_tsvector('english', description),to_tsquery(?)) as rank" ],
+               'pkgid'
             ],
             bind => [ $tsquery ], 

web/lib/Sophie/Controller/Search/Rpms.pm

@@ -35 +35 @@
         ->search_related('MediasPaths')
         ->search_related('Paths')
-        ->search_related('Rpmfiles',
+        ->search_related('Rpmfile',
             {
                 pkgid => {
@@ -56 +56 @@
                 as => [qw(filename pkgid distribution dist release arch media) ],
                 rows => $searchspec->{rows} || 30000,
-                order_by => [ 'Rpmfiles.added desc' ],
+                order_by => [ 'Rpmfile.added desc' ],
             },
         );
@@ -147 +147 @@
 
     $c->stash->{rs} = $c->forward('rpms_rs')->search(
-        \[ "Rpmfiles.added > '1970-01-01'::date + ?::interval",
+        \[ "Rpmfile.added > '1970-01-01'::date + ?::interval",
             [ plain_text => "$date seconds" ],
         ]

web/lib/Sophie/Controller/Sources.pm

@@ -56 +56 @@
         }
         
-        $c->model('Base::Rpms')
+        $c->model('Base::SrcFiles')
         ->search(
             { 
@@ -66 +66 @@
             },
             {
-                select => [ 'evr' ],
-            }
-        )->search_related('SrcFiles')->search(
-            {
-                #has_content => 1,
-            },
-            {
-                    select => [ 'basename', 'evr', 'SrcFiles.pkgid' ],
-                    group_by => [ 'basename', 'evr', 'SrcFiles.pkgid' ],
+                    select => [ 'basename', 'Rpms.evr', 'pkgid' ],
+                    group_by => [ 'basename', 'evr', 'me.pkgid' ],
                     order_by => [ 'evr using >>', 'basename' ],
+                    join => [ 'Rpms' ],
             }
         )->all ];

web/t/controller_Rpms.t

@@ -16 +16 @@
 ok( request("/rpms/$pkgid/changelog")->is_success, 'Request a pkgid/changelog should succeed' );
 ok( request("/rpms/$pkgid/location")->is_success, 'Request a pkgid/location should succeed' );
+ok( request("/rpms/$pkgid/scriptlet")->is_success, 'Request a pkgid/scriptlet should succeed' );
 
 ok( xmlrequest_ok('rpms.basicinfo', $pkgid), 'XMLRPC rpms.basicinfo' );