Changeset 357 for branches/stable

Timestamp:

02/14/07 13:03:31 (18 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Tweak complex search to allow more results on a single page, or all on
one page if *really* wanted.

Location:

branches/stable

Files:

• cgi-bin/search.cgi (modified) (3 diffs)
• compsearch.html (modified) (1 diff)

branches/stable/cgi-bin/search.cgi

@@ -40 +40 @@
 my %webvar = parse_post();
 cleanInput(\%webvar);
+
+if (defined($webvar{rpp})) {
+  ($RESULTS_PER_PAGE) = ($webvar{rpp} =~ /(\d+)/);
+}
 
 if (!defined($webvar{stype})) {
@@ -185 +189 @@
   } else {
     # Add the limit/offset clauses
-    $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
+    $sql .= " order by cidr";
+    $sql .= " limit $RESULTS_PER_PAGE offset $offset" if $RESULTS_PER_PAGE != 0;
     # And tell the user.
     print "<div class=heading>Searching...............</div>\n";
@@ -420 +425 @@
 
   # print the page thing..
-  if ($rowCount > $RESULTS_PER_PAGE) {
+  if ($RESULTS_PER_PAGE > 0 && $rowCount > $RESULTS_PER_PAGE) {
     my $pages = ceil($rowCount/$RESULTS_PER_PAGE);
     print qq(<div class="center"> Page: );

branches/stable/compsearch.html

@@ -6 +6 @@
 <td colspan=2>Match on:<input type=radio checked name=which value="all">All
 <input type=radio name=which value="any">Any
-<td colspan=2 align=right><input type=submit value="Search Now"></td>
+<td>Results per page: <select name=rpp>
+<option value='25'>25</option>
+<option value='50'>50</option>
+<option value='100'>100</option>
+<option value='200'>200</option>
+<option value='0'>Show all</option>
+</select>
+<td align=right><input type=submit value="Search Now"></td>
 </td>
 <tr class="color1">