Changeset 123 for trunk

Timestamp:

09/09/11 17:38:52 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fill out the remaining stubbed RPC calls; other subs from DNSDB

aren't as cleanly exposeable

Minor error-handling tweak in DNSDB.pm while retrieving a record line

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns-rpc.cgi (modified) (6 diffs)

trunk/DNSDB.pm

@@ -1078 +1078 @@
         (($def eq 'def' or $def eq 'y') ? ',r.group_id FROM default_' : ',r.domain_id FROM ').
         "records r LEFT OUTER JOIN longrecs l ON r.longrec_id=l.longrec_id WHERE record_id=?";
-  my $ret = $dbh->selectrow_hashref($sql, undef, ($id) ) or warn $dbh->errstr;
+  my $ret = $dbh->selectrow_hashref($sql, undef, ($id) );
 
   if ($dbh->err) {
     $errstr = $DBI::errstr;
+    return undef;
+  }
+
+  if (!$ret) {
+    $errstr = "No such record";
     return undef;
   }

trunk/dns-rpc.cgi

@@ -31 +31 @@
         'dnsdb.delUser'         => \&delUser,
         'dnsdb.getSOA'          => \&getSOA,
+        'dnsdb.getRecLine'      => \&getRecLine,
+        'dnsdb.getDomRecs'      => \&getDomRecs,
+        'dnsdb.getRecCount'     => \&getRecCount,
+        'dnsdb.addRec'          => \&addRec,
+        'dnsdb.delRec'          => \&delRec,
+        'dnsdb.domStatus'       => \&domStatus,
 
         'dnsdb.getMethods'      => \&get_method_list
@@ -237 +243 @@
   die "Missing remote username" if !$args{rpcuser};             # for logging
   die "Missing remote system name" if !$args{rpcsystem};        # for logging
+
+  my $ret = DNSDB::getRecLine($dbh, $args{def}, $args{id});
+
+  die $DNSDB::errstr if !$ret;
+
+  return $ret;
 }
 
@@ -245 +257 @@
   die "Missing remote username" if !$args{rpcuser};             # for logging
   die "Missing remote system name" if !$args{rpcsystem};        # for logging
-}
-
-#sub getRecCount {
+
+#bleh
+  $args{nrecs} = 'all' if !$args{nrecs};
+  $args{nstart} = 0 if !$args{nstart};
+## for order, need to map input to column names
+  $args{order} = 'host' if !$args{order};
+  $args{direction} = 'ASC' if !$args{direction};
+
+  my $ret = DNSDB::getDomRecs($dbh, $args{def}, $args{id}, $args{nrecs}, $args{nstart}, $args{order}, $args{direction});
+
+  die $DNSDB::errstr if !$ret;
+
+  return $ret;
+}
+
+sub getRecCount {
+  my %args = @_;
+
+  # Make sure we've got all the local bits we need
+  die "Missing remote username" if !$args{rpcuser};             # for logging
+  die "Missing remote system name" if !$args{rpcsystem};        # for logging
+
+  return DNSDB::getRecCount($dbh, $id);
+}
 
 sub addRec {
@@ -255 +288 @@
   die "Missing remote username" if !$args{rpcuser};             # for logging
   die "Missing remote system name" if !$args{rpcsystem};        # for logging
+
+  # note dist, weight, port are not reequired on all types;  will be ignored if not needed.
+  my ($code, $msg) = DNSDB::addRec($dbh, $args{def}, $args{domid}, $args{host}, $typemap{$args{type}},
+        $args{val}, $args{ttl}, $args{dist}, $args{weight}, $args{port});
+
+  die $msg if $code eq 'FAIL';
 }
 
@@ -263 +302 @@
   die "Missing remote username" if !$args{rpcuser};             # for logging
   die "Missing remote system name" if !$args{rpcsystem};        # for logging
+
+  # note dist, weight, port are not reequired on all types;  will be ignored if not needed.
+  my ($code, $msg) = DNSDB::updateRec($dbh, $args{def}, $args{recid}, $args{host}, $typemap{$args{type}},
+        $args{val}, $args{ttl}, $args{dist}, $args{weight}, $args{port});
+
+  die $msg if $code eq 'FAIL';
 }
 
@@ -271 +316 @@
   die "Missing remote username" if !$args{rpcuser};             # for logging
   die "Missing remote system name" if !$args{rpcsystem};        # for logging
+
+  # note dist, weight, port are not reequired on all types;  will be ignored if not needed.
+  my ($code, $msg) = DNSDB::delRec($dbh, $args{def}, $args{recid});
+
+  die $msg if $code eq 'FAIL';
 }
 
 #sub getParents {
-#sub domStatus {
+
+sub domStatus {
+  my %args = @_;
+
+  # Make sure we've got all the local bits we need
+  die "Missing remote username" if !$args{rpcuser};             # for logging
+  die "Missing remote system name" if !$args{rpcsystem};        # for logging
+
+  my @arglist = ($dbh, $args{domid});
+  push @arglist, $args{status} if defined($args{status});
+
+  my $status = DNSDB::domStatus(@arglist);
+}
+
 #sub importAXFR {
 #sub export {