Changeset 91 for trunk/DNSDB.pm

Timestamp:

04/13/11 16:00:10 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

SQL tabledef update:

• Tweak log table definition to cope with looooong entries (mainly from AXFR warnings)

DNSDB.pm:

• Add domainID and getRecCount subs in DNSDB
• Return more user-friendly error on attempting to add a domain with no name
• Nitpick-tweak DB calls and SQL formatting in domainName()
• Replace placeholderish OK message in importAXFR()

dns.cgi:

• Trim some more direct SQL out in reclist
• Uninitialized-variable cleanup in AXFR import
• Add logging to AXFR import
• Don't complain about uninitialized variables in record-display

File:

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

trunk/DNSDB.pm

@@ -28 +28 @@
         &initPermissions &getPermissions &changePermissions &comparePermissions
         &connectDB &finish
-        &addDomain &delDomain &domainName
+        &addDomain &delDomain &domainName &domainID
         &addGroup &delGroup &getChildren &groupName
         &addUser &updateUser &delUser &userFullName &userStatus &getUserData
-        &getSOA &getRecLine &getDomRecs
+        &getSOA &getRecLine &getDomRecs &getRecCount
         &addRec &updateRec &delRec
         &domStatus &importAXFR
@@ -43 +43 @@
                 &initPermissions &getPermissions &changePermissions &comparePermissions
                 &connectDB &finish
-                &addDomain &delDomain &domainName
+                &addDomain &delDomain &domainName &domainID
                 &addGroup &delGroup &getChildren &groupName
                 &addUser &updateUser &delUser &userFullName &userStatus &getUserData
-                &getSOA &getRecLine &getDomRecs
+                &getSOA &getRecLine &getDomRecs &getRecCount
                 &addRec &updateRec &delRec
                 &domStatus &importAXFR
@@ -367 +367 @@
   return ('FAIL',"Need database handle") if !$dbh;
   my $domain = shift;
-  return ('FAIL',"Need domain") if !defined($domain);
+  return ('FAIL',"Domain must not be blank") if !$domain;
   my $group = shift;
   return ('FAIL',"Need group") if !defined($group);
@@ -470 +470 @@
   my $dbh = shift;
   my $domid = shift;
-  my $sth = $dbh->prepare("select domain from domains where domain_id=?");
-  $sth->execute($domid);
-  my ($domname) = $sth->fetchrow_array();
+  my ($domname) = $dbh->selectrow_array("SELECT domain FROM domains WHERE domain_id=?", undef, ($domid) );
   $errstr = $DBI::errstr if !$domname;
   return $domname if $domname;
-} # end domainName
+} # end domainName()
+
+
+## DNSDB::domainID()
+# Takes a database handle and domain name
+# Returns the domain ID number
+sub domainID {
+  $errstr = '';
+  my $dbh = shift;
+  my $domain = shift;
+  my ($domid) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?", undef, ($domain) );
+  $errstr = $DBI::errstr if !$domid;
+  return $domid if $domid;
+} # end domainID()
 
 
@@ -1086 +1097 @@
   return $ret;
 } # end getDomRecs()
+
+
+## DNSDB::getRecCount()
+# Return count of non-SOA records in domain (or default records in a group)
+# Takes a database handle, default/live flag and group/domain ID
+# Returns the count
+sub getRecCount {
+  my $dbh = shift;
+  my $defrec = shift;
+  my $id = shift;
+
+  my ($count) = $dbh->selectrow_array("SELECT count(*) FROM ".
+        ($defrec eq 'y' ? 'default_' : '')."records ".
+        "WHERE ".($defrec eq 'y' ? 'group' : 'domain')."_id=? ".
+        "AND NOT type=$reverse_typemap{SOA}", undef, ($id) );
+
+  return $count;
+
+} # end getRecCount()
 
 
@@ -1487 +1517 @@
   } else {
     return ('WARN', $warnmsg) if $warnmsg;
-    return ('OK',"ook");
+    return ('OK',"Imported OK");
   }