Changeset 2643 for trunk

Timestamp:

Oct 21, 2011, 4:21:42 PM (13 years ago)

Author:

gah

Message:

 

File:

• trunk/gui/scripts/visviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/visviewer.tcl

@@ -72 +72 @@
 
     private proc CheckNameList { namelist }  {
-        set pattern {^[a-zA-Z0-9\.]+:[0-9]+(,[a-zA-Z0-9\.]+:[0-9]+)*$}
-        if { ![regexp $pattern $namelist match] } {
-            error "bad visualization server address \"$namelist\": should be host:port,host:port,..."
+        foreach host $namelist {
+            set pattern {^[a-zA-Z0-9\.]+:[0-9]}
+            if { ![regexp $pattern $host match] } {
+                error "bad visualization server address \"$host\": should be host:port,host:port,..."
+            }
         }
     }
@@ -81 +83 @@
     }
     public proc SetServerList { tag namelist } {
+        # Convert the comma separated list into a Tcl list.  OGRE also adds
+        # a trailing comma that we want to ignore.
+        regsub -all "," $namelist " " namelist
         CheckNameList $namelist
         set _servers($tag) $namelist
@@ -157 +162 @@
 #   Shuffle the list of server hosts.
 #
-itcl::body Rappture::VisViewer::Shuffle { hostlist } {
-    set hosts [split $hostlist ,]
+itcl::body Rappture::VisViewer::Shuffle { hosts } {
     set randomHosts {}
     set ticks [clock clicks]
@@ -211 +215 @@
     foreach {hostname port} [split [lindex $servers 0] :] break
     set servers [lrange $servers 1 end]
-    
     while {1} {
         puts stderr "connecting to $hostname:$port..."