Changeset 307 for branches/stable

Timestamp:

02/14/06 12:44:32 (18 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Bugfix for slightly broken "bare /nn" search

File:

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

branches/stable/cgi-bin/search.cgi

@@ -140 +140 @@
   ## CIDR query options.
   $webvar{cidr} =~ s/\s+//;     # Hates the nasty spaceseseses we does.
-  if ($webvar{cidr} == '') { # We has a blank CIDR.  Ignore it.
+  if ($webvar{cidr} eq '') { # We has a blank CIDR.  Ignore it.
   } elsif ($webvar{cidr} =~ /\//) {
     # 209.91.179/26 should show all /26 subnets in 209.91.179
@@ -152 +152 @@
       # Partial match;  beginning of subnet and maskbits are provided
       # Show any blocks with the leading octet(s) and that masklength
+      # Need some more magic for bare /nn searches:
+      my $condition = ($net eq '' ?
+        "masklen(cidr)=$maskbits" : "text(cidr) like '$net%' and masklen(cidr)=$maskbits");
       $sql .= " $sqlconcat (select $cols from searchme where $webvar{cidrexclude} ".
-        "(text(cidr) like '$net%' and masklen(cidr)=$maskbits))";
+        "($condition))";
     }
   } elsif ($webvar{cidr} =~ /^(\d{1,3}\.){3}\d{1,3}$/) {