Changeset 55

Timestamp:

12/01/10 01:43:14 (14 years ago)

Author:

nanardon

Message:

• rework search

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• Distrib.pm (modified) (6 diffs)
• Search.pm (modified) (11 diffs)

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

@@ -52 +52 @@
 
 sub struct :XMLRPC {
-    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)
-        ->search_related('Release', { version => $release })
-        ->search_related('Arch', { arch => $arch })
-        ->search_related('Medias')->search({}, { order_by => 'label' });
+    my ( $self, $c, $distribution, $release, $arch ) = @_;
+
+    if (!ref $distribution) {
+        $distribution = {
+            distribution => $distribution,
+            release => $release,
+            arch => $arch,
+        }
+    }
+
+    my $rs = $c->forward('distrib_rs', [ $distribution ])
+        ->search({}, { order_by => 'label' });
     $c->stash->{xmlrpc} = [ map { 
         { 
@@ -86 +80 @@
                     ? (name => $distrib->{distribution})
                     : ()
-            }
+            },
         )->search_related('Release',
             {
@@ -105 +99 @@
                     ? (group_label => $distrib->{media_group})
                     : ()),
-            }
+            },
         );
 }
+
 
 sub exists : XMLRPC {
@@ -294 +289 @@
     $c->stash->{dist}{src} = 1;
     ($c->stash->{pkgid}) = @{ $c->forward('/search/bytag',
-        [ $c->stash->{dist}, 'name', $name ]) };
+        [ $c->stash->{dist}, 'name', $name ])->{results} };
     $c->go('/404/index') unless ($c->stash->{pkgid});
     $c->go('/rpms/rpms', [ $c->stash->{pkgid} ]);
@@ -311 +306 @@
     my ( $self, $c, $pkgid ) = @_;
     if ($pkgid) {
-        $c->go('/rpms/rpms', [ $pkgid ]);
+        if (@{ $c->forward('/search/bypkgid', [ $c->stash->{dist}, $pkgid ]) } ) {
+            $c->go('/rpms/rpms', [ $pkgid ]);
+        } else {
+            $c->go('/404/index');
+        }
     } else {
         $c->forward('anyrpms', [ $c->stash->{dist} ]);
@@ -337 +336 @@
     my ( $self, $c, $pkgid ) = @_;
     if ($pkgid) {
-        $c->go('/rpms/rpms', [ $pkgid ]);
+        if (@{ $c->forward('/search/bypkgid', [ $c->stash->{dist}, $pkgid ]) } ) {
+            $c->go('/rpms/rpms', [ $pkgid ]);
+        } else {
+            $c->go('/404/index');
+        }
     } else {
         $c->forward('anyrpms', [ $c->stash->{dist} ]);

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

@@ -72 +72 @@
 }
 
+sub format_search : Private {
+    my ( $self, $c, $searchspec ) = @_;
+
+    my $rs = $c->stash->{rs}->search(
+        {},
+        {
+            page => $searchspec->{page} || 1,
+            rows => $searchspec->{rows} || 10,
+        },
+    );
+
+    if (!$searchspec->{page}) {
+        my $pager = $rs->pager;
+        $c->stash->{xmlrpc} = {
+                pages => $pager->last_page,
+                current_page => $pager->current_page,
+                total_entries => $pager->total_entries,
+                entries_per_page => $pager->entries_per_page,
+        };
+    }
+    $c->stash->{xmlrpc}{results} = [ $rs->get_column('pkgid')->all ];
+}
+
+sub bypkgid : XMLRPCPath('/search/rpm/bypkgid') {
+    my ( $self, $c, $searchspec, $pkgid ) = @_;
+
+    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
+        {
+            -and => [ 
+                (exists($searchspec->{src})
+                    ? { issrc => $searchspec->{src} ? 1 : 0 }
+                    : ()),
+                { pkgid => $pkgid }, 
+                { pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                        ])->get_column('pkgid')->as_query, }, 
+                },
+            ]     
+        },
+    );
+
+    $c->forward('format_search', $searchspec);
+}
+
 sub bytag : XMLRPCPath('/search/rpm/bytag') {
     my ( $self, $c, $searchspec, $tag, $tagvalue ) = @_;
@@ -78 +122 @@
         ->search({ tagname => lc($tag), value => $tagvalue})
         ->get_column('pkgid');
-    $c->stash->{xmlrpc} = [ $c->model('Base')->resultset('Rpms')->search(
+    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
         {
             -and => [ 
@@ -93 +137 @@
             ]     
         },
-        $c->forward('search_param'),
-    )->get_column('pkgid')->all ]
+    );
+    $c->forward('format_search', $searchspec);
 
 }
@@ -114 +158 @@
         }
     )->get_column('pkgid');
-    $c->stash->{xmlrpc} = [ $c->model('Base')->resultset('Rpms')->search(
+    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
         {
             -and => [ 
@@ -129 +173 @@
             ]     
         },
-        $c->forward('search_param'),
-    )->get_column('pkgid')->all ]
+    );
+    $c->forward('format_search', $searchspec);
 }
 
@@ -145 +189 @@
         })
     ->get_column('pkgid');
-    $c->stash->{xmlrpc} = [ $c->model('Base')->resultset('Rpms')->search(
+    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
         {
             -and => [ 
@@ -160 +204 @@
             ]     
         },
-        $c->forward('search_param'),
-    )->get_column('pkgid')->all ]
+    );
+    $c->forward('format_search', $searchspec);
 }
 
@@ -183 +227 @@
                         { '~*' => $name, },
                     },
-                    { pkgid =>
-                        { IN => $deprs->as_query, },
-                    }, ]
+#                    { pkgid =>
+#                        { IN => $deprs->as_query, },
+#                    },
+                     ]
                 },
                 { pkgid =>
@@ -196 +241 @@
     );
     
-    if ($c->req->xmlrpc->method) {
-        $c->stash->{xmlrpc} = [ 
-            $c->stash->{rs}->get_column('pkgid')->all
-        ];
-    }
+    $c->forward('format_search', $searchspec);
 }
 
@@ -230 +271 @@
         },
     );
-    if ($c->req->xmlrpc->method) {
-        $c->stash->{xmlrpc} = [ 
-            $c->stash->{rs}->get_column('pkgid')->all
-        ];
-    }
+    $c->forward('format_search', $searchspec);
 }
 
@@ -265 +302 @@
         },
     );
-    if ($c->req->xmlrpc->method) {
-        $c->stash->{xmlrpc} = [ 
-            $c->stash->{rs}->get_column('pkgid')->all
-        ];
-    }
+    $c->forward('format_search', $searchspec);
 }