update ds9 parsers

4 files changed, 32 insertions, 32 deletions

diff --git a/ds9/library/mosaicimagewcs.tcl b/ds9/library/mosaicimagewcs.tcl
index 89411b3..e6b4a19 100644
--- a/ds9/library/mosaicimagewcs.tcl
+++ b/ds9/library/mosaicimagewcs.tcl
@@ -77,10 +77,9 @@ proc ProcessMosaicImageWCSCmd {varname iname sock fn} {
 
     global debug
     if {$debug(tcl,parser)} {
-	global mosaicimagewcs
-	set mosaicimagewcs(load,sock) $sock
-	set mosaicimagewcs(load,fn) $fn
-	set mosaicimagewcs(load,layer) {}
+	global parse
+	set parse(sock) $sock
+	set parse(fn) $fn
 
 	mosaicimagewcs::YY_FLUSH_BUFFER
 	mosaicimagewcs::yy_scan_string [lrange $var $i end]
@@ -131,18 +130,18 @@ proc ProcessMosaicImageWCSCmd {varname iname sock fn} {
 }
 
 proc MosaicImageWCSCmdLoad {param layer sys} {
-    global mosaicimagewcs
+    global parse
 
-    if {$mosaicimagewcs(load,sock) != {}} {
+    if {$parse(sock) != {}} {
 	# xpa
-	if {![LoadMosaicImageWCSSocket $mosaicimagewcs(load,sock) $param $layer $sys]} {
+	if {![LoadMosaicImageWCSSocket $parse(sock) $param $layer $sys]} {
 	    InitError xpa
 	    LoadMosaicImageWCSFile $param $layer $sys
 	}
     } else {
 	# comm
-	if {$mosaicimagewcs(load,fn) != {}} {
-	    LoadMosaicImageWCSAlloc $mosaicimagewcs(load,fn) $param $layer $sys
+	if {$parse(fn) != {}} {
+	    LoadMosaicImageWCSAlloc $parse(fn) $param $layer $sys
 	} else {
 	    LoadMosaicImageWCSFile $param $layer $sys
 	}
diff --git a/ds9/library/rgbcube.tcl b/ds9/library/rgbcube.tcl
index 76424ce..94252ca 100644
--- a/ds9/library/rgbcube.tcl
+++ b/ds9/library/rgbcube.tcl
@@ -113,9 +113,9 @@ proc ProcessRGBCubeCmd {varname iname sock fn} {
 
     global debug
     if {$debug(tcl,parser)} {
-	global rgbcube
-	set rgbcube(load,sock) $sock
-	set rgbcube(load,fn) $fn
+	global parse
+	set parse(sock) $sock
+	set parse(fn) $fn
 
 	rgbcube::YY_FLUSH_BUFFER
 	rgbcube::yy_scan_string [lrange $var $i end]
@@ -158,18 +158,18 @@ proc ProcessRGBCubeCmd {varname iname sock fn} {
 }
 
 proc RGBCubeCmdLoad {param} {
-    global rgbcube
+    global parse
 
-    if {$rgbcube(load,sock) != {}} {
+    if {$parse(sock) != {}} {
 	# xpa
-	if {![LoadRGBCubeSocket $rgbcube(load,sock) $param]} {
+	if {![LoadRGBCubeSocket $parse(sock) $param]} {
 	    InitError xpa
 	    LoadRGBCubeFile $param
 	}
     } else {
 	# comm
-	if {$rgbcube(load,fn) != {}} {
-	    LoadRGBCubeAlloc $rgbcube(load,fn) $param
+	if {$parse(fn) != {}} {
+	    LoadRGBCubeAlloc $parse(fn) $param
 	} else {
 	    LoadRGBCubeFile $param
 	}
diff --git a/ds9/library/rgbimage.tcl b/ds9/library/rgbimage.tcl
index 8f96d68..58b1144 100644
--- a/ds9/library/rgbimage.tcl
+++ b/ds9/library/rgbimage.tcl
@@ -131,9 +131,9 @@ proc ProcessRGBImageCmd {varname iname sock fn} {
 
     global debug
     if {$debug(tcl,parser)} {
-	global rgbimage
-	set rgbimage(load,sock) $sock
-	set rgbimage(load,fn) $fn
+	global parse
+	set parse(sock) $sock
+	set parse(fn) $fn
 
 	rgbimage::YY_FLUSH_BUFFER
 	rgbimage::yy_scan_string [lrange $var $i end]
@@ -176,18 +176,18 @@ proc ProcessRGBImageCmd {varname iname sock fn} {
 }
 
 proc RGBImageCmdLoad {param} {
-    global rgbimage
+    global parse
 
-    if {$rgbimage(load,sock) != {}} {
+    if {$parse(sock) != {}} {
 	# xpa
-	if {![LoadRGBImageSocket $rgbimage(load,sock) $param]} {
+	if {![LoadRGBImageSocket $parse(sock) $param]} {
 	    InitError xpa
 	    LoadRGBImageFile $param
 	}
     } else {
 	# comm
-	if {$rgbimage(load,fn) != {}} {
-	    LoadRGBImageAlloc $rgbimage(load,fn) $param
+	if {$parse(fn) != {}} {
+	    LoadRGBImageAlloc $parse(fn) $param
 	} else {
 	    LoadRGBImageFile $param
 	}
diff --git a/ds9/library/wcs.tcl b/ds9/library/wcs.tcl
index c123d09..bc4c4cb 100644
--- a/ds9/library/wcs.tcl
+++ b/ds9/library/wcs.tcl
@@ -1136,8 +1136,9 @@ proc ProcessWCSCmd {varname iname sock fn} {
 
     global debug
     if {$debug(tcl,parser)} {
-	set wcs(load,sock) $sock
-	set wcs(load,fn) $fn
+	global parse
+	set parse(sock) $sock
+	set parse(fn) $fn
 
 	wcs::YY_FLUSH_BUFFER
 	wcs::yy_scan_string [lrange $var $i end]
@@ -1291,18 +1292,18 @@ proc WCSCmdReset {ext} {
 }
 
 proc WCSCmdLoad {cmd ext} {
-    global wcs
     global current
     global rgb
+    global parse
 
     if {$current(frame) == {}} {
 	return
     }
 
-    if {$wcs(load,sock) != {}} {
-	RGBEvalLock rgb(lock,wcs) $current(frame) [list $current(frame) wcs $cmd $ext $wcs(load,sock)]
-    } elseif {$wcs(load,fn) != {}} {
-	RGBEvalLock rgb(lock,wcs) $current(frame) "$current(frame) wcs $cmd $ext \{\{$wcs(load,fn)\}\}"
+    if {$parse(sock) != {}} {
+	RGBEvalLock rgb(lock,wcs) $current(frame) [list $current(frame) wcs $cmd $ext $parse(sock)]
+    } elseif {$parse(fn) != {}} {
+	RGBEvalLock rgb(lock,wcs) $current(frame) "$current(frame) wcs $cmd $ext \{\{$parse(fn)\}\}"
 	UpdateWCS
     }
 }