Changeset 48

Timestamp:

11/29/10 04:59:48 (14 years ago)

Author:

nanardon

Message:

• make search functions availlable via json

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Search.pm (modified) (3 diffs)
• root/templates/html/search/results.tt (modified) (1 diff)
• root/templates/includes/header.tt (modified) (1 diff)

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

@@ -27 +27 @@
 
     if ($c->req->param('page')) {
-        $c->req->params->{search} = $c->session->{search};
+        $c->req->params->{search} ||= $c->session->{search};
     }
 
@@ -35 +35 @@
         my $pager = $c->stash->{rs}->pager;
         $c->stash->{pager} = $pager;
-        $c->stash->{xmlrpc} = [
-            $c->stash->{rs}->get_column('pkgid')->all
-        ];
+        $c->stash->{xmlrpc} = {
+            results => [ $c->stash->{rs}->get_column('pkgid')->all ],
+            pages => $pager->last_page,
+            current_page => $pager->current_page,
+            total_entries => $pager->total_entries,
+            entries_per_page => $pager->entries_per_page,
+        };
     }
 }
@@ -54 +58 @@
     if (!$c->req->xmlrpc->method) {
         $r->{page} = $c->req->param('page') || 1;
-        $r->{rows} = 20;
+        $r->{rows} = $c->req->param('rows') || 15;
     }
     return $r;

server/trunk/web/root/templates/html/search/results.tt

@@ -17 +17 @@
 </p>
 
-[% FOREACH pkgid = xmlrpc %]
+[% FOREACH pkgid = xmlrpc.results %]
 [% info = c.forward('/rpms/info', [ pkgid ]) %]
 <p><a href="[% c.uri_for('/rpms', pkgid) %]">[% info.name %]-[% info.version

server/trunk/web/root/templates/includes/header.tt

@@ -28 +28 @@
         </p>
     </div>
-    <div style="clear:both"></div>
     <div style="float: right">
+        Search:<br>
         [% INCLUDE 'search/simple_search.tt' %]
     </div>