Changeset 826

Timestamp:

03/06/21 09:17:26 (4 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend domID() and revID() to accept a magic string to search any location/view

File:

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

trunk/DNSDB.pm

@@ -2728 +2728 @@
   }
 
-  my ($domid) = $dbh->selectrow_array(
-        "SELECT domain_id FROM domains WHERE lower(domain) = lower(?) AND default_location = ?",
-        undef, ($domain, $location) );
+  my $sql = "SELECT domain_id FROM domains WHERE lower(domain) = lower(?)";
+  my @zargs = ($domain);
+  # yay magic strings!
+  if ($location eq ':ANY:') {
+    # no-op
+  } else {
+    $sql .= " AND default_location = ?";
+    push @zargs, $location;
+  }
+
+  my ($domid) = $dbh->selectrow_array($sql, undef, @zargs);
+
   if (!$domid) {
     if ($dbh->err) {
@@ -2759 +2768 @@
   }
 
-  my ($revid) = $dbh->selectrow_array(
-        "SELECT rdns_id FROM revzones WHERE revnet = ? AND default_location = ?",
-        undef, ($revzone, $location) );
+  my $sql = "SELECT rdns_id FROM revzones WHERE revnet = ?";
+  my @zargs = ($revzone);
+  # yay magic strings!
+  if ($location eq ':ANY:') {
+    # no-op
+  } else {
+    $sql .= " AND default_location = ?";
+    push @zargs, $location;
+  }
+
+  my ($revid) = $dbh->selectrow_array($sql, undef, @zargs);
+
   if (!$revid) {
     if ($dbh->err) {