Changeset 462

Timestamp:

08/01/12 13:46:00 (12 years ago)

Author:

nanardon

Message:

Merge branch 'fixfile'

Files:

• tools/trunk/MANIFEST (modified) (2 diffs)
• tools/trunk/bin/sophie (added)
• tools/trunk/lib/Sophie/Client.pm (modified) (2 diffs)
• tools/trunk/lib/Sophie/Client/Function.pm (added)
• tools/trunk/lib/Sophie/Client/Functions (added)
• tools/trunk/lib/Sophie/Client/Functions/Help.pm (added)
• web/lib/Sophie/Controller/Search.pm (modified) (1 diff)
• web/lib/Sophie/Controller/Search/File.pm (modified) (3 diffs)
• web/lib/Sophie/Controller/Sources.pm (modified) (1 diff)

tools/trunk/MANIFEST

@@ -4 +4 @@
 README
 bin/sophie-notify
+bin/sophie
 bin/sophie-rpm
 bin/sophie-rpm2
@@ -12 +13 @@
 lib/Sophie/Client/Transaction.pm
 lib/Sophie/Client.pm
+lib/Sophie/Client/Functions/Help.pm
 sophie-tools.spec.in
 sysinit/sophie-notify

tools/trunk/lib/Sophie/Client.pm

@@ -6 +6 @@
 use RPC::XML;
 use base qw(RPC::XML::Client);
-use Sophie::Client::Transaction;
 $RPC::XML::FORCE_STRING_ENCODING = 1;
 
@@ -71 +70 @@
 }
 
-sub ts {
-    my ($self, $distrib) = @_;
-    return Sophie::Client::Transaction->new($self, $distrib);
-}
-
 1;
 

web/lib/Sophie/Controller/Search.pm

@@ -266 +266 @@
 }
 
+sub file_md5_rs : Private {
+    my ( $self, $c, $searchspec, $md5) = @_;
+    $searchspec ||= {};
+
+    $md5 or return;
+
+    my $rs = $c->model('Base::Files')->search(
+        {
+            -and => [
+                md5 => $md5,
+                ($searchspec->{content} ? { has_content => 1 } : ()),
+                ($searchspec->{pkgid}
+                    ? { 'pkgid' => { IN => $searchspec->{pkgid} } }
+                    : ()),
+            ],
+        },
+        {
+            '+select' => [
+                'contents is NOT NULL as has_content',
+                { rpmfilesmode => 'mode' },
+            ],
+            '+as' => [ qw(has_content perm), ]
+        }
+    );
+    if (exists($searchspec->{src})) {
+        $rs = $rs->search_related('Rpms',
+            { issrc => $searchspec->{src} ? 1 : 0 }
+        )
+    }
+    return $c->model('BaseSearch')->apply_rpm_filter($rs, $searchspec);
+}
+
 sub end : Private {
     my ($self, $c, $searchspec) = @_;

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

@@ -18 +18 @@
 
 
-=head2 index
-
-=cut
-
 sub index :Path :Args(0) {
     my ( $self, $c ) = @_;
@@ -27 +23 @@
     $c->response->body('Matched Sophie::Controller::Search::File in Search::File.');
 }
+
+
+=head2 byname [ searchspec, Filename ]
+
+Return the list of file named C<Filename> where filename can be:
+
+=over 4
+
+=item the complete path F</usr/bin/perl>
+
+=item the basename F<perl>
+
+=item the basename with the end of the path (bin/perl).
+
+=back
+
+=cut
 
 sub byname : Private {
@@ -52 +65 @@
 }
 
+=head2 byname [ searchspec, Md5sum ]
+
+Return the list of file having content checksum equal to C<Md5sum>
+
+=cut
+
+sub bymd5 : Private {
+    my ( $self, $c, $searchspec, $md5) = @_;
+    $searchspec ||= {};
+
+    my @col = qw(dirname basename md5 size pkgid count);
+    $c->stash->{column} = [ @col, qw(has_content perm user group) ];
+
+    $c->stash->{xmlrpc} = [
+       map { { $_->get_columns } }
+       $c->forward('/search/file_md5_rs', [ $searchspec, $md5 ])->all
+    ];
+}
+
+sub bymd5_rpc : XMLRPCPath('bymd5') {
+    my ( $self, $c, $searchspec, $md5) = @_;
+    $searchspec ||= {};
+
+    $c->stash->{rs} = $c->forward('/search/file_md5_rs', [ $searchspec, $md5 ]);
+    
+    my @col = qw(dirname basename md5 size pkgid count);
+    $c->stash->{column} = [ @col, qw(has_content perm user group) ];
+    
+}
 
 =head1 AUTHOR

web/lib/Sophie/Controller/Sources.pm

@@ -87 +87 @@
         }
         
-        $c->model('Base::Rpms')
-        ->search(
-            { 
-                name => $name,
-                issrc => 1,
-                $rpmrs
-                    ? (pkgid => { IN => $rpmrs->get_column('pkgid')->as_query },)
-                    : (),
-            },
-            {
-                select => [ 'evr' ],
-            }
-        )->search_related('SrcFiles')->search(
+        $c->model('Base::SrcFiles')->search(
             {
                 has_content => 1,
                 basename => $filename,
+                ($rpmrs
+                    ? ('me.pkgid' => { IN => $rpmrs->get_column('pkgid')->as_query },)
+                    : ()),
+                ($name
+                    ? ('me.pkgid' => { IN => $c->model('Base::Rpms')->search(
+                                { name => $name }, { select => ['Rpms.pkgid'] })
+                                ->get_column('pkgid')->as_query })
+                    : ()),
             },
             {
-                    '+columns' => [ qw(me.evr) ],
+                    '+columns' => [ qw(Rpms.evr) ],
                     order_by => [ 'evr using >>' ],
+                    join => [ 'Rpms' ],
             }
         )->all ];