Changeset 931 for trunk

Timestamp:

10/21/22 12:48:30 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix a few minor glitches falling out from r930

File:

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

trunk/cgi-bin/search.cgi

@@ -237 +237 @@
       # Show any blocks with the leading octet(s) and that masklength
       # Need some more magic for bare /nn searches:
-      $sql .= " $sqlconcat ($sqlbase WHERE $webvar{cidrexclude} (masklen(s.cidr) = ?";
+      $sql .= " $sqlconcat ($sqlbase WHERE $webvar{cidrexclude} (masklen(s.cidr)) = ?";
       push @bindargs, $maskbits;
       if ($net ne '') {
         $sql .= " AND text(s.cidr) LIKE ?";
-        push @bindargs, $net;
+        push @bindargs, "$net%";
       }
-      $sql .= "))";
+      $sql .= ")";
     }
   } elsif ($webvar{cidr} =~ /^(\d{1,3}\.){3}\d{1,3}$/) {
@@ -270 +270 @@
   } else {
     # Add the limit/offset clauses
-    $sql .= " ORDER BY s.cidr";
+    # note ORDER BY needs to NOT reference the table alias s as in $sqlbase because Reasons
+    $sql .= " ORDER BY cidr";
     $sql .= " LIMIT $RESULTS_PER_PAGE OFFSET $offset" if $RESULTS_PER_PAGE != 0;
     # And tell the user.