Changeset 468 for trunk/tiny-import.pl

Timestamp:

03/12/13 13:39:49 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, 4 of <mumble>. See #11.

• Convert initialization of bundled callers to object calls

File:

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

trunk/tiny-import.pl

@@ -27 +27 @@
 
 use lib '.';
-use DNSDB qw(:ALL);
-
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+use DNSDB;
+
+my $dnsdb = new DNSDB;
 
 usage() if !@ARGV;
@@ -77 +75 @@
 
 my $code;
-my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-initGlobals($dbh) if $dbh;
+my $dbh = $dnsdb->{dbh};
 
 $dbh->{AutoCommit} = 0;
@@ -251 +248 @@
     my $nodefer = shift || 0;
     my $impok = 1;
+    my $msg;
 
     $errstr = $rec;  # this way at least we have some idea what went <splat>
@@ -269 +267 @@
       $loc = '' if !$loc;
       $loc = '' if $loc =~ /^:+$/;
-      my $fparent = DNSDB::_hostparent($dbh, $host);
+      my $fparent = $dnsdb->_hostparent($host);
       my ($rparent) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?", undef, ($ip));
       if ($fparent && $rparent) {
@@ -308 +306 @@
 
       } else {
-        my $fparent = DNSDB::_hostparent($dbh, $host);
+        my $fparent = $dnsdb->_hostparent($host);
         if ($fparent) {
           $recsth->execute($fparent, 0, $host, 5, $targ, 0, 0, 0, $ttl, $loc);
@@ -344 +342 @@
         }
       } else {
-        my $fparent = DNSDB::_hostparent($dbh, $zone);
+        my $fparent = $dnsdb->_hostparent($zone);
         if ($fparent) {
           $recsth->execute($fparent, 0, $zone, 2, $ns, 0, 0, 0, $ttl, $loc);
@@ -396 +394 @@
       $loc = '' if $loc =~ /^:+$/;
 
-      my $domid = DNSDB::_hostparent($dbh, $host);
+      my $domid = $dnsdb->_hostparent($host);
       if ($domid) {
         $recsth->execute($domid, 0, $host, 1, $ip, 0, 0, 0, $ttl, $loc);
@@ -447 +445 @@
 
       # allow for subzone MXes, since it's perfectly legitimate to simply stuff it all in a single parent zone
-      my $domid = DNSDB::_hostparent($dbh, $zone);
+      my $domid = $dnsdb->_hostparent($zone);
       if ($domid) {
         $recsth->execute($domid, 0, $zone, 15, $host, $dist, 0, 0, $ttl, $loc);
@@ -473 +471 @@
         $recsth->execute(0, $rparent, $rdata, 16, "$msg", 0, 0, 0, $ttl, $loc);
       } else {
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 16, $rdata, 0, 0, 0, $ttl, $loc);
@@ -588 +586 @@
 #  }
 
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 33, $target, $prio, $weight, $port, $ttl, $loc) if $domid;
@@ -606 +604 @@
         my $val = NetAddr::IP->new(join(':', @v6));
 
-        my $fparent = DNSDB::_hostparent($dbh, $fqdn);
+        my $fparent = $dnsdb->_hostparent($fqdn);
         if ($fparent) {
           $recsth->execute($fparent, 0, $fqdn, 28, $val->addr, 0, 0, 0, $ttl, $loc);
@@ -628 +626 @@
           }
         } else {
-          my $domid = DNSDB::_hostparent($dbh, $fqdn);
+          my $domid = $dnsdb->_hostparent($fqdn);
           if ($domid) {
             $recsth->execute($domid, 0, $fqdn, 16, $txtstring, 0, 0, 0, $ttl, $loc);
@@ -656 +654 @@
           }
         } else {
-          my $domid = DNSDB::_hostparent($dbh, $fqdn);
+          my $domid = $dnsdb->_hostparent($fqdn);
           if ($domid) {
             $recsth->execute($domid, 0, $fqdn, 17, "$email $txtrec", 0, 0, 0, $ttl, $loc);
@@ -672 +670 @@
 
         # these do not make sense in a reverse zone, since they're logically attached to an A record
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 44, $sshfp, 0, 0, 0, $ttl, $loc);