Changeset 2753

Timestamp:

Jan 6, 2012, 11:43:45 AM (13 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• examples/app-fermi/octave/octave3/tool.xml (modified) (1 diff)
• gui/scripts/controlOwner.tcl (modified) (1 diff)
• gui/scripts/periodictable.tcl (modified) (3 diffs)
• gui/scripts/tool.tcl (modified) (2 diffs)

trunk/examples/app-fermi/octave/octave3/tool.xml

@@ -3 +3 @@
     <tool>
         <about>Press Simulate to view results.</about>
-        <command>octave --silent --eval infile='@driver',path('@tool',path),fermi</command>
+        <command>octave --silent --eval "infile='@driver',path('@tool',path),fermi"</command>
     </tool>
     <input>

trunk/gui/scripts/controlOwner.tcl

@@ -66 +66 @@
         note contents
         number current
+        periodicelement current
         string current
     }

trunk/gui/scripts/periodictable.tcl

@@ -460 +460 @@
     set elem [FindElement $name]
     if { $elem == "" || $_state($elem) == "disabled" } {
+        if { $elem != "" } {
+            puts stderr "element $elem is disabled"
+        }
         return ""
     }
@@ -607 +610 @@
 
 # ----------------------------------------------------------------------
-# USAGE: select <name> 
+# USAGE: FindElement
 #
 # Used to manipulate the selection in the table.
@@ -614 +617 @@
 itcl::body Rappture::PeriodicTable::FindElement { what } {
     foreach name [array names _table] { 
+        array unset info
         array set info $_table($name)
         if { $what == $info(name) || $what == $info(number) || 
              $what == $info(symbol) } {
-            break
-        }
-        array unset info
-    }
-    if { [info exists info] } {
-        return $info(name)
-    }
+            return $info(name)
+        }
+    }
+    parray info
     return ""
 }

trunk/gui/scripts/tool.tcl

@@ -184 +184 @@
         regsub -all {\\} $cmd {\\\\} cmd
         set cmd [string trimleft $cmd " "]
-
+        if { $cmd == "" } {
+            puts stderr "cmd is empty"
+            return [list 1 "Command is empty.\n\nThere is no command specified by\n\n <command>\n </command>\n\nin the tool.xml file."]
+        }
         # if job_protocol is "submit", then use use submit command
         if {[resources -jobprotocol] == "submit"} {
@@ -197 +200 @@
             set job(output) [string range $cmd 5 end] 
         } else {
-            set status [catch {eval blt::bgexec \
-                ::Rappture::Tool::job(control) \
-                -keepnewline yes \
-                -killsignal SIGTERM \
-                -onoutput [list [itcl::code $this _output]] \
-                -output ::Rappture::Tool::job(output) \
-                -error ::Rappture::Tool::job(error) $cmd} result]
+            set status [catch {
+                eval blt::bgexec \
+                    ::Rappture::Tool::job(control) \
+                    -keepnewline yes \
+                    -killsignal SIGTERM \
+                    -onoutput [list [itcl::code $this _output]] \
+                    -output ::Rappture::Tool::job(output) \
+                    -error ::Rappture::Tool::job(error) \
+                    $cmd
+            } result]
 
             if { $status != 0 } {
-                foreach {code pid mesg} $::Rappture::Tool::job(control) break
-                if { $code != "EXITED" } {
-                    set result "Abnormal program termination \"$code\": $mesg"
-                    return [list $status $result]
-                }
+                if { $::Rappture::Tool::job(control) != "" } {
+                    set code [lindex $::Rappture::Tool::job(control) 0]
+                    set mesg [lindex $::Rappture::Tool::job(control) 2]
+                    if { $code != "EXITED" } {
+                        set result \
+                            "Abnormal program termination \"$code\": $mesg"
+                    }
+                }
+                return [list $status $result]
             }
         }