Changeset 129

Timestamp:

12/17/10 03:26:32 (13 years ago)

Author:

nanardon

Message:

• support by dep search on web site

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Search.pm (modified) (6 diffs)
• root/templates/html/search/adv_search.tt (added)
• root/templates/html/search/index.tt (modified) (1 diff, 1 prop)

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

@@ -29 +29 @@
         $c->req->params->{search} = $c->session->{search};
         $c->req->params->{type} = $c->session->{type};
+        $c->req->params->{deptype} = $c->session->{deptype};
     } else {
         $c->session->{search} = $c->req->params->{search};
         $c->session->{type} = $c->req->params->{type};
+        $c->session->{deptype} = $c->req->params->{deptype};
     }
 
@@ -42 +44 @@
             $c->forward('byname', [ $searchspec, $c->req->param('search') ||
                     undef ]);
+            last;
+        };
+        /^bydep$/ and do {
+            $c->forward('bydep', [ $searchspec, $c->req->param('deptype'), grep { $_ } split (/\s+/,
+                        $c->req->param('search') || '') ]);
             last;
         };
@@ -64 +71 @@
 
     }
+}
+
+sub adv_search :Local {
+    my ( $self, $c ) = @_;
 }
 
@@ -288 +299 @@
                     ] }
                     : ()),
-                $distrs
+                ($distrs
                     ? { pkgid => { IN => $distrs->get_column('pkgid')->as_query, }, }
-                    : (),
+                    : ()),
             ]     
         },
@@ -354 +365 @@
                         )->get_column('pkgid')->as_query, }, }
                 : ()),
+            ($searchspec->{pkgid}
+                ? { pkgid => $searchspec->{pkgid} }
+                : ()),
             ]
         },
@@ -381 +395 @@
                 ($distrs 
                     ? (pkgid => { IN => $distrs->get_column('pkgid')->as_query, },)
+                    : ()),
+                ($searchspec->{pkgid}
+                    ? { pkgid => $searchspec->{pkgid} }
                     : ()),
             ],

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

@@ -1 +1 @@
 <!-- $Id$ -->
-<form action="[% c.uri_for('/search') %]" method="POST">
-<input type="text" name="search" value="[% c.req.param('search') | html %]">
-<select name="type">
-<option value="byname">rpm named</option>
-</select>
-<input type="submit">
+<form action="[% c.uri_for('/search') %]" method="POST" id="sophie_adv_search">
+[% INCLUDE 'search/adv_search.tt' %]
 </form>
+[%# c.prototype.observe_form('sophie_adv_search',
+    {
+        url => c.uri_for('/search/adv_search', { ajax => 1 }),
+        update => 'sophie_adv_search',
+        frequency => 5,
+    }) %]
 
 [% INCLUDE 'search/results.tt' %]