Changeset 351

Timestamp:

10/06/06 12:23:39 (18 years ago)

Author:

Kris Deugau

Message:

/trunk

Backport bugfixes from r303, r307, r309, r318, r319, and r323
(search.cgi)

File:

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

trunk/cgi-bin/search.cgi

@@ -37 +37 @@
 
 # Global variables
-my $RESULTS_PER_PAGE = 10;
+my $RESULTS_PER_PAGE = 25;
 my %webvar = parse_post();
 cleanInput(\%webvar);
@@ -105 +105 @@
 
   # First chunk of SQL.  Filter on custid, description, and notes as necessary.
-  my $sql = "(select $cols from searchme where $webvar{custexclude} custid ilike '%$webvar{custid}%')".
-        " $sqlconcat $webvar{custexclude} oldcustid ilike '%$webvar{custid}%')".
+  my $sql = "(select $cols from searchme where".
+        " $webvar{custexclude} (custid ilike '%$webvar{custid}%'".
+        " OR $webvar{custexclude} oldcustid ilike '%$webvar{custid}%'))".
         " $sqlconcat (select $cols from searchme where $webvar{descexclude} description ilike '%$webvar{desc}%')".
         " $sqlconcat (select $cols from searchme where $webvar{notesexclude} notes ilike '%$webvar{notes}%')";
@@ -141 +142 @@
   ## 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
@@ -149 +150 @@
       # we'll be getting a class A anytime soon.  <g>
       $sql .= " $sqlconcat (select $cols from searchme where ".
-        "$webvar{cidrexclude} cidr='$webvar{cidr}')";
+        "$webvar{cidrexclude} cidr<<='$webvar{cidr}')";
     } else {
       # 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}$/) {
@@ -429 +433 @@
                 "allcities=$webvar{allcities}&";
           foreach my $key (keys %webvar) {
-            if ($key =~ /^(?:type|city)\[/) {
+            if ($key =~ /^(?:type|city)\[/ || $key =~ /exclude$/) {
               print "$key=$webvar{$key}&";
             }