Changeset 328 for trunk

Timestamp:

04/07/06 13:34:55 (18 years ago)

Author:

Kris Deugau

Message:

/trunk

Tighten 'rules' for exporting customer data. Only types that
have a blank default CustID in the alloctypes table are supposed
to be allocated direct to customers, so only those types should
have any *need* to have customer data associated with them.

File:

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

trunk/cgi-bin/extras/db2rwhois.pl

@@ -29 +29 @@
 my @masterblocks;
 my %netnameprefix;
+my %def_custids;
 
 # Fill in data about our master blocks as allocated from ARIN
@@ -85 +86 @@
 while (my @data = $sth->fetchrow_array) {
   $netnameprefix{$data[0]} = $data[2];
+  $def_custids{$data[0]} = $data[1];
 }
 
@@ -166 +168 @@
       my $netname = $netnameprefix{$type};
 
-      if ($swip eq 'n') {
-        print MASTERFILE "---\nID: NETBLK-ISP.$master\n".
-                "Auth-Area: $master\n".
-                "Network-Name: $netname-".$net->network."\n".
-                "IP-Network: $net\n".
-                "IP-Network-Block: ".$net->range."\n".
-                "Org-Name: Friendly ISP\n".
-                "Street-Address: 123 4th Street\n".
-                "City: Anytown\n".
-                "StateProv: Ontario\n".
-                "Postal-Code: H0H 0H0\n".
-                "Country-Code: CA\n".
-                "Tech-Contact: ISP-ARIN-HANDLE\n".
-                "Created: $ctime\n".
-                "Updated: $mtime\n".
-                "Updated-By: noc\@example.com\n";
-      } else {
+      if ($swip eq 'y' && $def_custids{$type} eq '') {
+        # def_custids{$type} should only be blank on types that are
+        # allocated direct to customers.  i are sMart!!11!!oneone!
         $custsth->execute($custid);
         my ($name, $street, $city, $prov, $country, $pocode, $phone, $tech, $special) = $custsth->fetchrow_array;
@@ -206 +194 @@
                 "Updated: $mtime\n".
                 "Updated-By: noc\@example.com\n";
-      } # swip
-
+      } else {
+        print MASTERFILE "---\nID: NETBLK-ISP.$master\n".
+                "Auth-Area: $master\n".
+                "Network-Name: $netname-".$net->network."\n".
+                "IP-Network: $net\n".
+                "IP-Network-Block: ".$net->range."\n".
+                "Org-Name: Friendly ISP\n".
+                "Street-Address: 123 4th Street\n".
+                "City: Anytown\n".
+                "StateProv: Ontario\n".
+                "Postal-Code: H0H 0H0\n".
+                "Country-Code: CA\n".
+                "Tech-Contact: ISP-ARIN-HANDLE\n".
+                "Created: $ctime\n".
+                "Updated: $mtime\n".
+                "Updated-By: noc\@example.com\n";
+      } # decide which contact data to use (cust data only on swip==y && def custid=='')
     } # net in master
   } # foreach master