Changeset 20 for trunk/DNSDB.pm

Timestamp:

10/15/09 13:23:51 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint, group mangling almost complete
also normalized *most* group* refs to use "group*" vs "grp*"

File:

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

trunk/DNSDB.pm

@@ -23 +23 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
-        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren &grpName &getSOA
-        &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
+        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren &groupName
+        &getSOA &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
         %typemap %reverse_typemap
         );
@@ -30 +30 @@
 @EXPORT         = (); # Export nothing by default.
 %EXPORT_TAGS    = ( ALL => [qw(
-                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren &grpName 
-&getSOA
-                &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
+                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren
+                &groupName &getSOA &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
                 %typemap %reverse_typemap
                 )]
@@ -264 +263 @@
   $errstr = '';
   my $dbh = shift;
-  my $grpname = shift;
-  my $pargrp = shift;
+  my $groupname = shift;
+  my $pargroup = shift;
 
   # 0 indicates "template", hardcoded.
@@ -279 +278 @@
   eval {
     my $sth = $dbh->prepare("INSERT INTO groups (parent_group_id,group_name) VALUES (?,?)");
-    $sth->execute($pargrp,$grpname);
+    $sth->execute($pargroup,$groupname);
 
     $sth = $dbh->prepare("SELECT group_id FROM groups WHERE group_name=?");
-    $sth->execute($grpname);
-    my ($grpid) = $sth->fetchrow_array();
+    $sth->execute($groupname);
+    my ($groupid) = $sth->fetchrow_array();
 
     $sth = $dbh->prepare("INSERT INTO default_records (group_id,host,type,val,distance,weight,port,ttl) ".
-        "VALUES ($grpid,?,?,?,?,?,?,?)");
+        "VALUES ($groupid,?,?,?,?,?,?,?)");
     if ($torc) {
       my $sth2 = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM default_records WHERE group_id=?");
@@ -326 +325 @@
   $errstr = '';
   my $dbh = shift;
-  my $rootgrp = shift;
-  my $grpdest = shift;
+  my $rootgroup = shift;
+  my $groupdest = shift;
 
   # special break for default group;  otherwise we get stuck.
-  if ($rootgrp == 1) {
+  if ($rootgroup == 1) {
     # by definition, group 1 is the Root Of All Groups
     my $sth = $dbh->prepare("SELECT group_id FROM groups");
     $sth->execute;
-    my @grplist;
+    my @grouplist;
     while (my @this = $sth->fetchrow_array) {
-      push @$grpdest, @this;
+      push @$groupdest, @this;
     }
   } else {
     my $sth = $dbh->prepare("SELECT group_id FROM groups WHERE parent_group_id=?");
-    $sth->execute($rootgrp);
+    $sth->execute($rootgroup);
     return if $sth->rows == 0;
-    my @grplist;
-    while (my ($grp) = $sth->fetchrow_array) {
-      push @$grpdest, $grp;
-      getChildren($dbh,$grp,$grpdest);
+    my @grouplist;
+    while (my ($group) = $sth->fetchrow_array) {
+      push @$groupdest, $group;
+      getChildren($dbh,$group,$groupdest);
     }
   }
@@ -351 +350 @@
 
 
-## DNSDB::grpName()
+## DNSDB::groupName()
 # Return the group name based on a group ID
 # Takes a database handle and the group ID
 # Returns the group name or undef on failure
-sub grpName {
-  $errstr = '';
-  my $dbh = shift;
-  my $grpid = shift;
-  my $sth = $dbh->prepare("select name from groups where group_id=?");
-  $sth->execute($grpid);
-  my ($grpname) = $sth->fetchrow_array();
-  $errstr = $DBI::errstr if !$grpname;
-  return $grpname if $grpname;
-} # end domainName
+sub groupName {
+  $errstr = '';
+  my $dbh = shift;
+  my $groupid = shift;
+  my $sth = $dbh->prepare("SELECT group_name FROM groups WHERE group_id=?");
+  $sth->execute($groupid);
+  my ($groupname) = $sth->fetchrow_array();
+  $errstr = $DBI::errstr if !$groupname;
+  return $groupname if $groupname;
+} # end groupName