Index: openacs-4/packages/categories/tcl/categories-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/categories-procs.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/categories/tcl/categories-procs.tcl 6 Nov 2008 15:50:44 -0000 1.25
+++ openacs-4/packages/categories/tcl/categories-procs.tcl 8 Nov 2008 17:05:38 -0000 1.26
@@ -40,13 +40,13 @@
@return category_id
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $user_id]} {
+ if {$user_id eq ""} {
set user_id [ad_conn user_id]
}
- if {[empty_string_p $creation_ip]} {
+ if {$creation_ip eq ""} {
set creation_ip [ad_conn peeraddr]
}
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
db_transaction {
@@ -85,13 +85,13 @@
@option modifying_ip ip-address of the user that updates the category. [ad_conn peeraddr] used by default.
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $user_id]} {
+ if {$user_id eq ""} {
set user_id [ad_conn user_id]
}
- if {[empty_string_p $modifying_ip]} {
+ if {$modifying_ip eq ""} {
set modifying_ip [ad_conn peeraddr]
}
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
db_transaction {
@@ -188,7 +188,7 @@
}
foreach category_id $category_id_list {
- if {![empty_string_p $category_id]} {
+ if {$category_id ne ""} {
db_dml insert_mapped_categories ""
}
}
@@ -209,7 +209,7 @@
@return tcl-list of category_ids
@author Timo Hentschel (timo@timohentschel.de)
} {
- if { ![empty_string_p $tree_id] } {
+ if { $tree_id ne "" } {
set result [db_list get_filtered ""]
} else {
set result [db_list get_mapped_categories ""]
@@ -228,7 +228,7 @@
@return multirow with tree and category information
@author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at)
} {
- if { $locale == ""} {set locale [ad_conn locale]}
+ if { $locale eq ""} {set locale [ad_conn locale]}
upvar $multirow mapped_categories
db_multirow mapped_categories select {}
}
@@ -296,7 +296,7 @@
@return list of names corresponding to the list of category_id's supplied.
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
if { [catch { array set cat_lang [lindex [nsv_get categories $category_id] 1] }] } {
@@ -423,7 +423,7 @@
@author Timo Hentschel (timo@timohentschel.de)
} {
set tree_id [category::get_tree $category_id]
- if {[empty_string_p $tree_id]} {
+ if {$tree_id eq ""} {
# category not found
return
}
@@ -507,7 +507,7 @@
@author Timo Hentschel (timo@timohentschel.de)
} {
if {$ctx_id eq ""} {unset ctx_id}
- if {![empty_string_p $object_id]} {
+ if {$object_id ne ""} {
set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base object-map {locale object_id ctx_id}] [_ categories.cadmin]]]
} else {
set context_bar [list [list ".?[export_vars -no_empty {locale ctx_id}]" [_ categories.cadmin]]]
Index: openacs-4/packages/categories/tcl/category-list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-list-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/tcl/category-list-procs.tcl 6 Oct 2007 13:51:43 -0000 1.5
+++ openacs-4/packages/categories/tcl/category-list-procs.tcl 8 Nov 2008 17:05:38 -0000 1.6
@@ -44,7 +44,7 @@
set row_id $row($object_column)
set category_id $row($category_column)
- if {![empty_string_p $category_id]} {
+ if {$category_id ne ""} {
lappend category_list $category_id
}
@@ -65,7 +65,7 @@
}
}
- for {set counter [expr $rownum+1]} {$counter < $rowcount} {incr counter} {
+ for {set counter [expr {$rownum+1}]} {$counter < $rowcount} {incr counter} {
uplevel 1 unset ${name}:$counter
}
set rowcount $rownum
@@ -122,9 +122,9 @@
@see category::list::prepare_display
@see category::list::elements
} {
- if {![empty_string_p $category_link_eval]} {
+ if {$category_link_eval ne ""} {
upvar $uplevel $category_varname category_id $tree_varname tree_id
- } elseif {![empty_string_p $tree_link_eval]} {
+ } elseif {$tree_link_eval ne ""} {
upvar $uplevel $tree_varname tree_id
}
@@ -149,29 +149,29 @@
util_unlist $category category_id category_name tree_id tree_name
set category_name [ad_quotehtml $category_name]
- if {![empty_string_p $category_link_eval]} {
+ if {$category_link_eval ne ""} {
set category_link [uplevel $uplevel concat $category_link_eval]
}
- if {![empty_string_p $remove_link_eval]} {
+ if {$remove_link_eval ne ""} {
set remove_link [uplevel $uplevel concat $remove_link_eval]
}
- if {![empty_string_p $category_link]} {
+ if {$category_link ne ""} {
set category_name "$category_name"
}
- if {![empty_string_p $remove_link]} {
+ if {$remove_link ne ""} {
append category_name " $remove_link_text"
}
if {$tree_id != $old_tree_id} {
- if {![empty_string_p $result]} {
+ if {$result ne ""} {
append result $tree_delimiter
}
set tree_name [ad_quotehtml $tree_name]
- if {![empty_string_p $tree_link_eval]} {
+ if {$tree_link_eval ne ""} {
set tree_link [uplevel $uplevel concat $tree_link_eval]
}
- if {![empty_string_p $tree_link]} {
+ if {$tree_link ne ""} {
set tree_name "$tree_name"
}
append result "$tree_name$tree_colon$category_name"
@@ -245,9 +245,9 @@
@see category::list::elements
@see category::list::get_pretty_list
} {
- if {![empty_string_p $category_link_eval]} {
+ if {$category_link_eval ne ""} {
upvar 1 $category_varname category_id $tree_varname tree_id
- } elseif {![empty_string_p $tree_link_eval]} {
+ } elseif {$tree_link_eval ne ""} {
upvar 1 $tree_varname tree_id
}
@@ -261,7 +261,7 @@
}
# get trees to display
- if {[empty_string_p $tree_ids]} {
+ if {$tree_ids eq ""} {
foreach mapped_tree [category_tree::get_mapped_trees $container_object_id] {
lappend tree_ids [lindex $mapped_tree 0]
}
@@ -289,7 +289,7 @@
for {set i 1} {$i <= ${list_data:rowcount}} {incr i} {
upvar 1 $name:$i row
- if {![empty_string_p $category_link_eval]} {
+ if {$category_link_eval ne ""} {
foreach column_name ${list_data:columns} {
upvar 1 $column_name column_value
if { [info exists row($column_name)] } {
@@ -319,13 +319,13 @@
foreach category $tree_categories($tree_id) {
util_unlist $category category_id category_name
set category_name [ad_quotehtml $category_name]
- if {![empty_string_p $category_link_eval]} {
+ if {$category_link_eval ne ""} {
set category_link [uplevel 1 concat $category_link_eval]
}
- if {![empty_string_p $category_link]} {
+ if {$category_link ne ""} {
set category_name "$category_name"
}
- if {![empty_string_p $pretty_category_list]} {
+ if {$pretty_category_list ne ""} {
append pretty_category_list "$category_delimiter$category_name"
} else {
set pretty_category_list $category_name
@@ -349,7 +349,7 @@
for {set i 1} {$i <= ${list_data:rowcount}} {incr i} {
upvar 1 $name:$i row
- if {![empty_string_p $category_link_eval]} {
+ if {$category_link_eval ne ""} {
foreach column_name ${list_data:columns} {
upvar 1 $column_name column_value
if { [info exists row($column_name)] } {
@@ -472,7 +472,7 @@
}"
return $result
} else {
- if {[empty_string_p $tree_ids]} {
+ if {$tree_ids eq ""} {
# get tree columns in multirow
template::multirow upvar $name list_data
foreach column ${list_data:columns} {
Index: openacs-4/packages/categories/tcl/category-relation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-relation-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/tcl/category-relation-procs.tcl 31 Jul 2006 20:31:11 -0000 1.2
+++ openacs-4/packages/categories/tcl/category-relation-procs.tcl 8 Nov 2008 17:05:38 -0000 1.3
@@ -23,20 +23,20 @@
@author Miguel Marin (miguelmarin@viaro.net)
@author Viaro Networks www.viaro.net
} {
- if { [empty_string_p $user_id] } {
+ if { $user_id eq "" } {
set user_id [ad_conn user_id]
}
# First we check if the relation exist, if it does, we don't create a new one
set meta_category_id [db_string get_meta_relation_id {} -default ""]
- if { [empty_string_p $meta_category_id] } {
+ if { $meta_category_id eq "" } {
set meta_category_id [db_exec_plsql add_meta_relation {}]
}
# Now we check if the user already has the meta category associated,
# if it does, we don't create a new one
set user_meta_category_id [db_string get_user_meta_relation_id {} -default ""]
- if { [empty_string_p $user_meta_category_id] } {
+ if { $user_meta_category_id eq "" } {
return [db_exec_plsql add_user_meta_relation {}]
} else {
return $user_meta_category_id
Index: openacs-4/packages/categories/tcl/category-synonyms-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-synonyms-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/tcl/category-synonyms-procs.tcl 6 Oct 2007 13:51:43 -0000 1.2
+++ openacs-4/packages/categories/tcl/category-synonyms-procs.tcl 8 Nov 2008 17:05:38 -0000 1.3
@@ -26,7 +26,7 @@
@author Bernd Schmeil (bernd@thebernd.de)
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
@@ -50,7 +50,7 @@
@author Bernd Schmeil (bernd@thebernd.de)
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
@@ -84,7 +84,7 @@
@author Bernd Schmeil (bernd@thebernd.de)
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
Index: openacs-4/packages/categories/tcl/category-trees-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-trees-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/categories/tcl/category-trees-procs.tcl 7 Oct 2007 22:36:56 -0000 1.23
+++ openacs-4/packages/categories/tcl/category-trees-procs.tcl 8 Nov 2008 17:05:38 -0000 1.24
@@ -139,16 +139,16 @@
@return tree_id
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $user_id]} {
+ if {$user_id eq ""} {
set user_id [ad_conn user_id]
}
- if {[empty_string_p $creation_ip]} {
+ if {$creation_ip eq ""} {
set creation_ip [ad_conn peeraddr]
}
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
- if {[empty_string_p $context_id]} {
+ if {$context_id eq ""} {
set context_id [ad_conn package_id]
}
db_transaction {
@@ -183,13 +183,13 @@
@option modifying_ip ip-address of the user that updated the category tree. [ad_conn peeraddr] used by default.
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $user_id]} {
+ if {$user_id eq ""} {
set user_id [ad_conn user_id]
}
- if {[empty_string_p $modifying_ip]} {
+ if {$modifying_ip eq ""} {
set modifying_ip [ad_conn peeraddr]
}
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
db_transaction {
@@ -300,7 +300,7 @@
return
}
set result ""
- if {[empty_string_p $subtree_id]} {
+ if {$subtree_id eq ""} {
foreach category $tree {
util_unlist $category category_id deprecated_p level
if {$all_p || $deprecated_p == "f"} {
@@ -316,7 +316,7 @@
set in_subtree_p 0
}
if {$in_subtree_p && $deprecated_p == "f"} {
- lappend result [list $category_id [category::get_name $category_id $locale] $deprecated_p [expr $level - $subtree_level]]
+ lappend result [list $category_id [category::get_name $category_id $locale] $deprecated_p [expr {$level - $subtree_level}]]
}
if {$category_id == $subtree_id} {
set in_subtree_p 1
@@ -360,7 +360,7 @@
}
set tree_id_old $tree_id
lappend tree [list $category_id [ad_decode "$invalid_p$deprecated_p" "" f t] $cur_level]
- if { [expr $right_ind - $left_ind] > 1} {
+ if { [expr {$right_ind - $left_ind}] > 1} {
incr cur_level 1
set invalid_p "$invalid_p$deprecated_p"
set stack [linsert $stack 0 [list $right_ind $invalid_p]]
@@ -391,7 +391,7 @@
set tree [list]
db_foreach flush_cache "" {
lappend tree [list $category_id [ad_decode "$invalid_p$deprecated_p" "" f t] $cur_level]
- if { [expr $right_ind - $left_ind] > 1} {
+ if { [expr {$right_ind - $left_ind}] > 1} {
incr cur_level 1
set invalid_p "$invalid_p$deprecated_p"
set stack [linsert $stack 0 [list $right_ind $invalid_p]]
@@ -459,7 +459,7 @@
@return tcl-list: name description
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
if {[catch {array set tree_lang [nsv_get category_tree_translations $tree_id]}]} {
@@ -562,15 +562,15 @@
@author Jeff Davis davis@xarg.net
} {
- if { [empty_string_p $tree_id] } {
- if { [empty_string_p $container_id] } {
+ if { $tree_id eq "" } {
+ if { $container_id eq "" } {
error "must provide either tree_id or container_id"
}
set mapped_trees [category_tree::get_mapped_trees $container_id]
} else {
set mapped_trees [list [list $tree_id [category_tree::get_name $tree_id] $subtree_id $assign_single_p $require_category_p]]
}
- if { ![empty_string_p $mapped_trees]
+ if { $mapped_trees ne ""
&& [llength $category_counts] > 1} {
array set counts $category_counts
} else {
@@ -672,16 +672,16 @@
@author Jeff Davis
@author Timo Hentschel (timo@timohentschel.de)
} {
- if {[empty_string_p $locale]} {
+ if {$locale eq ""} {
set locale [ad_conn locale]
}
- if {[empty_string_p $user_id]} {
+ if {$user_id eq ""} {
set user_id [ad_conn user_id]
}
- if {[empty_string_p $creation_ip]} {
+ if {$creation_ip eq ""} {
set creation_ip [ad_conn peeraddr]
}
- if {[empty_string_p $context_id]} {
+ if {$context_id eq ""} {
set creation_ip [ad_conn package_id]
}
@@ -692,7 +692,7 @@
set parent(1) {}
set parent(2) {}
foreach {level category_name} $categories {
- set parent([expr $level + 1]) [category::add -noflush -name $category_name -description $category_name -tree_id $tree_id -parent_id $parent($level) -locale $locale -user_id $user_id -creation_ip $creation_ip]
+ set parent([expr {$level + 1}]) [category::add -noflush -name $category_name -description $category_name -tree_id $tree_id -parent_id $parent($level) -locale $locale -user_id $user_id -creation_ip $creation_ip]
}
category_tree::flush_cache $tree_id
Index: openacs-4/packages/categories/tcl/category-xml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-xml-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/tcl/category-xml-procs.tcl 27 Apr 2005 08:22:00 -0000 1.2
+++ openacs-4/packages/categories/tcl/category-xml-procs.tcl 8 Nov 2008 17:05:38 -0000 1.3
@@ -32,7 +32,7 @@
@author Tom Ayles (tom@beatniq.net)
} {
# recode site_wide_p to DB-style boolean
- if $site_wide_p { set site_wide_p t } else { set site_wide_p f }
+ if {$site_wide_p} { set site_wide_p t } else { set site_wide_p f }
set doc [dom parse $xml]
if [catch {set root [$doc documentElement]} err] {
@@ -53,7 +53,7 @@
[[$translation selectNodes {description}] text]}] {
set description {}
}
- if $tree_id {
+ if {$tree_id} {
# tree initialised, add translation
category_tree::update \
-tree_id $tree_id \
@@ -102,7 +102,7 @@
set description {}
}
- if $category_id {
+ if {$category_id} {
# category exists, add translation
category::update \
-category_id $category_id \
Index: openacs-4/packages/categories/tcl/install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/install-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/tcl/install-procs.tcl 11 Oct 2005 15:50:07 -0000 1.2
+++ openacs-4/packages/categories/tcl/install-procs.tcl 8 Nov 2008 17:05:38 -0000 1.3
@@ -31,7 +31,7 @@
}
}
- if {![string equal $id ""]} {
+ if {$id ne "" } {
set ::install::xml::ids($id) $tree_id
}
}
@@ -43,7 +43,7 @@
set object_id [apm_attribute_value -default "" $node object-id]
set tree_ids [list]
- if {[string equal $tree_id ""]} {
+ if {$tree_id eq ""} {
set trees_node [lindex [xml_node_get_children_by_name $node trees] 0]
set trees [xml_node_get_children $trees_node]
@@ -57,7 +57,7 @@
}
set object_ids [list]
- if {[string equal $object_id ""]} {
+ if {$object_id eq ""} {
set objects_node [lindex [xml_node_get_children_by_name $node objects] 0]
set objects [xml_node_get_children $objects_node]
@@ -71,7 +71,7 @@
}
foreach tree_id $tree_ids {
- if {[string equal [acs_object_type $tree_id] category]} {
+ if {[acs_object_type $tree_id] eq "category"} {
set subtree_category_id $tree_id
set tree_id [category::get_tree $subtree_category_id]
} else {
Index: openacs-4/packages/categories/tcl/tagcloud-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/tagcloud-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/tcl/tagcloud-procs.tcl 31 Jul 2006 20:31:11 -0000 1.2
+++ openacs-4/packages/categories/tcl/tagcloud-procs.tcl 8 Nov 2008 17:05:38 -0000 1.3
@@ -43,13 +43,13 @@
@author Matthew Burke (matt-oacs@bluedino.net)
} {
- set denominator [expr [lindex $extremes 1] - [lindex $extremes 0]]
+ set denominator [expr {[lindex $extremes 1] - [lindex $extremes 0]}]
if {$denominator != 0} {
set multiplier [expr ($weight * 1.0)/$denominator]
} else {
set multiplier 0
}
- set result [expr 10 + round($multiplier*(36-10))]
+ set result [expr {10 + round($multiplier*(36-10))}]
return $result
}
Index: openacs-4/packages/categories/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/widget-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/categories/tcl/widget-procs.tcl 7 Oct 2007 22:36:56 -0000 1.21
+++ openacs-4/packages/categories/tcl/widget-procs.tcl 8 Nov 2008 17:05:38 -0000 1.22
@@ -92,13 +92,13 @@
set widget $element(category_widget)
}
}
- if { [empty_string_p $package_id] } {
+ if { $package_id eq "" } {
set package_id [ad_conn package_id]
}
- if { ![empty_string_p $object_id] && ![info exists element(submit)] } {
+ if { $object_id ne "" && ![info exists element(submit)] } {
set mapped_categories [category::get_mapped_categories $object_id]
- } elseif { ![empty_string_p $element(values)] && ![info exists element(submit)] } {
+ } elseif { $element(values) ne "" && ![info exists element(submit)] } {
set mapped_categories $element(values)
} else {
set mapped_categories [ns_querygetall $element(id)]
@@ -109,15 +109,15 @@
}
set output {}
- if { [empty_string_p $tree_id] } {
+ if { $tree_id eq "" } {
set mapped_trees [category_tree::get_mapped_trees $package_id]
} else {
set mapped_trees {}
foreach one_tree $tree_id one_subtree $subtree_id assign_single $assign_single_p require_category $require_category_p widget $widget {
- if {[empty_string_p $assign_single]} {
+ if {$assign_single eq ""} {
set assign_single f
}
- if {[empty_string_p $require_category]} {
+ if {$require_category eq ""} {
set require_category f
}
lappend mapped_trees [list $one_tree [category_tree::get_name $one_tree] $one_subtree $assign_single $require_category $widget]
@@ -139,7 +139,7 @@
util_unlist $category category_id category_name deprecated_p level
set category_name [ad_quotehtml [lang::util::localize $category_name]]
if { $level>1 } {
- set category_name "[string repeat " " [expr 2*$level -4]]..$category_name"
+ set category_name "[string repeat " " [expr {2*$level -4}]]..$category_name"
}
lappend one_tree [list $category_name $category_id]
}
@@ -243,11 +243,11 @@
set require_category_p $element(category_require_category_p)
}
}
- if { [empty_string_p $package_id] } {
+ if { $package_id eq "" } {
set package_id [ad_conn package_id]
}
- if { [empty_string_p $tree_id] } {
+ if { $tree_id eq "" } {
set trees [list]
foreach tree [category_tree::get_mapped_trees $package_id] {
util_unlist $tree tree_id tree_name subtree_id assign_single_p require_category_p
Index: openacs-4/packages/categories/www/categories-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/categories-browse.tcl 1 Mar 2005 00:01:26 -0000 1.8
+++ openacs-4/packages/categories/www/categories-browse.tcl 8 Nov 2008 17:05:38 -0000 1.9
@@ -58,7 +58,7 @@
util_unlist $category category_id category_name deprecated_p level
set indent ""
if {$level>1} {
- set indent "[string repeat " " [expr 2*$level -4]].."
+ set indent "[string repeat " " [expr {2*$level -4}]].."
}
template::multirow append trees $tree_id $tree_name $category_id $category_name $indent [info exists category_selected($category_id)]
}
@@ -108,9 +108,9 @@
}
set category_ids_length [llength $category_ids]
-if {$join == "and"} {
+if {$join eq "and"} {
# combining categories with and
- if {$subtree_p == "t"} {
+ if {$subtree_p eq "t"} {
# generate sql for exact categorizations plus subcategories
set subtree_sql [db_map include_subtree_and]
} else {
@@ -119,7 +119,7 @@
}
} else {
# combining categories with or
- if {$subtree_p == "t"} {
+ if {$subtree_p eq "t"} {
# generate sql for exact categorizations plus subcategories
set subtree_sql [db_map include_subtree_or]
} else {
Index: openacs-4/packages/categories/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/index.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/index.tcl 1 Mar 2005 00:01:26 -0000 1.7
+++ openacs-4/packages/categories/www/index.tcl 8 Nov 2008 17:05:38 -0000 1.8
@@ -24,7 +24,7 @@
template::multirow create trees tree_ids tree_name site_wide_p short_name
db_foreach get_trees "" {
- if { [string equal $has_read_p "t"] || [string equal $site_wide_p "t"] } {
+ if { $has_read_p == "t" || $site_wide_p == "t" } {
set tree_name [category_tree::get_name $tree_id $locale]
template::multirow append trees $tree_id $tree_name $site_wide_p
}
Index: openacs-4/packages/categories/www/cadmin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/categories/www/cadmin/index.tcl 6 Jun 2005 09:43:47 -0000 1.9
+++ openacs-4/packages/categories/www/cadmin/index.tcl 8 Nov 2008 17:05:38 -0000 1.10
@@ -31,9 +31,9 @@
array unset tree_array
array set tree_array [category_tree::get_data $tree_id $locale]
- if { [string equal $has_write_p "t"] } {
+ if {$has_write_p == "t"} {
template::multirow append trees_with_write_permission $tree_id $tree_array(tree_name) $site_wide_p $tree_array(description)
- } elseif { [string equal $has_read_p "t"] || [string equal $site_wide_p "t"] } {
+ } elseif { $has_read_p == "t" || $site_wide_p == "t" } {
template::multirow append trees_with_read_permission $tree_id $tree_name $site_wide_p $tree_array(description)
}
}
Index: openacs-4/packages/categories/www/cadmin/object-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/object-map.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/object-map.tcl 6 Nov 2008 15:50:44 -0000 1.4
+++ openacs-4/packages/categories/www/cadmin/object-map.tcl 8 Nov 2008 17:05:38 -0000 1.5
@@ -32,7 +32,7 @@
db_foreach get_mapped_trees "" {
set tree_name [category_tree::get_name $tree_id $locale]
- if {![empty_string_p $subtree_category_id]} {
+ if {$subtree_category_id ne ""} {
append tree_name " :: [category::get_name $subtree_category_id $locale]"
}
template::multirow append mapped_trees $tree_name $tree_id $site_wide_p \
@@ -47,7 +47,7 @@
template::multirow create unmapped_trees tree_id tree_name site_wide_p view_url map_url subtree_url
db_foreach get_unmapped_trees "" {
- if { [string equal $has_read_permission t] || [string equal $site_wide_p t] } {
+ if { $has_read_permission == "t" || $site_wide_p == "t" } {
set tree_name [category_tree::get_name $tree_id $locale]
template::multirow append unmapped_trees $tree_id $tree_name $site_wide_p \
Index: openacs-4/packages/categories/www/cadmin/tree-map-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/tree-map-2.tcl 6 Nov 2008 15:50:44 -0000 1.5
+++ openacs-4/packages/categories/www/cadmin/tree-map-2.tcl 8 Nov 2008 17:05:38 -0000 1.6
@@ -33,7 +33,7 @@
db_1row get_mapped_subtree_id ""
}
-if {[empty_string_p $category_id]} {
+if {$category_id eq ""} {
set page_title "Parameters of mapping to tree \"$tree_name\""
} else {
set category_name [category::get_name $category_id $locale]
Index: openacs-4/packages/categories/www/cadmin/tree-order-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-order-update.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/tree-order-update.tcl 6 Nov 2008 15:50:44 -0000 1.4
+++ openacs-4/packages/categories/www/cadmin/tree-order-update.tcl 8 Nov 2008 17:05:38 -0000 1.5
@@ -21,7 +21,7 @@
set count 0
db_foreach get_tree "" {
incr count 10
- if {[empty_string_p $parent_id]} {
+ if {$parent_id eq ""} {
# need this as an anchor for toplevel categories
set parent_id -1
}