Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	19 Jan 2005 14:58:28 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	10 Jan 2007 21:22:08 -0000	1.4
@@ -14,7 +14,7 @@
     {rename_application:integer {}}
 }
 
-if {[empty_string_p $root_id]} {
+if {$root_id eq ""} {
     set root_id [ad_conn node_id]
 }
 
@@ -28,15 +28,15 @@
 set parent_id $node(parent_id)
 set object_id $node(object_id)
 
-if {![empty_string_p $object_id]} {
+if {$object_id ne ""} {
     ad_require_permission $object_id admin
 }
 
-if {![empty_string_p $new_parent]} {
+if {$new_parent ne ""} {
     set javascript "onLoad=\"javascript:document.new_parent.name.focus();document.new_parent.name.select()\""
-} elseif {![empty_string_p $new_application]} {
+} elseif {$new_application ne ""} {
     set javascript "onLoad=\"javascript:document.new_application.instance_name.focus();document.new_application.instance_name.select()\""
-} elseif {![empty_string_p $rename_application]} {
+} elseif {$rename_application ne ""} {
    set javascript "onLoad=\"javascript:document.rename_application.instance_name.focus();document.rename_application.instance_name.select()\""
 } else {
     set javascript ""
@@ -52,20 +52,20 @@
 set user_id [ad_conn user_id]
 
 db_foreach path_select {} {
-    if {$node_id != $root_id && $admin_p == "t"} {
+    if {$node_id != $root_id && $admin_p eq "t"} {
 	append head "<a href=.?[export_url_vars expand:multiple root_id=$node_id]>"
     }
-    if {[empty_string_p $name]} {
+    if {$name eq ""} {
 	append head "$obj_name:"
     } else {
 	append head $name
     }
     
-    if {$node_id != $root_id && $admin_p == "t"} {
+    if {$node_id != $root_id && $admin_p eq "t"} {
 	append head "</a>"
     }
     
-    if {$directory_p == "t"} {
+    if {$directory_p eq "t"} {
 	append head "/"
     }
 } if_no_rows {
@@ -74,7 +74,7 @@
 
 if {[llength $expand] == 0} {
     lappend expand $root_id 
-    if { ![empty_string_p $parent_id] } {
+    if { $parent_id ne "" } {
         lappend expand $parent_id
     }
 }
@@ -180,11 +180,11 @@
     set delete_url ""
     set parameters_url ""
     set permissions_url ""
-    if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id != "" && $mylevel > 2 } { continue } 
+    if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue } 
         
-    if {$directory_p == "t"} {
+    if {$directory_p eq "t"} {
 	set add_folder_url "?[export_url_vars expand:multiple root_id node_id new_parent=$node_id new_type=folder]"
-	if {[empty_string_p $object_id]} {
+	if {$object_id eq ""} {
 	    set mount_url "mount?[export_url_vars expand:multiple root_id node_id]"
 	    set new_app_url "?[export_url_vars expand:multiple root_id new_application=$node_id]"
 	} else {
@@ -200,15 +200,15 @@
 		set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
 	    }
 	    # Is the object a package?
-	    if {![empty_string_p $package_id]} {
+	    if {$package_id ne ""} {
 		if {$object_admin_p && ($parameter_count > 0)} {
 		    set parameters_url "[export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]"
 		}
 	    }
 	}
     }
     
-    if {[ad_conn node_id] != $node_id && $n_children == 0 && [empty_string_p $object_id]} {
+    if {[ad_conn node_id] != $node_id && $n_children == 0 && $object_id eq ""} {
 	set delete_url "delete?[export_url_vars expand:multiple root_id node_id]"
     }
     
@@ -252,7 +252,7 @@
     set action_type 0
     set action_form_part ""
     
-    if {[empty_string_p $object_id]} {
+    if {$object_id eq ""} {
 	if {$new_application == $node_id} {
 	    
 	    set action_type "new_app"