Changeset 907 for trunk

Timestamp:

08/11/25 17:28:21 (13 hours ago)

Author:

Kris Deugau

Message:

/trunk

A bundle of small ad hoc patches from my workspace:

• Trivial docucomment tweak
• Call the right DBI statement handle sub to return the record ID in addRec()
• Sort domain records by IP value in export_tiny() so potential zingle-zone export sorts template records the same way as reverse zone export does
• Trivial syntax niggle

File:

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

trunk/DNSDB.pm

@@ -1963 +1963 @@
   my $tmpl = shift;
   my $ip = shift;
-  my $subnet = shift;   # %ngb, %c, and %x
+  my $subnet = shift;   # for %ngb, %c, and %x
   my $ipindex = shift;  # for %c
 
@@ -4871 +4871 @@
   my $retid;
   eval {
-    ($retid) = $dbh->selectrow("INSERT INTO "._rectable($defrec, $revrec)." ($fields) VALUES ($vallen) RETURNING record_id",
+    ($retid) = $dbh->selectrow_array("INSERT INTO "._rectable($defrec, $revrec)." ($fields) VALUES ($vallen) RETURNING record_id",
         undef,
         @vallist
@@ -6564 +6564 @@
         "FROM records WHERE domain_id=? AND type=6");
   $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location,extract(epoch from stamp),expires,stampactive ".
-        "FROM records WHERE domain_id=? AND NOT type=6");       # Just exclude all types relating to rDNS
+        "FROM records WHERE domain_id=? AND NOT type=6").       # Just exclude all types relating to rDNS
+        "ORDER BY masklen(inetlazy(val)) DESC, inetlazy(val)");
 #       "FROM records WHERE domain_id=? AND type < 65280");     # Just exclude all types relating to rDNS
   my $domsth = $dbh->prepare("SELECT domain_id,domain,status,changed FROM domains WHERE status=1 ORDER BY domain_id");
@@ -6925 +6926 @@
       } else {
         # call sub to convert 1-4 hex digits to 2 string-rep octal bytes
-        $altconv[$altgrp++] = octalize($_)
+        $altconv[$altgrp++] = octalize($_);
       }
     }