Changeset 134 for server/trunk/web

Timestamp:

12/18/10 17:28:09 (13 years ago)

Author:

nanardon

Message:

• add search by file

Location:

server/trunk/web

Files:

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

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

@@ -42 +42 @@
     for ($c->req->param('type')) {
         /^byname$/ and do {
+            $c->stash->{sargs} = [ {}, $c->req->param('search') ];
             $c->forward('byname', [ $searchspec, $c->req->param('search') ||
                     undef ]);
@@ -47 +48 @@
         };
         /^bydep$/ and do {
-            $c->forward('bydep', [ $searchspec, $c->req->param('deptype'), grep { $_ } split (/\s+/,
-                        $c->req->param('search') || '') ]);
+            my @args = ($c->req->param('deptype'), grep { $_ }
+                split(/\s+/, $c->req->param('search') || '' ));
+            $c->stash->{sargs} = [ {}, @args ],
+            $c->forward('bydep', [ $searchspec, @args ]);
+            last;
+        };
+        /^byfile$/ and do {
+            my @args = ($c->req->param('search') || '');
+            $c->stash->{sargs} = [ {}, @args ],
+            $c->forward('byfile', [ $searchspec, @args ]);
             last;
         };
@@ -450 +459 @@
     $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
         {
-            $distrs
-                ? { pkgid => { IN => $distrs->get_column('pkgid')->as_query, }, }
-                : (),
+            pkgid => { IN => $filers->as_query, },
         },
     );

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

@@ -1 +1 @@
 <!-- $Id$ -->
+<table border="1">
+<tr>
+    <td></td>
+    <td>
+<input type="text" name="search" value="[% c.req.param('search') | html %]">
+    </td>
+</tr>
+<tr>
+    <td>
+    </td>
+    <td>
 <select name="type" OnChange="
     if (value == 'bydep') {
-        document.getElementById('deptype').style.display = '';
+        document.getElementById('deptype').style.visibility = '';
     } else {
-        document.getElementById('deptype').style.display = 'none';
+        document.getElementById('deptype').style.visibility = 'hidden';
     }
 ">
 <option value="byname"[% " selected=selected" IF c.req.param('type') == 'byname' %]>rpm named</option>
-<option value="bydep"[% " selected=selected" IF c.req.param('type') == 'bydep'
-%]>dependency match</option>
+<option value="bydep"[% " selected=selected" IF c.req.param('type') == 'bydep' %]>dependency match</option>
+<option value="byfile"[% " selected=selected" IF c.req.param('type') == 'byfile' %]>File</option>
 </select>
-<input type="text" name="search" value="[% c.req.param('search') | html %]">
-<span id="deptype" style="[% 'display:none;' IF c.req.param('type') != 'bydep' %]">
-Dep type:
+    </td>
+</tr>
+<tr>
+<td>
+</td>
+<td>
+<span id="deptype" style="[% 'visibility:hidden;' IF c.req.param('type') != 'bydep' %]">
 <select id="deptype" name="deptype">
-    <option value="P">Provides</option>
-    <option value="R">Requires</option>
+    <option value="P"[% " selected=selected" IF c.req.param('deptype') == 'P' %]>Provides</option>
+    <option value="R"[% " selected=selected" IF c.req.param('deptype') == 'R' %]>Requires</option>
 </select>
 </span>
+</td>
+</tr>
+<tr>
+<td></td>
+<td>
 <input type="submit">
+</td>
+</tr>
+</table>

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

@@ -30 +30 @@
 [% info.summary | guessencode | html %]
 </p>
+
+[%# Depending the search, we have to perform a quick search per package to show
+result detail %]
+[% IF c.req.param('type') == 'bydep' %]
+[% sargs.0.pkgid = pkgid %]
+<ul>
+[% FOREACH dep = c.forward('/search/dep_search', sargs).results %]
+<li>[% dep.name | html %] [% dep.sense | html %] [% dep.evr | html %]</li>
+[% END %]
+</ul>
+[% END %]
+
+[% IF c.req.param('type') == 'byfile' %]
+[% sargs.0.pkgid = pkgid %]
+<ul class="filename">
+[% FOREACH file = c.forward('/search/file_search', sargs).results %]
+<li>[% file.dirname | html -%][%- file.basename | html %]</li>
+[% END %]
+</ul>
+[% END %]
+
 </div>
 [% END %]