Changeset 501 for trunk

Timestamp:

05/07/13 11:00:46 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Return some more useful errors from domainID() and revID() if the zone
doesn't exist
Commit a lurking change to allow a caller to specify the pagination
count in getRecList()

File:

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

trunk/DNSDB.pm

@@ -2009 +2009 @@
   my ($domid) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE lower(domain) = lower(?)",
         undef, ($domain) );
-  $errstr = $DBI::errstr if !$domid;
+  if (!$domid) {
+    if ($dbh->err) {
+      $errstr = $DBI::errstr;
+    } else {
+      $errstr = "Domain $domain not present";
+    }
+  }
   return $domid if $domid;
 } # end domainID()
@@ -2023 +2029 @@
   my $revzone = shift;
   my ($revid) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet=?", undef, ($revzone) );
-  $errstr = $DBI::errstr if !$revid;
+  if (!$revid) {
+    if ($dbh->err) {
+      $errstr = $DBI::errstr;
+    } else {
+      $errstr = "Reverse zone $revzone not present";
+    }
+  }
   return $revid if $revid;
 } # end revID()
@@ -3487 +3499 @@
   $args{sortby} = 'val' if !$args{sortby} && $args{revrec} eq 'y';      # default sort by IP on revzone record list
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;  
+  my $perpage = ($args{nrecs} ? $args{nrecs} : $config{perpage});
 
   # sort reverse zones on IP, correctly
@@ -3513 +3526 @@
   # ensure consistent ordering by sorting on record_id too
   $sql .= ", record_id $args{sortorder}";
-  $sql .= ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
+  $sql .= ($args{offset} eq 'all' ? '' : " LIMIT $perpage OFFSET ".$args{offset}*$perpage);
 
   my @bindvars = ($args{id});