Index: openacs-4/packages/acs-subsite/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-subsite/tcl/package-procs.tcl	18 Jan 2005 17:06:36 -0000	1.22
+++ openacs-4/packages/acs-subsite/tcl/package-procs.tcl	10 Jan 2007 21:22:06 -0000	1.23
@@ -75,7 +75,7 @@
                   attributes
 
 } {
-    if { [empty_string_p $table] || [empty_string_p $column] } {
+    if { $table eq "" || $column eq "" } {
 	# pull out the table and column names based on the object type
 	db_1row select_type_info {
 	    select t.table_name as table, t.id_column as column
@@ -103,7 +103,7 @@
     # duplicate column names
     set all_attributes([string toupper $column]) 1
 
-    if { ![empty_string_p $column_value] } {
+    if { $column_value ne "" } {
 	# column value is the same physical column as $column - just
 	# named differently in the attribute list. We still don't want
 	# duplicates
@@ -128,7 +128,7 @@
         order by t.type_level 
     } {
 	# First make sure the attribute is okay
-	if { ![empty_string_p $limit_to] } {
+	if { $limit_to ne "" } {
 	    # We have a limited list of arguments to use. Make sure
 	    # this attribute is one of them
 	    if { [lsearch -exact $limit_to $attr_column_name] == -1 } {
@@ -145,7 +145,7 @@
 	set all_attributes($attr_column_name) 1
     }
     
-    if { ![empty_string_p $supertype] && ![empty_string_p $object_name] } {
+    if { $supertype ne "" && $object_name ne "" } {
 	foreach row [util_memoize "package_table_columns_for_type \"$supertype\""] {
 	    set table_name [lindex $row 0]
 	    set column_name [lindex $row 1]
@@ -200,15 +200,15 @@
 
     # We handle defaults grossly here, but I don't currently have
     # a better idea how to do this
-    if { ![empty_string_p $attr_default] } {
+    if { $attr_default ne "" } {
 	return "'[DoubleApos $attr_default]'"
     } 
 
     # Special cases for acs_object and acs_rels
     # attributes. Default case sets default to null unless the
     # attribute is required (min_n_values > 0)
 
-    if { [string equal $table "ACS_OBJECTS"] } {
+    if {$table eq "ACS_OBJECTS"} {
 	switch -- $column {
 	    "OBJECT_TYPE"   { return "'[DoubleApos $object_type]'" }
 	    "CREATION_DATE" { return [db_map creation_date] }
@@ -217,7 +217,7 @@
 	    "LAST_MODIFIED" { return [db_map last_modified] }
 	    "MODIFYING_IP"  { return "NULL" }
 	}
-    } elseif { [string equal $table "ACS_RELS"] } {
+    } elseif {$table eq "ACS_RELS"} {
 	switch -- $column {
 	    "REL_TYPE"      { return "'[DoubleApos $object_type]'" }
 	}
@@ -312,7 +312,7 @@
     lappend plsql [list "package" "create_package" [package_generate_spec $object_type]]
     lappend plsql [list "package body" "create_package_body" [package_generate_body $object_type]]
 
-    if { $debug_p == "t" } {
+    if { $debug_p eq "t" } {
 	foreach pair $plsql {
 #	    append text "[plsql_utility::parse_sql [lindex $pair 1]]\n\n"
 	    append text [lindex $pair 2]
@@ -475,7 +475,7 @@
     @param start_with The highest parent object type for which to include attributes
     @param object_type The object for which to create a package spec
 } {
-    if { [string eq $refresh_p "t"] } {
+    if {$refresh_p eq "t"} {
 	package_object_view_reset $object_type
     }
     return [util_memoize "package_object_view_helper -start_with $start_with $object_type"]
@@ -510,7 +510,7 @@
     
 
     set columns [list "${table_name}.${id_column}"]
-    if { ![string eq [string tolower $id_column] "object_id"] } {
+    if { [string tolower $id_column] ne "object_id" } {
 	# Add in an alias for object_id
 	lappend columns "${table_name}.${id_column} as object_id"
     }
@@ -522,7 +522,7 @@
 	set column [lindex $row 2]
 	set object_column [lindex $row 8]
 
-	if { [string eq [string tolower $column] "object_id"] } {
+	if {[string tolower $column] eq "object_id"} {
 	    # We already have object_id... skip this column
 	    continue
 	}
@@ -544,8 +544,8 @@
     }
 
     set pk_formatted [list]
-    for { set i 0 } { $i < [expr [llength $primary_keys] - 1] } { incr i } {
-	lappend pk_formatted "[lindex $primary_keys $i] = [lindex $primary_keys [expr $i +1]]"
+    for { set i 0 } { $i < [expr {[llength $primary_keys] - 1}] } { incr i } {
+	lappend pk_formatted "[lindex $primary_keys $i] = [lindex $primary_keys [expr {$i +1}]]"
     }
     return "SELECT [string tolower [join $columns ",\n       "]]
   FROM [string tolower [join $tables ", "]]
@@ -606,7 +606,7 @@
 
     set storage_clause ""
 
-    if {![empty_string_p $include_storage_types]} {
+    if {$include_storage_types ne ""} {
 	set storage_clause "
           and a.storage in ('[join $include_storage_types "', '"]')"
     }
@@ -789,12 +789,12 @@
     
 } {
     
-    if {![empty_string_p $variable_prefix]} {
+    if {$variable_prefix ne ""} {
 	append variable_prefix "."
     }
 
     # Select out the package name if it wasn't passed in
-    if { [empty_string_p $package_name] } {
+    if { $package_name eq "" } {
 	if { ![db_0or1row package_select {
 	    select t.package_name
 	      from acs_object_types t
@@ -805,10 +805,10 @@
     }
 
     if { [ad_conn isconnected] } {
-	if { [empty_string_p $creation_user] } {
+	if { $creation_user eq "" } {
 	    set creation_user [ad_conn user_id]
 	} 
-	if { [empty_string_p $creation_ip] } {
+	if { $creation_ip eq "" } {
 	    set creation_ip [ad_conn peeraddr]
 	}
     }
@@ -854,7 +854,7 @@
     }
 
     # Go through the extra_vars (ben - OpenACS)
-    if {! [empty_string_p $extra_vars] } {
+    if {$extra_vars ne "" } {
 	for {set i 0} {$i < [ns_set size $extra_vars]} {incr i} {
 	    set __key [ns_set key $extra_vars $i]
 	    set __value [ns_set value $extra_vars $i]
@@ -872,7 +872,7 @@
     }
 	    
 
-    if { ![empty_string_p $form_id]} {
+    if { $form_id ne ""} {
 
         #DRB: This needs to be cached!
         set __id_column [db_string get_id_column {}]
@@ -882,7 +882,7 @@
       	    lappend pieces [list $__id_column]
 	}
 
-        if { [string equal $start_with ""] } {
+        if {$start_with eq ""} {
             set start_with $object_type
         }