Changeset 286 for branches/stable/cgi-bin/search.cgi

Timestamp:

09/23/05 15:54:31 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge changes from /trunk revisions:

234
237
254 (ipdb.css only)
261
279
284
285

This merges the new search system (234, 237, 254), cleans up
some display CSS (254, 279), cleans up some leftover code (r261),
and merges the "private data" code (284, 285 - note SWIP hacks conflict).

/trunk should now be almost identical to /branches/stable.

File:

• branches/stable/cgi-bin/search.cgi (copied) (copied from trunk/cgi-bin/search.cgi ) (3 diffs)

branches/stable/cgi-bin/search.cgi

@@ -60 +60 @@
     $webvar{input} =~ s/^\s+//;
     $webvar{input} =~ s/\s+$//;
-    if ($webvar{input} =~ /^[\d\.]+(\/\d{1,3})?$/) {
+    if ($webvar{input} =~ /^\d+$/) {
+      # All-digits, new custID
+      $searchfor = "cust";
+    } elsif ($webvar{input} =~ /^[\d\.]+(\/\d{1,3})?$/) {
       # IP addresses should only have numbers, digits, and maybe a slash+netmask
       $searchfor = "ipblock";
-    } elsif ($webvar{input} =~ /^\d+$/) {
-      # All-digits, new custID
-      $searchfor = "cust";
     } else {
       # Anything else.
@@ -140 +140 @@
   ## CIDR query options.
   $webvar{cidr} =~ s/\s+//;     # Hates the nasty spaceseseses we does.
-  if ($webvar{cidr} =~ /\//) {
+  if ($webvar{cidr} == '') { # We has a blank CIDR.  Ignore it.
+  } elsif ($webvar{cidr} =~ /\//) {
     # 209.91.179/26 should show all /26 subnets in 209.91.179
     my ($net,$maskbits) = split /\//, $webvar{cidr};
@@ -291 +292 @@
     print qq(<div class="heading">Searching for descriptions containing '$query'</div><br>\n);
     # Query based on description (includes "name" from old DB).
-    $sql = "select * from searchme where description ilike '%$query%'";
+    $sql = "select * from searchme where description ilike '%$query%'".
+        " or custid ilike '%$query%'";
     my $count = countRows($sql);
     $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";