Changeset 62 for trunk/DNSDB.pm

Timestamp:

01/19/10 16:50:05 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint
dns.cgi:

Fix lurking rebuglet on removing search filter
Add logging on domain active/inactive
Make sure to propagate error messages on domain add/delete as required
Logging of domain add/delete should now be complete
Record add/delete/update logging should be complete (not completely tested)
Explicitly set $startwith, $filter, and $searchsubs in listdomains()

DNSDB.pm:

Remove debugging cruft in DNSDB
Return the parent ID for a record in getRecLine
Normalize some SQL formatting

File:

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

trunk/DNSDB.pm

@@ -243 +243 @@
   my $domid = shift;
 
-return "FAIL", "whee!";
   # Allow transactions, and raise an exception on errors so we can catch it later.
   # Use local to make sure these get "reset" properly on exiting this block
@@ -684 +683 @@
   my $id = shift;
 
-  my $sql = "select record_id,host,type,val,distance,weight,port,ttl from ".
-        (($def eq 'def' or $def eq 'y') ? 'default_' : '').
-        "records where record_id=$id";
-print "MDEBUG: $sql<br>\n";
+  my $sql = "SELECT record_id,host,type,val,distance,weight,port,ttl".
+        (($def eq 'def' or $def eq 'y') ? ',group_id FROM default_' : ',domain_id FROM ').
+        "records WHERE record_id=?";
   my $sth = $dbh->prepare($sql);
-  $sth->execute;
-
-  my ($recid,$host,$rtype,$val,$distance,$weight,$port,$ttl) = $sth->fetchrow_array();
+  $sth->execute($id);
+
+  my ($recid,$host,$rtype,$val,$distance,$weight,$port,$ttl,$parid) = $sth->fetchrow_array();
 
   if ($sth->err) {
@@ -706 +704 @@
   $ret{port}    = $port;
   $ret{ttl}     = $ttl;
+  $ret{parid}   = $parid;
 
   return %ret;
@@ -728 +727 @@
   my $order = shift || 'host';
 
-  my $sql = "select record_id,host,type,val,distance,weight,port,ttl from";
+  my $sql = "SELECT record_id,host,type,val,distance,weight,port,ttl FROM ";
   if ($type eq 'def' or $type eq 'y') {
     $sql .= " default_records where group_id=$id";
@@ -861 +860 @@
   my $id = shift;
 
-  my $sth = $dbh->prepare("delete from ".($defrec eq 'y' ? 'default_' : '')."records where record_id=?");
+return "FAIL", "wakka wakka";
+  my $sth = $dbh->prepare("DELETE FROM ".($defrec eq 'y' ? 'default_' : '')."records WHERE record_id=?");
   $sth->execute($id);