Changeset 1033 for branches/stable/tiny-import.pl

Timestamp:

02/11/26 13:13:59 (2 days ago)

Author:

Kris Deugau

Message:

/branches/stable

Continue merging /trunk commits based on production

Location:

branches/stable

Files:

• . (modified) (1 prop)
• tiny-import.pl (modified) (21 diffs)

branches/stable/tiny-import.pl

@@ -122 +122 @@
 $dnsdb->{logusername} = $dnsdb->{logusername}."/tiny-import.pl";
 $dnsdb->{logfullname} = $dnsdb->{logusername} if !$dnsdb->{logfullname};
+$dnsdb->{logfullname} = $dnsdb->{logfullname}."/tiny-import.pl";
 
 $dbh->{AutoCommit} = 0;
@@ -132 +133 @@
 
 foreach my $file (@ARGV) {
+  my %filecount;
+  my $logentry = "Import records from $file: ";
   eval {
-    import(file => $file);
-#    import(file => $file, nosoa => 1);
+    import(file => $file, cnt => \%filecount);
+    if (%filecount) {
+      foreach (sort keys %filecount) {
+        $logentry .= "$_ $filecount{$_}, ";
+        $cnt{$_} += $filecount{$_};
+      }
+      $logentry =~ s/[\s,]+$//;
+      $dnsdb->_log(group_id => $importcfg{group}, entry => $logentry);
+    }
     $dbh->rollback if $importcfg{trial};
     $dbh->commit unless $importcfg{trial};
@@ -146 +156 @@
 
 # print summary count of record types encountered
-foreach (keys %cnt) {
+foreach (sort keys %cnt) {
   print " $_    $cnt{$_}\n";
 }
@@ -155 +165 @@
   our %args = @_;
   my $flatfile = $args{file};
+  my $filecnt = $args{cnt};
   my @fpath = split '/', $flatfile;
   $fpath[$#fpath] = ".$fpath[$#fpath]";
@@ -186 +197 @@
     chomp;
     s/\s*$//;
-    my $recstat = recslurp($_);
+    my $recstat = recslurp($_, $filecnt);
     $ok++ if $recstat;
     if ($importcfg{rw}) {
@@ -322 +333 @@
   sub recslurp {
     my $rec = shift;
+    my $filecnt = shift;
     my $nodefer = shift || 0;
     my $impok = 1;
@@ -329 +341 @@
 
     if ($rec =~ /^=/) {
-      $cnt{APTR}++;
+      $filecnt->{'A+PTR'}++;
 
 ##fixme:  do checks like this for all types
@@ -384 +396 @@
 
     } elsif ($rec =~ /^C/) {
-      $cnt{CNAME}++;
+      $filecnt->{CNAME}++;
 
       my ($host,$targ,$ttl,$stamp,$loc) = split /:/, $rec, 5;
@@ -429 +441 @@
 
     } elsif ($rec =~ /^\&/) {
-      $cnt{NS}++;
+      $filecnt->{NS}++;
 
       my ($zone,$ip,$ns,$ttl,$stamp,$loc) = split /:/, $rec, 6;
@@ -471 +483 @@
 
     } elsif ($rec =~ /^\^/) {
-      $cnt{PTR}++;
+      $filecnt->{PTR}++;
 
       my ($rip,$host,$ttl,$stamp,$loc) = split /:/, $rec, 5;
@@ -521 +533 @@
 
     } elsif ($rec =~ /^\+/) {
-      $cnt{A}++;
+      $filecnt->{A}++;
 
       my ($host,$ip,$ttl,$stamp,$loc) = split /:/, $rec, 5;
@@ -558 +570 @@
 
     } elsif ($rec =~ /^Z/) {
-      $cnt{SOA}++;
+      $filecnt->{SOA}++;
 
       my ($zone,$master,$contact,$serial,$refresh,$retry,$expire,$minttl,$ttl,$stamp,$loc) = split /:/, $rec, 11;
@@ -569 +581 @@
       $loc = '' if !$loc;
       $loc = '' if $loc =~ /^:+$/;
+# Default to UNIX epoch for zones with no existing serial value
+      $serial = scalar(time) if !$serial;
 
       my $stampactive = 'n';
@@ -588 +602 @@
       if ($zone =~ /\.arpa$/) {
         ($code,$msg) = DNSDB::_zone2cidr($zone);
-        $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location) VALUES (?,?,1,?)",
-                undef, ($msg, $importcfg{group}, $loc));
+        $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location,zserial) VALUES (?,?,1,?,?)",
+                undef, ($msg, $importcfg{group}, $loc, $serial));
         my ($rdns) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
         my $newttl;
@@ -597 +611 @@
                 $loc, $stamp, $expires, $stampactive);
       } else {
-        $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,?,1,?)",
-                undef, ($zone, $importcfg{group}, $loc));
+        $dbh->do("INSERT INTO domains (domain,group_id,status,default_location,zserial) VALUES (?,?,1,?,?)",
+                undef, ($zone, $importcfg{group}, $loc, $serial));
         my ($domid) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");
         my $newttl;
@@ -608 +622 @@
 
     } elsif ($rec =~ /^\@/) {
-      $cnt{MX}++;
+      $filecnt->{MX}++;
 
       my ($zone,$ip,$host,$dist,$ttl,$stamp,$loc) = split /:/, $rec, 7;
@@ -639 +653 @@
 
     } elsif ($rec =~ /^'/) {
-      $cnt{TXT}++;
+      $filecnt->{TXT}++;
 
       my ($fqdn, $rdata, $ttl, $stamp, $loc) = split /:/, $rec, 5;
@@ -670 +684 @@
 
     } elsif ($rec =~ /^\./) {
-      $cnt{NSASOA}++;
+      $filecnt->{NSASOA}++;
 
       my ($fqdn, $ip, $ns, $ttl, $stamp, $loc) = split /:/, $rec, 6;
@@ -744 +758 @@
 
     } elsif ($rec =~ /^\%/) {
-      $cnt{VIEWS}++;
+      $filecnt->{VIEWS}++;
 
       # unfortunate that we don't have a guaranteed way to get a description on these.  :/
@@ -763 +777 @@
 
     } elsif ($rec =~ /^:/) {
-      $cnt{NCUST}++;
+      $filecnt->{NCUST}++;
 # Big section.  Since tinydns can publish anything you can encode properly, but only provides official
 # recognition and handling for the core common types, this must deal with the leftovers.
@@ -928 +942 @@
 
     } else {
-      $cnt{other}++;
+      $filecnt->{other}++;
       print " $_\n";
     }