Changeset 500 for trunk

Timestamp:

05/07/13 10:44:58 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak and fiddle dns-rpc.cgi's getRecList() a little more to handle an
alternate calling convention, and handle passing a zone name instead of
a zone ID.

File:

• trunk/dns-rpc.cgi (modified) (3 diffs)

trunk/dns-rpc.cgi

@@ -43 +43 @@
         'dnsdb.addDomain'       => \&addDomain,
         'dnsdb.delZone'         => \&delZone,
+        'dnsdb.domainID'        => \&domainID,
         'dnsdb.addRDNS'         => \&addRDNS,
         'dnsdb.addGroup'        => \&addGroup,
@@ -173 +174 @@
 #sub domainName {}
 #sub revName {}
-#sub domainID {}
+
+sub domainID {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  my $domid = $dnsdb->domainID($args{domain});
+  die $dnsdb->errstr if !$domid;
+  return $domid;
+}
+
 #sub revID {}
 
@@ -346 +357 @@
   _commoncheck(\%args);
 
+  # deal gracefully with alternate calling convention for args{id}
+  $args{id} = $args{ID} if !$args{id} && $args{ID};
+  # ... and fail if we don't have one
+  die "Missing zone ID\n" if !$args{id};
+
   # set some optional args
-  $args{nrecs} = 'all' if !$args{nrecs};
-  $args{nstart} = 0 if !$args{nstart};
+  $args{offset} = 0 if !$args{offset};
 ## for order, need to map input to column names
   $args{order} = 'host' if !$args{order};
   $args{direction} = 'ASC' if !$args{direction};
-
+  $args{defrec} = 'n' if !$args{defrec};
+  $args{revrec} = 'n' if !$args{revrec};
+
+  # convert zone name to zone ID, if needed
+  if ($args{defrec} eq 'n') {
+    if ($args{revrec} eq 'n') {
+      $args{id} = $dnsdb->domainID($args{id}) if $args{id} !~ /^\d+$/;
+    } else {
+      $args{id} = $dnsdb->revID($args{id}) if $args{id} !~ /^\d+$/
+    }
+  }
+
+  # and finally retrieve the records.
   my $ret = $dnsdb->getRecList(defrec => $args{defrec}, revrec => $args{revrec}, id => $args{id},
-        offset => $args{offset}, sortby => $args{sortby}, sortorder => $args{sortorder},
-        filter => $args{filter});
-
+        offset => $args{offset}, nrecs => $args{nrecs}, sortby => $args{sortby},
+        sortorder => $args{sortorder}, filter => $args{filter});
+
+##fixme:  what to do if domain doesn't exist?
   die $dnsdb->errstr if !$ret;