Changeset 22 for trunk/DNSDB.pm

Timestamp:

10/15/09 17:50:22 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint - basic group management should be complete

• fiddled HTML so that group-delete and domain-delete errors don't sit on top of the menu column

File:

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

trunk/DNSDB.pm

@@ -23 +23 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
-        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren &groupName
-        &getSOA &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
+        &initGlobals &connectDB &finish
+        &addDomain &delDomain &domainName
+        &addGroup &delGroup &getChildren &groupName
+        &getSOA &getRecLine &getDomRecs
+        &addRec &updateRec &delRec
+        &domStatus
         %typemap %reverse_typemap
         );
@@ -30 +34 @@
 @EXPORT         = (); # Export nothing by default.
 %EXPORT_TAGS    = ( ALL => [qw(
-                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren
-                &groupName &getSOA &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
+                &initGlobals &connectDB &finish
+                &addDomain &delDomain &domainName
+                &addGroup &delGroup &getChildren &groupName
+                &getSOA &getRecLine &getDomRecs
+                &addRec &updateRec &delRec
+                &domStatus
                 %typemap %reverse_typemap
                 )]
@@ -225 +233 @@
     $sth->execute($domid);
 
+#die "full of fail\n";
     # once we get here, we should have suceeded.
-    $dbh->commit;
+#    $dbh->commit;
   }; # end eval
 
@@ -302 +311 @@
     }
 
-die "epic FAIL..  hahahah, just testing!\n";
     # once we get here, we should have suceeded.
     $dbh->commit;
@@ -316 +324 @@
 
 } # end addGroup()
+
+
+## DNSDB::delGroup()
+# Delete a group.
+# Takes a group ID
+# Returns a status code and message
+sub delGroup {
+  my $dbh = shift;
+  my $groupid = shift;
+
+  # 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
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+##fixme:  locate "knowable" error conditions and deal with them before the eval
+# -> domains still exist in group
+# -> ...
+
+  # Wrap all the SQL in a transaction
+  eval {
+    my $sth = $dbh->prepare("delete from default_records where group_id=?");
+    $sth->execute($groupid);
+    $sth = $dbh->prepare("delete from groups where group_id=?");
+    $sth->execute($groupid);
+
+die "epic group fail FTW!\n";
+    # once we get here, we should have suceeded.
+    $dbh->commit;
+  }; # end eval
+
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    return ('FAIL',$msg);
+  } else {
+    return ('OK','OK');
+  }
+} # end delGroup()