diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-06-26 19:18:46 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-06-26 19:18:46 (GMT) |
| commit | ba3b33aa837766c7d0d7684fce7571df873cb354 (patch) | |
| tree | e97c6edbff8ba461e4f8b6ef4de0c8850c289267 /ds9 | |
| parent | f118b932662330abd7f26e3cd2cb7cfa7ecee8fa (diff) | |
| parent | ef569b3c29bd0b6ecd0b6c6dadff6429b3abbf8d (diff) | |
| download | blt-ba3b33aa837766c7d0d7684fce7571df873cb354.zip blt-ba3b33aa837766c7d0d7684fce7571df873cb354.tar.gz blt-ba3b33aa837766c7d0d7684fce7571df873cb354.tar.bz2 | |
Merge branch 'master' of github.com:SAOImageDS9/SAOImageDS9
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/doc/release/r7.6.html | 1 | ||||
| -rw-r--r-- | ds9/library/hvsup.tcl | 6 | ||||
| -rw-r--r-- | ds9/library/xpa.tcl | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ds9/doc/release/r7.6.html b/ds9/doc/release/r7.6.html index 40cd4fc..59bdf49 100644 --- a/ds9/doc/release/r7.6.html +++ b/ds9/doc/release/r7.6.html @@ -98,6 +98,7 @@ <li><tt>06.01.2017 FITS: Fixed a problem with Healpix RING formats.</tt></li> <li><tt>06.02.2017 CUBE: Fixed a problem with command line -cube play command.</tt></li> <li><tt>06.02.2017 GUI: Phyical and Image coordinates in the Info box now displays with precision of 8.</tt></li> + <li><tt>06.22.2017 VO: Fixed a problem in case XPA is not initialize.</tt></li> <li><tt><b>xx.xx.2017 RELEASE version 7.6b3</b></tt></li> </ol> </ol> diff --git a/ds9/library/hvsup.tcl b/ds9/library/hvsup.tcl index 7af0117..f64b799 100644 --- a/ds9/library/hvsup.tcl +++ b/ds9/library/hvsup.tcl @@ -1344,6 +1344,7 @@ proc HVParseXPASet {varname} { global $varname global ds9 + puts stderr "HVParseXPASet: [HVParseMimeParam $varname paramlist]" global debug if {$debug(tcl,hv)} { puts stderr "HVParseXPASet: [HVParseMimeParam $varname paramlist]" @@ -1351,9 +1352,12 @@ proc HVParseXPASet {varname} { if {[info exists var(xpa,target)]} { set target $var(xpa,target) + puts stderr a } else { set target [HVParseMimeParam $varname target] + puts stderr b } + puts stderr "[HVParseMimeParam $varname target]" if {$target == "$ds9(title)" || $target == "DS9:*" || @@ -1365,7 +1369,7 @@ proc HVParseXPASet {varname} { InitError hv CommSet $var(fn) [HVParseMimeParam $varname paramlist] 1 } else { - HVError $varname "[msgcat::mc {Unable to match target with XPA Mime request}] $url" + HVError $varname "[msgcat::mc {Unable to match target with XPA Mime request}] $var(url)" } } diff --git a/ds9/library/xpa.tcl b/ds9/library/xpa.tcl index 0eeecf9..30a237b 100644 --- a/ds9/library/xpa.tcl +++ b/ds9/library/xpa.tcl @@ -2180,7 +2180,7 @@ proc XPAMethod {} { if {[info exists xpa]} { return [xparec $xpa method] } else { - return {} + return {none} } } |