Changeset 970 for branches

Timestamp:

01/08/26 14:42:52 (3 weeks ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Compact the timestamp check from r968 since it's looking like further
timestamp-related checks will need to go elsewhere anyway, and copy it
into the second section.
See #72, #88

File:

• branches/cname-collision/DNSDB.pm (modified) (2 diffs)

branches/cname-collision/DNSDB.pm

@@ -640 +640 @@
         " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type <> 5 AND $hfield = ?";
     if ($args{defrec} eq 'n') {
-      $sql .= " AND (";
       # Expired records
-      $sql .= "stampactive = 't' AND (expires = 't' AND stamp >= now())";
-
-      $sql .= ")";
+      $sql .= " AND (stampactive = 't' AND (expires = 't' AND stamp >= now()))";
     }
     my @lookupargs = ($args{id}, $hcheck);
@@ -662 +659 @@
   my $sql = "SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
         " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type = 5 AND $hfield = ?";
+  if ($args{defrec} eq 'n') {
+    # Expired records
+    $sql .= " AND (stampactive = 't' AND (expires = 't' AND stamp >= now()))";
+  }
   my @lookupargs = ($args{id}, $hcheck);
   if ($args{update}) {