Returning More Than One Value From a Function
-Many functions have a single return value. For instance, empty_string_p
+Many functions have a single return value. For instance, util_email_valid_p
returns a number: 1 or 0. Other functions need to return a composite value.
For instance, consider a function that looks up a user's name and email
address, given an ID. One way to implement this is to return a three-element
Index: openacs-4/packages/acs-core-docs/www/security-notes.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/security-notes.html,v
diff -u -r1.47.4.1 -r1.47.4.2
--- openacs-4/packages/acs-core-docs/www/security-notes.html 21 Aug 2013 10:19:30 -0000 1.47.4.1
+++ openacs-4/packages/acs-core-docs/www/security-notes.html 27 Aug 2013 10:52:33 -0000 1.47.4.2
@@ -27,7 +27,7 @@
if { [ad_secure_conn_p] && ![ad_login_page] } {
set s_token_cookie [ns_urldecode [ad_get_cookie "ad_secure_token"]]
- if { [empty_string_p $s_token_cookie] || [string compare $s_token_cookie [lindex [sec_get_session_info $session_id] 2]] != 0 } {
+ if { $s_token_cookie eq "" || $s_token_cookie ne [lindex [sec_get_session_info $session_id] 2] } {
# token is incorrect or nonexistent, so we force relogin.
ad_returnredirect "/register/index?return_url=[ns_urlencode [ad_conn url]?[ad_conn query]]"
}
Index: openacs-4/packages/acs-core-docs/www/tutorial-categories.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-categories.html,v
diff -u -r1.13.4.1 -r1.13.4.2
--- openacs-4/packages/acs-core-docs/www/tutorial-categories.html 21 Aug 2013 10:19:31 -0000 1.13.4.1
+++ openacs-4/packages/acs-core-docs/www/tutorial-categories.html 27 Aug 2013 10:52:33 -0000 1.13.4.2
@@ -155,7 +155,7 @@
{submit:text(submit) {label "Set Mode"}}
} -on_submit {
parameter::set_value -parameter "EnableCategoriesP" -value $enabled_p
- if {![empty_string_p $return_url]} {
+ if {$return_url ne ""} {
ns_returnredirect $return_url
}
}
@@ -221,9 +221,9 @@
# Site-Wide Categories
if { $use_categories_p == 1} {
set package_url [ad_conn package_url]
- if { ![empty_string_p $category_id] } {
+ if { $category_id ne "" } {
set category_name [category::get_name $category_id]
- if { [empty_string_p $category_name] } {
+ if { $category_name eq "" } {
ad_return_exception_page 404 "No such category" "Site-wide \
Category with ID $category_id doesn't exist"
return
Index: openacs-4/packages/acs-core-docs/www/tutorial-wysiwyg-editor.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-wysiwyg-editor.html,v
diff -u -r1.8.4.1 -r1.8.4.2
--- openacs-4/packages/acs-core-docs/www/tutorial-wysiwyg-editor.html 21 Aug 2013 10:19:33 -0000 1.8.4.1
+++ openacs-4/packages/acs-core-docs/www/tutorial-wysiwyg-editor.html 27 Aug 2013 10:52:33 -0000 1.8.4.2
@@ -80,7 +80,7 @@
{submit:text(submit) {label "Change"}}
} -on_submit {
parameter::set_value -parameter "UseWysiwygP" -value $enabled_p
- if {![empty_string_p $return_url]} {
+ if {$return_url ne ""} {
ns_returnredirect $return_url
}
}
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/programming-with-aolserver.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/programming-with-aolserver.xml,v
diff -u -r1.6 -r1.6.12.1
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/programming-with-aolserver.xml 17 Jul 2006 05:38:37 -0000 1.6
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/programming-with-aolserver.xml 27 Aug 2013 10:52:33 -0000 1.6.12.1
@@ -112,7 +112,7 @@
Returning More Than One Value From a Function
-Many functions have a single return value. For instance, empty_string_p
+Many functions have a single return value. For instance, util_email_valid_p
returns a number: 1 or 0. Other functions need to return a composite value.
For instance, consider a function that looks up a user's name and email
address, given an ID. One way to implement this is to return a three-element
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml,v
diff -u -r1.50 -r1.50.2.1
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml 30 Mar 2013 20:15:09 -0000 1.50
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml 27 Aug 2013 10:52:33 -0000 1.50.2.1
@@ -660,7 +660,7 @@
{submit:text(submit) {label "Set Mode"}}
} -on_submit {
parameter::set_value -parameter "EnableCategoriesP" -value $enabled_p
- if {![empty_string_p $return_url]} {
+ if {$return_url ne ""} {
ns_returnredirect $return_url
}
}
@@ -739,9 +739,9 @@
# Site-Wide Categories
if { $use_categories_p == 1} {
set package_url [ad_conn package_url]
- if { ![empty_string_p $category_id] } {
+ if { $category_id ne "" } {
set category_name [category::get_name $category_id]
- if { [empty_string_p $category_name] } {
+ if { $category_name eq "" } {
ad_return_exception_page 404 "No such category" "Site-wide \
Category with ID $category_id doesn't exist"
return
@@ -1517,7 +1517,7 @@
{submit:text(submit) {label "Change"}}
} -on_submit {
parameter::set_value -parameter "UseWysiwygP" -value $enabled_p
- if {![empty_string_p $return_url]} {
+ if {$return_url ne ""} {
ns_returnredirect $return_url
}
}
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml,v
diff -u -r1.4 -r1.4.8.1
--- openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml 29 Dec 2008 22:21:04 -0000 1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml 27 Aug 2013 10:52:33 -0000 1.4.8.1
@@ -225,7 +225,7 @@
# Always register the user locally
lappend authorities_list [auth::authority::local]
# Default authority_id if none was provided
- if { [empty_string_p $authority_id] } {
+ if { $authority_id eq "" } {
# Pick the first authority that can create users
set authority_id [db_string first_registering_authority {
select authority_id
@@ -236,7 +236,7 @@
where register_p = 't'
)
} -default ""]
- if { [empty_string_p $authority_id] } {
+ if { $authority_id eq "" } {
error "No authority_id provided and could not find an authority that can create users"
}
lappend authorities_list $authority_id
@@ -278,7 +278,7 @@
@secret_question Question to ask on forgotten password
@secret_answer Answer to forgotten password question
} {
- if { [empty_string_p $authority_id] } {
+ if { $authority_id eq "" } {
set authority_id [auth::authority::local]
}
# TODO:
@@ -1039,7 +1039,7 @@
@param authority_id The ID of the authority to ask to verify the user. Leave blank for local authority.
} {
- if { [empty_string_p $authority_id] } {
+ if { $authority_id eq "" } {
set authority_id [auth::authority::local]
}
# TODO:
@@ -1164,7 +1164,7 @@
Invoke the Register service contract operation for the given authority.
} {
- if { [empty_string_p $authority_id] } {
+ if { $authority_id eq "" } {
set authority_id [auth::authority::local]
}
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/security-notes.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/security-notes.xml,v
diff -u -r1.6 -r1.6.12.1
--- openacs-4/packages/acs-core-docs/www/xml/kernel/security-notes.xml 17 Jul 2006 05:38:38 -0000 1.6
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/security-notes.xml 27 Aug 2013 10:52:33 -0000 1.6.12.1
@@ -51,7 +51,7 @@
if { [ad_secure_conn_p] && ![ad_login_page] } {
set s_token_cookie [ns_urldecode [ad_get_cookie "ad_secure_token"]]
- if { [empty_string_p $s_token_cookie] || [string compare $s_token_cookie [lindex [sec_get_session_info $session_id] 2]] != 0 } {
+ if { $s_token_cookie eq "" || $s_token_cookie ne [lindex [sec_get_session_info $session_id] 2]} {
# token is incorrect or nonexistent, so we force relogin.
ad_returnredirect "/register/index?return_url=[ns_urlencode [ad_conn url]?[ad_conn query]]"
}
Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v
diff -u -r1.21 -r1.21.8.1
--- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl 15 Apr 2009 17:22:46 -0000 1.21
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl 27 Aug 2013 11:01:48 -0000 1.21.8.1
@@ -53,7 +53,7 @@
# All the SQL statements are named after the criteria name (e.g. category_id)
foreach criteria [ad_user_class_parameters] {
- if { [info exists $criteria] && ![empty_string_p [set $criteria]] } {
+ if { [info exists $criteria] && [set $criteria] ne "" } {
switch $criteria {
"category_id" {
@@ -224,7 +224,7 @@
}
foreach criteria [ad_user_class_parameters] {
- if { [info exists $criteria] && ![empty_string_p [set $criteria]] } {
+ if { [info exists $criteria] && [set $criteria] ne "" } {
switch $criteria {
"category_id" {
if {[lsearch $tables "users_interests"] == -1 } {
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.108 -r1.108.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 2 May 2013 10:27:46 -0000 1.108
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 27 Aug 2013 11:01:48 -0000 1.108.2.1
@@ -1408,7 +1408,7 @@
} {
set owners [list]
for {set i 0} {$i < [llength $owner_names] } {incr i} {
- if { ![empty_string_p [lindex $owner_names $i]] } {
+ if { [lindex $owner_names $i] ne "" } {
lappend owners [list [lindex $owner_names $i] [lindex $owner_uris $i]]
}
}
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.94 -r1.94.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 8 Apr 2013 15:50:25 -0000 1.94
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 27 Aug 2013 11:01:48 -0000 1.94.2.1
@@ -1696,7 +1696,7 @@
if { $test_arg_list eq "" } {
# The callback proc should take no args
- return [empty_string_p [info args ::${proc_name}]]
+ return [expr {[info args ::${proc_name}] eq ""}]
}
# The callback proc should have required arg switches. Check
Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -r1.63 -r1.63.6.1
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl 10 Mar 2010 00:44:03 -0000 1.63
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl 27 Aug 2013 11:01:48 -0000 1.63.6.1
@@ -837,18 +837,18 @@
}
default {
- if { [empty_string_p [info commands "::template::data::validate::$flag"]] } {
+ if { [info commands "::template::data::validate::$flag"] eq "" } {
return -code error "element $element_name: data type \"$flag\" is not valid"
}
lappend form_command "-datatype"
lappend form_command $flag
set af_type(${form_name}__$element_name) $flag
if { $af_element_parameters($element_name:$flag) eq "" } {
- if { ![empty_string_p [info command "::template::widget::$flag"]] } {
+ if { [info command "::template::widget::$flag"] ne "" } {
lappend form_command "-widget" $flag
}
} else {
- if { [empty_string_p [info commands "::template::widget::$af_element_parameters($element_name:$flag)"]] } {
+ if { [info commands "::template::widget::$af_element_parameters($element_name:$flag)"] eq ""} {
return -code error "element $element_name: widget \"$af_element_parameters($element_name:$flag)\" does not exist"
}
lappend form_command "-widget" $af_element_parameters($element_name:$flag)
@@ -881,7 +881,7 @@
}
}
if { [info exists af_to_html(${form_name}__$element_name)] } {
- if { [empty_string_p [info commands ::template::util::$af_type(${form_name}__$element_name)::get_property]] } {
+ if { [info commands ::template::util::$af_type(${form_name}__$element_name)::get_property] eq "" } {
return -code error "\"to_html\" not valid for type \"$af_type(${form_name}__$element_name)\""
}
}
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.113 -r1.113.2.1
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 12 Apr 2013 16:12:56 -0000 1.113
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 27 Aug 2013 11:01:49 -0000 1.113.2.1
@@ -92,7 +92,7 @@
} {
# The form may not exist, if there's nothing in it
- if { ![empty_string_p [ns_getform]] } {
+ if { [ns_getform] ne "" } {
# It's there
return [ns_getform]
} {
@@ -1024,7 +1024,7 @@
ad_conn -set file [rp_concrete_file -extension_pattern $extension_pattern $path]
- if { [empty_string_p [ad_conn file]] } {
+ if { [ad_conn file] eq "" } {
if { [file isdirectory $path] && !$noredirect_p } {
# Directory name with no trailing slash. Redirect to the same
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.30 -r1.30.2.1
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl 31 Jul 2011 23:11:46 -0000 1.30
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl 27 Aug 2013 11:01:49 -0000 1.30.2.1
@@ -1631,7 +1631,7 @@
}
# check if all elements are blank
- if { [empty_string_p "$date(day)$date(month)$date(year)"] } {
+ if { "$date(day)$date(month)$date(year)" eq ""} {
set date(date) {}
return 1
}
@@ -1692,7 +1692,7 @@
}
# check if all elements are blank
- if { [empty_string_p "$time(time)$time(ampm)"] } {
+ if { "$time(time)$time(ampm)" eq "" } {
return 1
}
@@ -1736,7 +1736,7 @@
}
# check if all elements are blank
- if { [empty_string_p "$time(time)"] } {
+ if { "$time(time)" eq "" } {
return 1
}
@@ -1912,7 +1912,7 @@
@author Randy Beggs (randyb@arsdigita.com)
@creation-date August 2000
} {
- if { ![empty_string_p [string trim $value]] } {
+ if { [string trim $value] ne "" } {
if { ![regexp {^\(?([1-9][0-9]{2})\)?(-|\.|\ )?([0-9]{3})(-|\.|\ )?([0-9]{4})} $value] } {
ad_complain "[_ acs-tcl.lt_value_does_not_appear]"
return 0
@@ -1930,7 +1930,8 @@
@author Randy Beggs (randyb@arsdigita.com)
@creation-date 22 August 2000
} {
- if {![empty_string_p [string trim $value]] && ![regexp {[1-9][0-9][0-9]-[0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]} $value]} {
+ if { [string trim $value] ne ""
+ && ![regexp {[1-9][0-9][0-9]-[0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]} $value]} {
ad_complain "[_ acs-tcl.lt_name_does_not_appear__1]"
return 0
}
Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -r1.65 -r1.65.6.1
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 11 Mar 2010 11:20:48 -0000 1.65
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 27 Aug 2013 11:01:49 -0000 1.65.6.1
@@ -1000,7 +1000,7 @@
}
} else {
if { [llength $href_stack] > 0 } {
- if { ![empty_string_p [lindex $href_stack end]] } {
+ if { [lindex $href_stack end] ne "" } {
ad_html_to_text_put_text output " [lindex $href_stack end]"
}
set href_stack [lreplace $href_stack end end]
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.133 -r1.133.2.1
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 12 Aug 2013 21:32:47 -0000 1.133
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 27 Aug 2013 11:01:49 -0000 1.133.2.1
@@ -1782,7 +1782,7 @@
# check that either all elements are blank
# date value is formated correctly for ns_dbformvalue
- if { [empty_string_p "$day$month$year"] } {
+ if { "$day$month$year" eq "" } {
if { $allow_null == 0 } {
error "$field_name must be supplied"
} else {