Index: openacs-4/packages/acs-admin/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/index.adp	31 Dec 2003 01:03:44 -0000	1.9
+++ openacs-4/packages/acs-admin/www/index.adp	20 Jun 2007 06:21:48 -0000	1.10
@@ -18,6 +18,13 @@
   </ul>
 </if>
 
+<if @too_many_subsites_p gt 0>
+  <h3>Subsite Administration</h3>
+Too many subsites to display: @subsite_number@
+<p />
+</if>
+<else>
+
 <if @subsites:rowcount@ gt 0>
   <h3>Subsite Administration</h3>
   <ul>
@@ -26,7 +33,7 @@
     </multiple>
   </ul>
 </if>
-
+</else>
 <h3>Service Administration</h3>
 
 <include src="/packages/acs-admin/lib/service-parameters">
Index: openacs-4/packages/acs-admin/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/index.tcl	10 Jan 2007 21:21:59 -0000	1.11
+++ openacs-4/packages/acs-admin/www/index.tcl	20 Jun 2007 06:21:48 -0000	1.12
@@ -6,23 +6,28 @@
 }
 
 set page_title [ad_conn instance_name]
+set subsite_number [db_string count_subsites "select count(*) from apm_packages where package_key = 'acs-subsite'"]
+if {$subsite_number > 100} {
+    set too_many_subsites_p 1
+} else {
+    set too_many_subsites_p 0
 
-db_multirow -extend { admin_url path_pretty } subsites subsite_admin_urls {} {
-    set admin_url "${node_url}admin/"
-    set path_pretty $instance_name
-    array set node [site_node::get -node_id $node_id]
-    set parent_id $node(parent_id)
-
-    while { $parent_id ne "" } {
-        array unset node
-        array set node [site_node::get -node_id $parent_id]
-        set path_pretty "$node(instance_name) > $path_pretty"
-        set parent_id $node(parent_id)
+    db_multirow -extend { admin_url path_pretty } subsites subsite_admin_urls {} {
+	set admin_url "${node_url}admin/"
+	set path_pretty $instance_name
+	array set node [site_node::get -node_id $node_id]
+	set parent_id $node(parent_id)
+	
+	while { $parent_id ne "" } {
+	    array unset node
+	    array set node [site_node::get -node_id $parent_id]
+	    set path_pretty "$node(instance_name) > $path_pretty"
+	    set parent_id $node(parent_id)
+	}
     }
+    multirow sort subsites path_pretty
 }
 
-multirow sort subsites path_pretty
-
 db_multirow -extend { admin_url } packages installed_packages {} {
     if { [apm_package_installed_p $package_key] && [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"] } {
         set admin_url "package/$package_key/"