+ $sql .= " $sqlconcat (select $cols from searchme where ".
+ "$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
+ $sql .= " $sqlconcat (select $cols from searchme where $webvar{cidrexclude} ".
+ "(text(cidr) like '$net%' and masklen(cidr)=$maskbits))";
+ }
+ } elsif ($webvar{cidr} =~ /^(\d{1,3}\.){3}\d{1,3}$/) {
+ # Specific IP address match. Will show either a single netblock,
+ # or a static pool plus an IP.
+ $sql .= " $sqlconcat (select $cols from searchme where $webvar{cidrexclude} ".
+ "cidr >>= '$webvar{cidr}')";
+ } elsif ($webvar{cidr} =~ /^\d{1,3}(\.(\d{1,3}(\.(\d{1,3}\.?)?)?)?)?$/) {
+ # Leading octets in CIDR
+ $sql .= " $sqlconcat (select $cols from searchme where $webvar{cidrexclude} ".
+ "text(cidr) like '$webvar{cidr}%')";
+ } else {
+ # This shouldn't happen, but if it does, whoever gets it deserves what they get...
+ printAndExit("Invalid netblock query.");
+ } # done with CIDR query options.
+
+ # Find the offset for multipage results
+ my $offset = ($webvar{page}-1)*$RESULTS_PER_PAGE;
+
+ # Find out how many rows the "core" query will return.
+ my $count = countRows($sql);
+
+ if ($count == 0) {
+ printError "No matches found. Try eliminating one of the criteria,".
+ " or making one or more criteria more general.";
+ } else {
+ # Add the limit/offset clauses
+ $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
+ # And tell the user.
+ print "Searching...............
\n";
+ queryResults($sql, $webvar{page}, $count);
+ }
+
+} else { # how script was called. General case is to show the search criteria page.
+
# Display search page. We have to do this here, because otherwise
# we can't retrieve data from the database for the types and cities. >:(
@@ -210,5 +230,4 @@
$citytable .= "\n";
-
$html =~ s/\$\$TYPELIST\$\$/$typetable/;
$html =~ s/\$\$CITYLIST\$\$/$citytable/;
@@ -216,7 +235,4 @@
print $html;
}
-
-# # This is unpossible!
-# print "This is UnPossible! You can't get here!\n";
# Shut down and clean up.
@@ -226,4 +242,10 @@
exit 0;
+
+# viewBy()
+# The quick search
+# Takes a category descriptor and a query string
+# Creates appropriate SQL to run the search and display the results
+# with queryResults()
sub viewBy($$) {
my ($category,$query) = @_;
@@ -232,19 +254,14 @@
my $sql;
-#print "\n";
-
-#print "start querysub: query '$query'\n";
-# this may happen with more than one subcategory. Unlikely, but possible.
-
# Calculate start point for LIMIT clause
my $offset = ($webvar{page}-1)*$RESULTS_PER_PAGE;
# Possible cases:
-# 1) Partial IP/subnet. Treated as "first-three-octets-match" in old IPDB,
-# I should be able to handle it similarly here.
-# 2a) CIDR subnet. Treated more or less as such in old IPDB.
-# 2b) CIDR netmask. Not sure how it's treated.
-# 3) Customer ID. Not handled in old IPDB
-# 4) Description.
+# 1) Partial IP/subnet. Treated as "octet-prefix".
+# 2a) CIDR subnet. Exact match.
+# 2b) CIDR netmask. YMMV but it should be octet-prefix-with-netmask
+# (ie, all matches with the octet prefix *AND* that netmask)
+# 3) Customer ID. "Match-any-segment"
+# 4) Description. "Match-any-segment"
# 5) Invalid data which might be interpretable as an IP or something, but
# which probably shouldn't be for reasons of sanity.
@@ -355,8 +372,7 @@
-# Display certain types of search query. Note that this can't be
-# cleanly reused much of anywhere else as the data isn't neatly tabulated.
-# This is tied to the search sub tightly enough I may just gut it and provide
-# more appropriate tables directly as needed.
+# queryResults()
+# Display search queries based on the passed SQL.
+# Takes SQL, page number (for multipage search results), and a total count.
sub queryResults($$$) {
my ($sql, $pageNo, $rowCount) = @_;
@@ -446,3 +462,2 @@
return $a[0];
}
-