[Midnightbsd-cvs] mports: index.cgi: don't drop untested if the user is doing something

[ctriv at midnightbsd.org]

Log Message:
-----------
don't drop untested if the user is doing something tricky in search.

Modified Files:
--------------
    mports/Tools/magus/www/data/magus:
        index.cgi (r1.14 -> r1.15)

-------------- next part --------------
Index: index.cgi
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/index.cgi,v
retrieving revision 1.14
retrieving revision 1.15
diff -L Tools/magus/www/data/magus/index.cgi -L Tools/magus/www/data/magus/index.cgi -u -r1.14 -r1.15
--- Tools/magus/www/data/magus/index.cgi
+++ Tools/magus/www/data/magus/index.cgi
@@ -243,13 +243,15 @@
   $query =~ s/\s*$//;
   $query =~ s/\*/%/g;
     
-  $where{name} = { like => "%$query%" } if $query;
   if ($where{status}) {
     delete $where{status} if grep { m/any/i } @{$where{status}};
-  } else {
+  } elsif (!%where) {
     $where{status} = { '!=', 'untested' };
   }
 
+  $where{name} = { like => "%$query%" } if $query;
+
+
   for (keys %where) {
     delete $where{$_} if m/\W/;
   }