Changeset 4732

Timestamp:

Nov 15, 2014 2:07:05 PM (10 years ago)

Author:

ldelgass

Message:

Apply patch made on nanohub on 8/18/2014

File:

• branches/1.3/gui/apps/rpdiff (modified) (5 diffs)

branches/1.3/gui/apps/rpdiff

@@ -24 +24 @@
 exec tclsh "$0" ${1+"$@"}
 # tclsh executes the rest...
-
 package require Rappture
 
@@ -36 +35 @@
 proc diff {path lib1 lib2} {
     set knowntypes {boolean choice cloud curve field group histogram image integer loader log mesh note number periodicelement phase sequence string structure table unirect2d}
-
     set type1 [$lib1 element -as type $path]
     set type2 [$lib2 element -as type $path]
@@ -490 +488 @@
             }
         }
+        loader {
+        }
         default {
-            error "don't know how to compare type \"$type\""
+            puts stderr "ignoring \"$type1\" for \"$path\""
         }
     }
@@ -557 +557 @@
 
 # ======================================================================
-if {$argc != 2} {
+
+if {$argc < 2} {
     puts stderr "USAGE: rpdiff file1.xml file2.xml"
     exit 9
@@ -563 +564 @@
 set lib1 [Rappture::library [lindex $argv 0]]
 set lib2 [Rappture::library [lindex $argv 1]]
+set path "output"
+if { $argc > 2 } {
+   set arg [lindex $argv 2]
+   if { $arg == "-path" && $argc == 4 } {
+      set path [lindex $argv 3]
+   }
+} 
 
 # compute the differences
-set diffs [diff output $lib1 $lib2]
+set diffs [diff $path $lib1 $lib2]
 
 if {[llength $diffs] == 0} {