Implement hlistprop $path tclnames
Squashed commit of the following: commit 736f0f3da501ee39fb89735a1142fe6ff2b2c4dd Author: Douglas Clowes <dcl@ansto.gov.au> Date: Wed Jul 2 12:21:32 2014 +1000 Use hlistprop $path tclnames in hipadaba_configuration_common.tcl commit 428cac5ac8fe37f6998d3114c71ca01fc9446644 Author: Douglas Clowes <dcl@ansto.gov.au> Date: Wed Jul 2 12:11:47 2014 +1000 Use hlistprop $path tclnames in nxscripts_common_1.tcl commit 123cc63924e92a9453bfd1297a4ee6398b31bd1d Author: Douglas Clowes <dcl@ansto.gov.au> Date: Wed Jul 2 10:56:34 2014 +1000 Use hlistprop $path tclnames in gumxml.tcl commit e23f8befd36a2066ceaa32ce3d37d53bc462f870 Author: Douglas Clowes <dcl@ansto.gov.au> Date: Wed Jul 2 10:55:48 2014 +1000 Use hlistprop $path tclnames in testing commit a3587be0a8cc9a9452a75cb0e19572558d35a08a Author: Douglas Clowes <dcl@ansto.gov.au> Date: Wed Jul 2 10:55:01 2014 +1000 Implement hlistprop $path tclnames
This commit is contained in:
@@ -98,7 +98,7 @@ proc test_suite::make_nodes {path result indent} {
|
||||
foreach p [test_suite::property_elements $path $newIndent] {
|
||||
append result $p
|
||||
}
|
||||
foreach x [hlist $path] {
|
||||
foreach x [lsort [hlist $path]] {
|
||||
set result [test_suite::make_nodes [string map {// /} "$path/$x"] $result $newIndent]
|
||||
}
|
||||
append result "$prefix</component>\n"
|
||||
@@ -107,8 +107,8 @@ proc test_suite::make_nodes {path result indent} {
|
||||
|
||||
proc test_suite::property_elements {path indent} {
|
||||
set prefix [string repeat " " $indent]
|
||||
foreach {key rvalue} [string map {= " "} [hlistprop $path tcl]] {
|
||||
set value [test_suite::encode $rvalue]
|
||||
foreach {key} [lsort [hlistprop $path tclnames]] {
|
||||
set value [test_suite::encode [hgetpropval $path $key]]
|
||||
lappend proplist "$prefix<property id=\"$key\">\n"
|
||||
lappend proplist "$prefix <value>$value</value>\n"
|
||||
lappend proplist "$prefix</property>\n"
|
||||
@@ -121,7 +121,7 @@ proc test_suite::getsicsxml {path} {
|
||||
append result "<hipadaba:SICS xmlns:hipadaba=\"http://www.psi.ch/sics/hipadaba\" >\n"
|
||||
|
||||
if {[string compare $path "/" ] == 0} {
|
||||
foreach n [hlist $path] {
|
||||
foreach n [lsort [hlist $path]] {
|
||||
set result [test_suite::make_nodes $n $result 2]
|
||||
}
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user