Changeset 117 for trunk/DNSDB.pm

Timestamp:

09/01/11 15:55:00 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Add getParents (untested) and isParent (tested) subs
Add some supporting hashes for entity -> parent(entity)

relationships in the database - private to DNSDB.pm

Rename tmp_ruri to uri_self for clarity and reuse
Move uri_self munging from ##common area so that more

subs can use it

Update group tree to change the current group by clicking

the group name. Working comments need to be cleaned up
and choose-a-group dropdown removed from the menu

File:

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

trunk/DNSDB.pm

@@ -34 +34 @@
         &getSOA &getRecLine &getDomRecs &getRecCount
         &addRec &updateRec &delRec
-        &isParent
+        &getParents
+        &isParent
         &domStatus &importAXFR
         &export
@@ -52 +53 @@
                 &getSOA &getRecLine &getDomRecs &getRecCount
                 &addRec &updateRec &delRec
-                &isParent
+                &getParents
+                &isParent
                 &domStatus &importAXFR
                 &export
@@ -1322 +1324 @@
 
 
+  # Reference hashes.
+  my %par_tbl = (
+                group   => 'groups',
+                user    => 'users',
+                defrec  => 'default_records',
+                domain  => 'domains',
+                record  => 'records'
+        );
+  my %id_col = (
+                group   => 'group_id',
+                user    => 'user_id',
+                defrec  => 'record_id',
+                domain  => 'domain_id',
+                record  => 'record_id'
+        );
+  my %par_col = (
+                group   => 'parent_group_id',
+                user    => 'group_id',
+                defrec  => 'group_id',
+                domain  => 'group_id',
+                record  => 'domain_id'
+        );
+  my %par_type = (
+                group   => 'group',
+                user    => 'group',
+                defrec  => 'group',
+                domain  => 'group',
+                record  => 'domain'
+        );
+
 ## DNSDB::getParents()
 # Find out which entities are parent to the requested id
@@ -1329 +1361 @@
   my $id = shift;
   my $type = shift;
-
-  # Get immediate parent
-  $par_col = 'group_id';
-
-  if ($type eq 'user') {
-    $table = 'users';
-    $id_col = 'user_id';
-  }
-  if ($type eq 'defrec') {
-    $table = 'default_records';
-    $id_col = 'record_id';
-  }
-  if ($type eq 'domain') {
-    $table = 'domains';
-    $id_col = 'domain_id';
-  }
-  if ($type eq 'record') {
-    $table = 'records';
-    $id_col = 'record_id';
-    $par_col = 'domain_id';
-  }
-
-$dbh->do("SELECT $par_col FROM $table WHERE $id_col = ?", 
+  my $depth = shift || 'all';   # valid values:  'all', 'immed', <int> (stop at this group ID)
+
+  my @parlist;
+
+  while (1) {
+    my $result = $dbh->selectrow_hashref("SELECT $par_col{$type} FROM $par_tbl{$type} WHERE $id_col{$type} = ?",
+        undef, ($id) );
+    unshift @parlist, ($result->{$par_col{$type}} => $par_type{$type});
+    last if $result->{$par_col{$type}} == 1;    # group 1 is its own parent
+    $type = $par_type{$type};
+    $id = $result->{$par_col{$type}};
+  }
+
+  return \@parlist;
 
 } # end getParents()
+
+
+## DNSDB::isParent()
+# Returns true if $id1 is a parent of $id2, false otherwise
+sub isParent {
+  my $dbh = shift;
+  my $id1 = shift;
+  my $type1 = shift; 
+  my $id2 = shift;
+  my $type2 = shift;
+##todo:  immediate, secondary, full (default)
+
+  # Return false on impossible relations
+  return 0 if $type1 eq 'record';       # nothing may be a child of a record
+  return 0 if $type1 eq 'defrec';       # nothing may be a child of a record
+  return 0 if $type1 eq 'user';         # nothing may be child of a user
+  return 0 if $type1 eq 'domain' && $type2 ne 'record'; # domain may not be a parent of anything other than a record
+
+  # group 1 is the ultimate root parent
+  return 1 if $type1 eq 'group' && $id1 == 1;
+
+# almost the same loop as getParents() above
+  my $id = $id2;
+  my $type = $type2;
+  my $foundparent = 0;
+my $tmp = 0;
+  while (1) {
+my $sql = "SELECT $par_col{$type} FROM $par_tbl{$type} WHERE $id_col{$type} = ?";
+    my $result = $dbh->selectrow_hashref($sql,
+        undef, ($id) ) or warn $dbh->errstr." $sql";
+    if ($result->{$par_col{$type}} == $id1) {
+      $foundparent = 1;
+      last;
+    }
+    # group 1 is its own parent.  need this here more to break strange loops than for detecting a parent
+    last if $result->{$par_col{$type}} == 1;
+    $type = $par_type{$type};
+    $id = $result->{$par_col{$type}};
+last if $tmp++ > 10;
+  }
+
+  return $foundparent;
+} # end isParent()