Changeset 370 for trunk/cgi-bin/search.cgi

Timestamp:

11/27/07 12:18:27 (17 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge bugfixes and enhancements from /branches/stable r351 through r359

File:

• trunk/cgi-bin/search.cgi (modified) (3 diffs)

trunk/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: );