Changeset 481 for trunk/DNSDB.pm

Timestamp:

03/14/13 15:33:42 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• record manipulation: getSOA(), getRecLine(), getDomRecs(), getRecCount(), addRec(), updateRec(), downconvert(), and delRec() and callers.

File:

• trunk/DNSDB.pm (modified) (10 diffs)

trunk/DNSDB.pm

@@ -3350 +3350 @@
 sub getSOA {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $def = shift;
   my $rev = shift;
@@ -3442 +3443 @@
 sub getRecLine {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3486 +3488 @@
 sub getDomRecs {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -3541 +3544 @@
 # Returns the count
 sub getRecCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3575 +3579 @@
 sub addRec {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3626 +3631 @@
 
   # Call the validation sub for the type requested.
-  ($retcode,$retmsg) = $validators{$$rectype}($dbh, (defrec => $defrec, revrec => $revrec, id => $id,
+  ($retcode,$retmsg) = $validators{$$rectype}($self, defrec => $defrec, revrec => $revrec, id => $id,
         host => $host, rectype => $rectype, val => $val, addr => $addr,
         dist => \$dist, port => \$port, weight => \$weight,
-        fields => \$fields, vallist => \@vallist) );
+        fields => \$fields, vallist => \@vallist);
 
   return ($retcode,$retmsg) if $retcode eq 'FAIL';
 
   # Set up database fields and bind parameters
-  $fields .= "host,type,val,ttl,location,"._recparent($defrec,$revrec);
-  push @vallist, ($$host,$$rectype,$$val,$ttl,$location,$id);
+  $fields .= "host,type,val,ttl,"._recparent($defrec,$revrec);
+  push @vallist, ($$host,$$rectype,$$val,$ttl,$id);
+
+  # locations are not for default records, silly coder!
+  if ($defrec eq 'n') {
+    $fields .= ",location";
+    push @vallist, $location;
+  }
   my $vallen = '?'.(',?'x$#vallist);
 
@@ -3700 +3711 @@
   $errstr = '';
 
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3754 +3766 @@
   # get old record data so we have the right parent ID
   # and for logging (eventually)
-  my $oldrec = getRecLine($dbh, $defrec, $revrec, $id);
+  my $oldrec = $self->getRecLine($defrec, $revrec, $id);
 
   # Call the validation sub for the type requested.
   # Note the ID to pass here is the *parent*, not the record
-  ($retcode,$retmsg) = $validators{$$rectype}($dbh, (defrec => $defrec, revrec => $revrec,
+  ($retcode,$retmsg) = $validators{$$rectype}($self, defrec => $defrec, revrec => $revrec,
         id => ($defrec eq 'y' ? $oldrec->{group_id} : ($revrec eq 'n' ? $oldrec->{domain_id} : $oldrec->{rdns_id})),
         host => $host, rectype => $rectype, val => $val, addr => $addr,
         dist => \$dist, port => \$port, weight => \$weight,
         fields => \$fields, vallist => \@vallist,
-        update => $id) );
+        update => $id);
 
   return ($retcode,$retmsg) if $retcode eq 'FAIL';
@@ -3877 +3889 @@
 # Takes the record ID and the new type.  Returns boolean.
 sub downconvert {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $recid = shift;
   my $newtype = shift;
 
   # also, only work on live records;  little to no value trying to do this on default records.
-  my $rec = getRecLine($dbh, 'n', 'y', $recid);
+  my $rec = $self->getRecLine('n', 'y', $recid);
 
   # hm?
@@ -3930 +3943 @@
 sub delRec {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
   my $id = shift;
 
-  my $oldrec = getRecLine($dbh, $defrec, $revrec, $id);
+  my $oldrec = $self->getRecLine($defrec, $revrec, $id);
 
   # Allow transactions, and raise an exception on errors so we can catch it later.