Changeset 618 for branches

Timestamp:

01/02/14 17:29:27 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Commit some cleanup and bugfixing from production

File:

• branches/stable/cgi-bin/extras/db2rwhois.pl (modified) (4 diffs)

branches/stable/cgi-bin/extras/db2rwhois.pl

@@ -68 +68 @@
 # no use or point in broadcasting our use of them.
 # Also remove the details of our "reserved CORE/WAN" blocks;  they're not critical.
-my $ssth = $dbh->prepare("select cidr,custid,type,city,description,createstamp,modifystamp,swip ".
-        "from allocations where ".
-        "not (cidr <<= '192.168.0.0/16') and ".
-        "not (cidr <<= '172.16.0.0/12') and ".
-        "not (cidr <<= '10.0.0.0/8') and ".
-        "not (type = 'wr') and ".
-        "((masklen(cidr) <=30 and family(cidr)=4) or (masklen(cidr) <=56 and family(cidr)=6)) and ".
-        "cidr <<= ?");
+my $ssth = $dbh->prepare(qq(
+SELECT a.cidr,a.custid,a.type,a.city,a.description,a.createstamp,a.modifystamp,a.swip,a.custid=t.def_custid AS isdef
+    FROM allocations a JOIN alloctypes t ON a.type=t.type WHERE
+    NOT (a.cidr <<= '192.168.0.0/16') AND
+    NOT (a.cidr <<= '172.16.0.0/12') AND
+    NOT (a.cidr <<= '10.0.0.0/8') AND
+    NOT (a.type = 'wr') AND
+    ((masklen(a.cidr) <=30 AND family(a.cidr)=4) OR (masklen(a.cidr) <=56 AND family(a.cidr)=6)) AND
+    a.cidr <<= ?
+));
 
 # Customer data, for those rare blocks we really need to delegate.
@@ -206 +208 @@
   # And now the subblocks
   $ssth->execute("$masterblocks[$i]");
-  while (my ($cidr, $custid, $type, $city, $desc, $ctime, $mtime, $swip) = $ssth->fetchrow_array) {
+  while (my ($cidr, $custid, $type, $city, $desc, $bctime, $bmtime, $swip, $defcust) = $ssth->fetchrow_array) {
 
 # We get master block info from @masterblocks.
@@ -233 +235 @@
 
     # Fix up datestamps.  We don't *really* need sub-microsecond resolution on our exports...
-    ($ctime) = ($ctime =~ /^(\d+-\d+-\d+)\s+/);
-    ($mtime) = ($mtime =~ /^(\d+-\d+-\d+)\s+/);
+    ($bctime) = ($bctime =~ /^(\d+-\d+-\d+)\s+/);
+    ($bmtime) = ($bmtime =~ /^(\d+-\d+-\d+)\s+/);
 
 # Notes:
@@ -255 +257 @@
     my $netname = $netnameprefix{$type};
 
-    if ($swip eq 'n') {
-      print MASTERFILE "---\nID: NETBLK-ISP.$masterblocks[$i]\n".
-        "Auth-Area: $masterblocks[$i]\n".
-        "Network-Name: $netname-".$net->network."\n".
-        "IP-Network: $net\n".
-        "IP-Network-Block: ".$net->range."\n".
-        "Org-Name: $IPDB::org_name\n".
-        "Street-Address: $IPDB::org_street\n".
-        "City: $IPDB::org_city\n".
-        "StateProv: $IPDB::org_prov_state\n".
-        "Postal-Code: $IPDB::org_pocode\n".
-        "Country-Code: $IPDB::org_country\n".
-        "Tech-Contact: $IPDB::org_techhandle\n".
-        "Created: $ctime\n".
-        "Updated: $mtime\n".
-        "Updated-By: $IPDB::org_email\n";
+# le sigh.  can't get a proper report on what is undef if this is all one big print.
+    if ($swip eq 'n' || $defcust) {
+      print MASTERFILE "---\nID: NETBLK-ISP$masterblocks[$i]\n";
+      print MASTERFILE "Auth-Area: $masterblocks[$i]\n";
+      print MASTERFILE "Network-Name: $netname-".$net->network."\n";
+      print MASTERFILE "IP-Network: $net\n";
+      print MASTERFILE "IP-Network-Block: ".$net->range."\n";
+      print MASTERFILE "Org-Name: $IPDB::org_name\n";
+      print MASTERFILE "Street-Address: $IPDB::org_street\n";
+      print MASTERFILE "City: $IPDB::org_city\n";
+      print MASTERFILE "StateProv: $IPDB::org_prov_state\n";
+      print MASTERFILE "Postal-Code: $IPDB::org_pocode\n";
+      print MASTERFILE "Country-Code: $IPDB::org_country\n";
+      print MASTERFILE "Tech-Contact: $IPDB::org_techhandle\n";
+      print MASTERFILE "Created: $bctime\n";
+      print MASTERFILE "Updated: $bmtime\n";
+      print MASTERFILE "Updated-By: $IPDB::org_email\n";
     } else {
       $custsth->execute($custid);