Changeset 386

Timestamp:

09/17/12 17:52:13 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix the fix for the slow group listing; it only worked when "Search
subgroups" was selected, instead of returning counts for the subgroups
of the current group.

File:

• trunk/DNSDB.pm (modified) (1 diff)

trunk/DNSDB.pm

@@ -2483 +2483 @@
 ##fixme:  put this whole sub in a transaction?  might be
 # needed for accurate results on very busy systems.
-  my %gref;
-  my $i = 0;
+##fixme:  large group lists need prepared statements?
+#my $ucsth = $dbh->prepare("SELECT count(*) FROM users WHERE group_id=?");
+#my $dcsth = $dbh->prepare("SELECT count(*) FROM domains WHERE group_id=?");
+#my $rcsth = $dbh->prepare("SELECT count(*) FROM revzones WHERE group_id=?");
   foreach (@{$glist}) {
-    $gref{$$_{groupid}} = $i++;
-  }
-  my $tmpchlist = $args{curgroup}.($args{childlist} ? ",$args{childlist}" : '');
-  foreach my $grp (split /,/, $tmpchlist) {
-    my ($ucnt) = $dbh->selectrow_array("SELECT count(*) FROM users WHERE group_id=?", undef, ($grp));
-    $glist->[$gref{$grp}]{nusers} = $ucnt;
-    my ($dcnt) = $dbh->selectrow_array("SELECT count(*) FROM domains WHERE group_id=?", undef, ($grp));
-    $glist->[$gref{$grp}]{ndomains} = $dcnt;
-    my ($rcnt) = $dbh->selectrow_array("SELECT count(*) FROM revzones WHERE group_id=?", undef, ($grp));
-    $glist->[$gref{$grp}]{nrevzones} = $rcnt;
+    my ($ucnt) = $dbh->selectrow_array("SELECT count(*) FROM users WHERE group_id=?", undef, ($$_{groupid}));
+    $$_{nusers} = $ucnt;
+    my ($dcnt) = $dbh->selectrow_array("SELECT count(*) FROM domains WHERE group_id=?", undef, ($$_{groupid}));
+    $$_{ndomains} = $dcnt;
+    my ($rcnt) = $dbh->selectrow_array("SELECT count(*) FROM revzones WHERE group_id=?", undef, ($$_{groupid}));
+    $$_{nrevzones} = $rcnt;
   }