Changeset 575 for trunk

Timestamp:

12/31/13 15:36:27 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Add -g option to tiny-import.pl to allow import of flatfile records to
different groups. Note that the final group for any given record
depends on the parent zone(s) that it's in; new zones will be place
in the specified group but records belonging to existing zones will
effectively be in whatever group their containing zone is in.

File:

• trunk/tiny-import.pl (modified) (4 diffs)

trunk/tiny-import.pl

@@ -39 +39 @@
         conv    => 0,
         trial   => 0,
-        legacy  => 0,
+        legacy  => 0,
+        group   => 1,
         );
+my $gnum = '';
 # Handle some command-line arguments
 while ($ARGV[0] =~ /^-/) {
   my $arg = shift @ARGV;
-  usage() if $arg !~ /^-[rclt]+$/;
+  usage() if $arg !~ /^-(?:[rclt]+|g\d*)$/;
   # -r  rewrite imported files to comment imported records
   # -c  coerce/downconvert A+PTR = records to PTR
   # -l  swallow A+PTR as-is
   # -t  trial mode;  don't commit to DB or actually rewrite flatfile (disables -r)
+  # -g  import to specified group (name or ID) instead of group 1
   $arg =~ s/^-//;
-  my @tmp = split //, $arg;
-  foreach (@tmp) {
-    $importcfg{rw} = 1 if $_ eq 'r';
-    $importcfg{conv} = 1 if $_ eq 'c';
-    $importcfg{legacy} = 1 if $_ eq 'l';
-    $importcfg{trial} = 1 if $_ eq 't';
-  }
+# for Reasons (none clear), $arg is undefined yet defined, but only when number characters are involved.  Ebbeh?
+no warnings qw(uninitialized);
+  if ($arg =~ /^g/) {
+    if ($arg eq 'g') {
+      $importcfg{group} = shift @ARGV;
+    } else {
+      $arg =~ s/^g//;
+      $importcfg{group} = $arg;
+    }
+  } else {
+    my @tmp = split //, $arg;
+    foreach (@tmp) {
+      $importcfg{rw} = 1 if $_ eq 'r';
+      $importcfg{conv} = 1 if $_ eq 'c';
+      $importcfg{legacy} = 1 if $_ eq 'l';
+      $importcfg{trial} = 1 if $_ eq 't';
+    }
+  }
+  use warnings qw(uninitialized);
 }
 $importcfg{rw} = 0 if $importcfg{trial};
 
+# allow group names
+if ($importcfg{group} =~ /^\d+$/) {
+  $importcfg{groupname} = $dnsdb->groupName($importcfg{group});
+} else {
+  $importcfg{groupname} = $importcfg{group};
+  $importcfg{group} = $dnsdb->groupID($importcfg{groupname});
+}
+
+die usage() if $importcfg{group} !~ /^\d+$/;
+
 sub usage {
-  die q(usage:  tiny-import.pl [-r] [-c] datafile1 datafile2 ... datafileN ...
+  die q(usage:  tiny-import.pl [-rclt] [-gnn] [-g name] datafile1 datafile2 ... datafileN ...
         -r  Rewrite all specified data files with a warning header indicating the
             records are now managed by web, and commenting out all imported records.
@@ -72 +97 @@
         -l  (for "legacy")  Force import of A+PTR records as-is.  Mutually exclusive
             with -c.  -l takes precedence as -c is lossy.
+        -gnnn or -g nnn or -g name
+            Import new zones into this group (group name or ID accepted) instead of
+            the root/default group 1
         -t  Trial run mode;  spits out records that would be left unimported.
             Disables -r if set.
@@ -514 +542 @@
       if ($zone =~ /\.arpa$/) {
         ($code,$msg) = DNSDB::_zone2cidr($zone);
-        $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location) VALUES (?,1,1,?)",
-                undef, ($msg, $loc));
+        $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location) VALUES (?,?,1,?)",
+                undef, ($msg, $importcfg{group}, $loc));
         my ($rdns) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
         my $newttl;
@@ -523 +551 @@
                 $loc, $stamp, $expires, $stampactive);
       } else {
-        $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,1,1,?)",
-                undef, ($zone, $loc));
+        $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,?,1,?)",
+                undef, ($zone, $importcfg{group}, $loc));
         my ($domid) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");
         my $newttl;