diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2020-01-20 20:16:43 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2020-01-20 20:16:43 (GMT) |
commit | 6afd340f889d6c2d672ddece8e971368b39fcb16 (patch) | |
tree | 63fa4a099117f4a22492806aafb504010eebd59a /ds9 | |
parent | ad3fff862841d32069960885a424f034e884986a (diff) | |
download | blt-6afd340f889d6c2d672ddece8e971368b39fcb16.zip blt-6afd340f889d6c2d672ddece8e971368b39fcb16.tar.gz blt-6afd340f889d6c2d672ddece8e971368b39fcb16.tar.bz2 |
cleanup code
Diffstat (limited to 'ds9')
-rw-r--r-- | ds9/library/cat.tcl | 2 | ||||
-rw-r--r-- | ds9/library/catcdssrch.tcl | 2 | ||||
-rw-r--r-- | ds9/library/catcdssrchdialog.tcl | 2 | ||||
-rw-r--r-- | ds9/library/catdialog.tcl | 2 | ||||
-rw-r--r-- | ds9/library/catsimbad.tcl | 18 | ||||
-rw-r--r-- | ds9/library/catvot.tcl | 2 |
6 files changed, 4 insertions, 24 deletions
diff --git a/ds9/library/cat.tcl b/ds9/library/cat.tcl index 25bdbeb..95956f2 100644 --- a/ds9/library/cat.tcl +++ b/ds9/library/cat.tcl @@ -138,7 +138,7 @@ proc CATProcess {varname} { puts stderr "CATProcess $varname" } - $var(proc,parser) $var(catdb) $var(token) + VOTParse $var(catdb) $var(token) ARDone $varname CATLoadDone $varname diff --git a/ds9/library/catcdssrch.tcl b/ds9/library/catcdssrch.tcl index 66bcbd3..017fbfa 100644 --- a/ds9/library/catcdssrch.tcl +++ b/ds9/library/catcdssrch.tcl @@ -163,7 +163,7 @@ proc CATCDSSrchCatalog {varname} { } } -# parser +# Parser proc CATCDSSrchVOTParse {t token} { upvar #0 $t T diff --git a/ds9/library/catcdssrchdialog.tcl b/ds9/library/catcdssrchdialog.tcl index 753b9f1..28c5214 100644 --- a/ds9/library/catcdssrchdialog.tcl +++ b/ds9/library/catcdssrchdialog.tcl @@ -404,6 +404,8 @@ proc CATCDSSrchConfigDone {varname} { CATCDSSrchConfigParse } +# Parser + proc CATCDSSrchConfigParse {t token} { upvar #0 $t T global $t diff --git a/ds9/library/catdialog.tcl b/ds9/library/catdialog.tcl index 0598c01..09a0e87 100644 --- a/ds9/library/catdialog.tcl +++ b/ds9/library/catdialog.tcl @@ -46,7 +46,6 @@ proc CATDialog {varname format catalog title action} { ARInit $varname CATServer # procs - set var(proc,parser) VOTParse set var(proc,process) CATProcess set var(proc,load) CATLoad set var(proc,error) ARError @@ -491,7 +490,6 @@ proc CATDialog {varname format catalog title action} { cxc - ned - skybot - - sdss - simbad { $mb entryconfig [msgcat::mc {Catalog Server}] -state disabled } diff --git a/ds9/library/catsimbad.tcl b/ds9/library/catsimbad.tcl index 064b2b3..1c8e6d2 100644 --- a/ds9/library/catsimbad.tcl +++ b/ds9/library/catsimbad.tcl @@ -14,9 +14,6 @@ proc CATSIMBAD {varname} { puts stderr "CATSIMBAD $varname" } - # parser - set var(proc,parser) CATSIMBADParse - # query set qq {} @@ -84,21 +81,6 @@ proc CATSIMBAD {varname} { CATLoad $varname $url $query } -proc CATSIMBADParse {t token} { - upvar #0 $t T - global $t - global debug - - # we can't trust simbad to turn off any error messages - variable $token - upvar 0 $token state - - set id [string first {<?xml} $state(body)] - set ${token}(body) [string range $state(body) $id end] - - VOTParse $t $token -} - proc CATSIMBADAck {varname} { upvar #0 $varname var global $varname diff --git a/ds9/library/catvot.tcl b/ds9/library/catvot.tcl index 25bf20d..0b87ca7 100644 --- a/ds9/library/catvot.tcl +++ b/ds9/library/catvot.tcl @@ -53,8 +53,6 @@ proc CATVOTHTTP {url catalog title} { upvar #0 $varname var global $varname - set ${varname}(proc,parser) VOTParse - CATLoad $varname $url {} } |