Index: openacs-4/packages/acs-subsite/tcl/relation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/relation-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/tcl/relation-procs.tcl	10 Jun 2005 14:32:56 -0000	1.14
+++ openacs-4/packages/acs-subsite/tcl/relation-procs.tcl	10 Jan 2007 21:22:06 -0000	1.15
@@ -73,7 +73,7 @@
         and    object_id_two = :object_id_two
     } -default {}]
     
-    if { ![empty_string_p $existing_rel_id] } {
+    if { $existing_rel_id ne "" } {
         return $existing_rel_id
     }
 
@@ -85,7 +85,7 @@
     # membership relation before adding the member_state variable.  The 
     # package_instantiate_object proc will ignore the member_state variable
     # if the rel_type's plsql package doesn't support it.
-    if {![empty_string_p $member_state]} {
+    if {$member_state ne ""} {
 	lappend var_list [list member_state $member_state]
     }
 
@@ -117,7 +117,7 @@
 	#    select rel_constraint.violation(:rel_id) from dual
 	# } -default ""]
 	#
-	# if { ![empty_string_p $violated_err_msg] } {
+	# if { $violated_err_msg ne "" } {
 	#     error $violated_err_msg
 	# }
     } on_error {
@@ -158,7 +158,7 @@
     # relation. Note that this segment is defined by joining against
     # acs_rels to find the group and rel_type for this relation.
 
-    if { ![empty_string_p $segment_id] } {
+    if { $segment_id ne "" } {
 	if { [relation_segment_has_dependant -segment_id $segment_id -party_id $party_id] } {
 	    error "Relational constraints violated by removing this relation"
 	}
@@ -187,14 +187,14 @@
 
 } {
 
-    if { ![empty_string_p $rel_id] } {
+    if { $rel_id ne "" } {
 	if { ![db_0or1row select_rel_info {}] } {
 	    # There is either no relation or no segment... thus no dependants
 	    return 0
 	}
     }
 
-    if { [empty_string_p $segment_id] || [empty_string_p $party_id] } {
+    if { $segment_id eq "" || $party_id eq "" } {
 	error "Both of segment_id and party_id must be specified in call to relation_segment_has_dependant"
     }
 
@@ -219,7 +219,7 @@
                       [application_group::group_id_from_package_id]
     @param rel_type
 } {
-    if {[empty_string_p $group_id]} {
+    if {$group_id eq ""} {
 	set group_id [application_group::group_id_from_package_id]
     }
 
@@ -265,7 +265,7 @@
                       [applcation_group::group_id_from_package_id] is used.
 } {
 
-    if {[empty_string_p $group_id]} {
+    if {$group_id eq ""} {
 	set group_id [application_group::group_id_from_package_id]
     }
 
@@ -288,7 +288,7 @@
     Sets up a multirow datasource.
     Also returns a list containing the most essential information.
 } {
-    if {[empty_string_p $group_id]} {
+    if {$group_id eq ""} {
 	set group_id [application_group::group_id_from_package_id]
     }
 
@@ -358,8 +358,8 @@
 } {
     Return the list of object_ids if a relation of rel_type exists between the supplied object_id and it.
 } {
-    if {[empty_string_p $object_id_one]} {
-	if {[empty_string_p $object_id_two]} {
+    if {$object_id_one eq ""} {
+	if {$object_id_two eq ""} {
 	    ad_return_error "[_ acs-subsite.Missing_argument]" "[_ acs-subsite.lt_You_have_to_provide_a]"
 	} else {
 	    return [relation::get_object_one -object_id_two $object_id_two -rel_type $rel_type -multiple]