Changeset 384 for trunk

Timestamp:

08/13/12 17:29:21 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix bugs in new SQL bits in getDomRecs(). See #10.

• Don't retrieve location on $def, not $rev
• Use left join to pull in location, so that the presence or absence of a location on a record does not determine if it shows up in the record list

File:

• trunk/DNSDB.pm (modified) (1 diff)

trunk/DNSDB.pm

@@ -3302 +3302 @@
 
   my $sql = "SELECT r.record_id,r.host,r.type,r.val,r.ttl";
+  $sql .= ",l.description AS locname" if $def eq 'n';
   $sql .= ",r.distance,r.weight,r.port" if $rev eq 'n';
   $sql .= " FROM "._rectable($def,$rev)." r ";
   $sql .= "INNER JOIN rectypes t ON r.type=t.val ";     # for sorting by type alphabetically
+  $sql .= "LEFT JOIN locations l ON r.location=l.location " if $def eq 'n';
   $sql .= "WHERE "._recparent($def,$rev)." = ?";
   $sql .= " AND NOT r.type=$reverse_typemap{SOA}";