Changeset 495 for trunk

Timestamp:

05/03/13 15:36:40 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Rename getDomRecs to getRecList since it's used for group default
records, domain records, and reverse zone records.

Location:

trunk

Files:

• DNSDB.pm (modified) (5 diffs)
• dns-rpc.cgi (modified) (8 diffs)
• dns.cgi (modified) (1 diff)
• textrecs.cgi (modified) (2 diffs)

trunk/DNSDB.pm

@@ -49 +49 @@
         &addLoc &updateLoc &delLoc &getLoc
         &getLocCount &getLocList &getLocDropdown
-        &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
+        &getSOA &updateSOA &getRecLine &getRecList &getRecCount
         &addRec &updateRec &delRec
         &getLogCount &getLogEntries
@@ -77 +77 @@
                 &addLoc &updateLoc &delLoc &getLoc
                 &getLocCount &getLocList &getLocDropdown
-                &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
+                &getSOA &updateSOA &getRecLine &getRecList &getRecCount
                 &addRec &updateRec &delRec
                 &getLogCount &getLogEntries
@@ -238 +238 @@
   $self->{dbh}->disconnect;
 }
+
+sub errstr { $DNSDB::errstr; }
 
 ##
@@ -3465 +3467 @@
 
 ##fixme: should use above (getRecLine()) to get lines for below?
-## DNSDB::getDomRecs()
-# Return records for a domain
-# Takes a database handle, default/live flag, group/domain ID, start,
+## DNSDB::getRecList()
+# Return records for a group or zone
+# Takes a default/live flag, group or zone ID, start,
 # number of records, sort field, and sort order
 # Returns a reference to an array of hashes
-sub getDomRecs {
+sub getRecList {
   $errstr = '';
   my $self = shift;
@@ -3518 +3520 @@
 
   my $ret = $dbh->selectall_arrayref($sql, { Slice => {} }, (@bindvars) );
+  $errstr = "Error retrieving records: ".$dbh->errstr if !$ret;
   return $ret;
-} # end getDomRecs()
+} # end getRecList()
 
 

trunk/dns-rpc.cgi

@@ -52 +52 @@
         'dnsdb.getSOA'          => \&getSOA,
         'dnsdb.getRecLine'      => \&getRecLine,
-        'dnsdb.getDomRecs'      => \&getDomRecs,
+        'dnsdb.getRecList'      => \&getRecList,
         'dnsdb.getRecCount'     => \&getRecCount,
         'dnsdb.addRec'          => \&addRec,
@@ -341 +341 @@
 }
 
-sub getDomRecs {
+sub getRecList {
   my %args = @_;
 
@@ -353 +353 @@
   $args{direction} = 'ASC' if !$args{direction};
 
-  my $ret = $dnsdb->getDomRecs(defrec => $args{defrec}, revrec => $args{revrec}, id => $args{id},
+  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});
@@ -443 +443 @@
       # We need to strip the CIDR mask on IPv4 /32 assignments, or we just add a new record all the time.
       my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
-      my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
+      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
         id => $zonelist->[0]->{rdns_id}, filter => $filt);
       if (scalar(@$reclist) == 0) {
@@ -477 +477 @@
     # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
     foreach my $zdata (@$zonelist) {
-      my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
+      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
         id => $zdata->{rdns_id}, filter => $zdata->{revnet});
       if (scalar(@$reclist) == 0) {
@@ -527 +527 @@
       if ($args{delsubs}) {
         # Delete ALL EVARYTHING!!one11!! in $args{cidr}
-        my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
+        my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
         foreach my $rec (@$reclist) {
           my $reccidr = new NetAddr::IP $rec->{val};
@@ -554 +554 @@
         # We need to strip the CIDR mask on IPv4 /32 assignments, or we can't find single-IP records
         my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
-        my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
+        my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
           id => $zonelist->[0]->{rdns_id}, filter => $filt, sortby => 'val', sortorder => 'DESC');
         foreach my $rec (@$reclist) {
@@ -582 +582 @@
     # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
     foreach my $zdata (@$zonelist) {
-      my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y', id => $zdata->{rdns_id});
+      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y', id => $zdata->{rdns_id});
       if (scalar(@$reclist) == 0) {
 # nothing to do?  or do we (re)add a record based on the parent?

trunk/dns.cgi

@@ -1961 +1961 @@
   $page->param(ttl      => $soa->{ttl});
 
-  my $foo2 = $dnsdb->getDomRecs(defrec => $def, revrec => $rev, id => $id, offset => $webvar{offset},
+  my $foo2 = $dnsdb->getRecList(defrec => $def, revrec => $rev, id => $id, offset => $webvar{offset},
         sortby => $sortby, sortorder => $sortorder, filter => $filter);
 

trunk/textrecs.cgi

@@ -63 +63 @@
 
 ##fixme:  do we support both HTML-plain and true plaintext?  could be done, with another $webvar{}
-# Don't die on bad parameters.  Saves munging the return from getDomRecs.
+# Don't die on bad parameters.  Saves munging the return from getRecList.
 #my $page = HTML::Template->new(filename => "$templatedir/textrecs.tmpl",
 #       loop_context_vars => 1, global_vars => 1, die_on_bad_params => 0);
@@ -74 +74 @@
 print qq(Press the "Back" button to return to the standard record list.\n\n);
 
-my $reclist = $dnsdb->getDomRecs(defrec => $webvar{defrec}, revrec => $webvar{revrec}, id => $webvar{id},
+my $reclist = $dnsdb->getRecList(defrec => $webvar{defrec}, revrec => $webvar{revrec}, id => $webvar{id},
         sortby => ($webvar{revrec} eq 'n' ? 'type,host' : 'type,val'), sortorder => 'ASC');
 foreach my $rec (@$reclist) {