Changeset 285

Timestamp:

09/21/05 17:58:37 (19 years ago)

Author:

Kris Deugau

Message:

/trunk help.html

Tweak up new search system to work properly - searchme view
was missing the 'notes' field.
Tweak quick search to search CustIDs for alphanumerics.

Location:

trunk

Files:

• cgi-bin/ipdb.psql (modified) (1 diff)
• cgi-bin/search.cgi (modified) (3 diffs)
• help.html (modified) (2 diffs)

trunk/cgi-bin/ipdb.psql

@@ -101 +101 @@
 GRANT ALL on "allocations" to "ipdb";
 
-CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description FROM poolips;
+CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes FROM poolips;
 
 REVOKE ALL on "searchme" from PUBLIC;

trunk/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";

trunk/help.html

@@ -14 +14 @@
 
 <tr class="color1">
-<td>Class-C-sized IP blocks</td><td>209.91.128</td>
-<td>Lists all alloctions starting with that set of octets</td>
+<td>IP blocks</td><td>209.91.128 or 209.</td>
+<td>Lists all alloctions starting with that set of octets.  Note that matches on the
+first octet MUST include the period to be considered an IP search.</td>
 </tr>
 <tr class="color2">
 <td>CIDR blocks</td><td>209.92.128/30</br>or
-209.92.128.0/30</td><td>lists all /30's beginning with 209.91.128</td>
+209.92.128.0/30</td><td>Lists all /30's beginning with 209.91.128 or checks for an
+exact match for 209.92.128.0/30 respectively</td>
 </tr>
 <tr class="color1">
@@ -30 +32 @@
 Matches on prefix (area code, area code + exchange, etc).
 </td>
+</tr>
+<tr class="color1">
+<td>Description:</td><td>cable or efni</td><td>Find all allocations with the search term in
+the description.  Note that searches for CustIDs with letters will fall under this category
+until CustIDs are all-numeric.</td>
 </tr>