Changeset 171 for branches/new-search-20050223

Timestamp:

02/24/05 15:09:46 (20 years ago)

Author:

Kris Deugau

Message:

/branches/new-search-20050223

First iteration:

• Changed search linked from header.inc back to a "quick" search, with some intelligence to detect whether it's an IP, CustID, or description that's being searched for.

Location:

branches/new-search-20050223

Files:

• cgi-bin/main.cgi (modified) (1 diff)
• header.inc (modified) (1 diff)

branches/new-search-20050223/cgi-bin/main.cgi

@@ -123 +123 @@
     # Search term entered.  Display matches.
     # We should really sanitize $webvar{input}, no?
-    viewBy($webvar{searchfor}, $webvar{input});
+    # need to munge up data for $webvar{searchfor}, rather than breaking things here.
+    my $searchfor;
+    # Chew up leading and trailing whitespace
+    $webvar{input} =~ s/^\s+//;
+    $webvar{input} =~ s/\s+$//;
+    if ($webvar{input} =~ /^(\d{1,3}\.){3}\d{1,3}\/\d{1,3}$/) {
+      # "Perfect" IP subnet match
+      $searchfor = "ipblock";
+    } elsif ($webvar{input} =~ /^(\d{1,3}\.){3}\d{1,3}$/) {
+      # "Perfect" IP address match (shows containing block)
+      $searchfor = "ipblock";
+    } elsif ($webvar{input} =~ /^(\d{1,3}\.){2}\d{1,3}(\.\d{1,3}?)?/) {
+      # Partial IP match
+      $searchfor = "ipblock";
+    } elsif ($webvar{input} =~ /^\d+$/) {
+      # All-digits, new custID
+      $searchfor = "cust";
+    } else {
+      # Anything else.
+      $searchfor = "desc";
+    }
+    viewBy($searchfor, $webvar{input});
   }
 }

branches/new-search-20050223/header.inc

@@ -41 +41 @@
 <td width=10></td>
 <form method="POST" action="/ip/cgi-bin/main.cgi">
-<td>Search:
+<td>Quick Search:
 <input type="text" name="input" size="20" maxlength="50" class="regular">
-<input type=radio name="searchfor" value="ipblock">IP/IP block
-<input type=radio name="searchfor" value="desc" checked=yes>Description
-<input type=radio name="searchfor" value="cust">Customer ID
 <input type=hidden name=page value="1">
 <input type=hidden name=action value="search">