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.3 -r1.4 --- openacs-4/packages/categories/tcl/category-xml-procs.tcl 8 Nov 2008 17:05:38 -0000 1.3 +++ openacs-4/packages/categories/tcl/category-xml-procs.tcl 7 Aug 2017 23:48:05 -0000 1.4 @@ -35,22 +35,21 @@ 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] { + if {[catch {set root [$doc documentElement]} err]} { error "Error parsing XML: $err" } set tree_id 0 db_transaction { foreach translation [$root selectNodes {translation}] { - if [catch {set locale [$translation getAttribute locale]}] { + if {[catch {set locale [$translation getAttribute locale]}]} { error "Required attribute 'locale' not found" } - if [catch {set name [[$translation selectNodes {name}] text]}] { + if {[catch {set name [[$translation selectNodes {name}] text]}]} { error "Required element 'name' not found" } - if [catch {set description \ - [[$translation selectNodes {description}] text]}] { + if {[catch {set description [[$translation selectNodes {description}] text]}]} { set description {} } if {$tree_id} { @@ -91,14 +90,13 @@ # do translations foreach translation [$node selectNodes {translation}] { - if [catch {set locale [$translation getAttribute locale]}] { + if {[catch {set locale [$translation getAttribute locale]}]} { error "Required attribute 'locale' not found" } - if [catch {set name [[$translation selectNodes {name}] text]}] { + if {[catch {set name [[$translation selectNodes {name}] text]}]} { error "Required element 'name' not found" } - if [catch {set description \ - [[$translation selectNodes {description}] text]}] { + if {[catch {set description [[$translation selectNodes {description}] text]}]} { set description {} } @@ -125,3 +123,9 @@ add_category -tree_id $tree_id -parent_id $category_id $child } } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: