Changeset 859 for trunk

Timestamp:

04/17/16 12:55:28 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine and correct handling of master and allocation create/modify stamps;
use separate variables for the master blocks vs allocations. Previous
behaviour may have been incorrect in a few cases.

File:

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

trunk/cgi-bin/extras/db2rwhois.pl

@@ -3 +3 @@
 # ipdb/cgi-bin/extras/db2rwhois.pl
 # Pull data from ipdb and mangle it into RWHOIS
-# Initial version 03/26/2004 kdeugau against IPDB v1
 ###
 # Revision info
@@ -102 +101 @@
   $masterblocks[$i] = new NetAddr::IP $master;
   my ($ctime,undef) = split /\s/, $mcreate;
-  ($mmod,undef) = split /\s/, $mmod;
-
-  print "$masterblocks[$i] $ctime $mmod\n";
+  my ($mtime,undef) = split /\s/, $mmod;
+
+  print "$masterblocks[$i] $ctime $mtime\n";
 
   my $date = strftime("%Y-%m-%d", localtime);
@@ -213 +212 @@
         "Tech-Contact: $IPDB::org_techhandle\n".
         "Created: $ctime\n".
-        "Updated: $mmod\n".
+        "Updated: $mtime\n".
         "Updated-By: $IPDB::org_email\n";
 
   # And now the subblocks
   $ssth->execute($mid, $master) or die "nosubs: $!\n".$dbh->errstr."\n";
-  while (my ($cidr, $custid, $type, $city, $desc, $ctime, $mtime, $swip, $defcust) = $ssth->fetchrow_array) {
+  while (my ($cidr, $custid, $type, $city, $desc, $bctime, $bmtime, $swip, $defcust) = $ssth->fetchrow_array) {
 
 # We get master block info from @masterblocks.
@@ -245 +244 @@
 
     # 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:
@@ -280 +279 @@
         "Country-Code: $IPDB::org_country\n".
         "Tech-Contact: $IPDB::org_techhandle\n".
-        "Created: $ctime\n".
-        "Updated: $mtime\n".
+        "Created: $bctime\n".
+        "Updated: $bmtime\n".
         "Updated-By: $IPDB::org_email\n";
     } else {
@@ -304 +303 @@
         "Country-Code: ".($country ? $country : $IPDB::org_country)."\n".
         "Tech-Contact: ".($tech ? $tech : $IPDB::org_techhandle)."\n".
-        "Created: $ctime\n".
-        "Updated: $mtime\n".
+        "Created: $bctime\n".
+        "Updated: $bmtime\n".
         "Updated-By: $IPDB::org_email\n";
     } # swip